JAL-2759 Combine findRegionForColumn code in HiddenColumnsCursor

[jalview.git] / test / jalview / datamodel / HiddenColumnsCursorTest.java

diff --git a/test/jalview/datamodel/HiddenColumnsCursorTest.java b/test/jalview/datamodel/HiddenColumnsCursorTest.java
index 0deed08..3b1bc55 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsCursorTest.java
+++ b/test/jalview/datamodel/HiddenColumnsCursorTest.java
@@ -38,7 +38,7 @@ public class HiddenColumnsCursorTest
   {
     HiddenColumnsCursor cursor = new HiddenColumnsCursor();
     
-    HiddenCursorPosition pos = cursor.findRegionForColumn(20);
+    HiddenCursorPosition pos = cursor.findRegionForColumn(20, false);
     assertNull(pos);
     
     List<int[]> hidden = new ArrayList<>();
@@ -47,44 +47,44 @@ public class HiddenColumnsCursorTest
 
     cursor = new HiddenColumnsCursor(hidden);
 
-    int regionIndex = cursor.findRegionForColumn(126).getRegionIndex();
+    int regionIndex = cursor.findRegionForColumn(126, false).getRegionIndex();
     assertEquals(2, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(125).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(125, false).getRegionIndex();
     assertEquals(1, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(108).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(108, false).getRegionIndex();
     assertEquals(1, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(104).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(104, false).getRegionIndex();
     assertEquals(1, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(103).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(103, false).getRegionIndex();
     assertEquals(1, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(77).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(77, false).getRegionIndex();
     assertEquals(1, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(76).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(76, false).getRegionIndex();
     assertEquals(0, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(53).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(53, false).getRegionIndex();
     assertEquals(0, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(52).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(52, false).getRegionIndex();
     assertEquals(0, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(0).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(0, false).getRegionIndex();
     assertEquals(0, regionIndex);
 
     hidden.add(new int[] { 138, 155 });
 
     cursor = new HiddenColumnsCursor(hidden);
 
-    regionIndex = cursor.findRegionForColumn(160).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(160, false).getRegionIndex();
     assertEquals(3, regionIndex);
 
-    regionIndex = cursor.findRegionForColumn(100).getRegionIndex();
+    regionIndex = cursor.findRegionForColumn(100, false).getRegionIndex();
     assertEquals(1, regionIndex);
   }
 
@@ -96,7 +96,7 @@ public class HiddenColumnsCursorTest
   {
     HiddenColumnsCursor cursor = new HiddenColumnsCursor();
 
-    HiddenCursorPosition pos = cursor.findRegionForVisColumn(20);
+    HiddenCursorPosition pos = cursor.findRegionForColumn(20, true);
     assertNull(pos);
 
     List<int[]> hidden = new ArrayList<>();
@@ -105,23 +105,29 @@ public class HiddenColumnsCursorTest
 
     cursor = new HiddenColumnsCursor(hidden);
 
-    int offset = cursor.findRegionForVisColumn(80).getHiddenSoFar();
+    int offset = cursor.findRegionForColumn(80, true).getHiddenSoFar();
     assertEquals(46, offset);
 
-    offset = cursor.findRegionForVisColumn(79).getHiddenSoFar();
+    offset = cursor.findRegionForColumn(79, true).getHiddenSoFar();
     assertEquals(24, offset);
 
-    offset = cursor.findRegionForVisColumn(53).getHiddenSoFar();
+    offset = cursor.findRegionForColumn(53, true).getHiddenSoFar();
     assertEquals(24, offset);
 
-    offset = cursor.findRegionForVisColumn(52).getHiddenSoFar();
+    offset = cursor.findRegionForColumn(52, true).getHiddenSoFar();
     assertEquals(0, offset);
 
-    offset = cursor.findRegionForVisColumn(10).getHiddenSoFar();
+    offset = cursor.findRegionForColumn(10, true).getHiddenSoFar();
     assertEquals(0, offset);
 
-    offset = cursor.findRegionForVisColumn(0).getHiddenSoFar();
+    offset = cursor.findRegionForColumn(0, true).getHiddenSoFar();
     assertEquals(0, offset);
+
+    offset = cursor.findRegionForColumn(79, true).getHiddenSoFar();
+    assertEquals(24, offset);
+
+    offset = cursor.findRegionForColumn(80, true).getHiddenSoFar();
+    assertEquals(46, offset);
   }
 
 }