From: kiramt <k.mourao@dundee.ac.uk>
Date: Fri, 17 Nov 2017 10:31:58 +0000 (+0000)
Subject: JAL-2759 Update tests
X-Git-Tag: Release_2_10_4~55^2~1^2~69
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=9f5e5489d0cf6debde1df72336ee390eefebf17c

JAL-2759 Update tests
---

diff --git a/src/jalview/datamodel/HiddenColumns.java b/src/jalview/datamodel/HiddenColumns.java
index 050603e..6200a43 100644
--- a/src/jalview/datamodel/HiddenColumns.java
+++ b/src/jalview/datamodel/HiddenColumns.java
@@ -321,6 +321,11 @@ public class HiddenColumns
           }
         }
       }
+      if (hiddenColumn > 0 && hiddenColumn < 121)
+      {
+        System.out.println(hiddenColumn + " " + result);
+      }
+
       return result; // return the shifted position after removing hidden
                      // columns.
     } finally
diff --git a/src/jalview/datamodel/HiddenColumnsCursor.java b/src/jalview/datamodel/HiddenColumnsCursor.java
index 2d579b0..9d1351e 100644
--- a/src/jalview/datamodel/HiddenColumnsCursor.java
+++ b/src/jalview/datamodel/HiddenColumnsCursor.java
@@ -167,7 +167,7 @@ public class HiddenColumnsCursor
       // column is before or in the previous region
       if ((index > 0) && (hiddenColumns.get(index - 1)[1] >= column))
       {
-        while ((index > 0) && (hiddenColumns.get(index)[1] > column))
+        while ((index > 0) && (hiddenColumns.get(index - 1)[1] >= column))
         {
           index--;
           int[] region = hiddenColumns.get(index);
diff --git a/test/jalview/datamodel/HiddenColumnsCursorTest.java b/test/jalview/datamodel/HiddenColumnsCursorTest.java
index 91cd3cd..cc8e5e5 100644
--- a/test/jalview/datamodel/HiddenColumnsCursorTest.java
+++ b/test/jalview/datamodel/HiddenColumnsCursorTest.java
@@ -74,6 +74,15 @@ public class HiddenColumnsCursorTest
 
     regionIndex = cursor.findRegionForColumn(0);
     assertEquals(0, regionIndex);
+
+    hidden.add(new int[] { 138, 155 });
+    cursor.resetCursor(hidden);
+
+    regionIndex = cursor.findRegionForColumn(160);
+    assertEquals(3, regionIndex);
+
+    regionIndex = cursor.findRegionForColumn(100);
+    assertEquals(1, regionIndex);
   }
 
   /**