X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FHiddenColumnsCursorTest.java;h=97402b89725d7aae855c29b7b32320fcdeb26320;hb=5c1e80ada930876d477059fd92c68c898659efbf;hp=0deed08be5fac66a1d93b2c196620b1dae343c3d;hpb=b913f577205e8df5cdb6342ef161d7fd40ff15a4;p=jalview.git

diff --git a/test/jalview/datamodel/HiddenColumnsCursorTest.java b/test/jalview/datamodel/HiddenColumnsCursorTest.java
index 0deed08..97402b8 100644
--- a/test/jalview/datamodel/HiddenColumnsCursorTest.java
+++ b/test/jalview/datamodel/HiddenColumnsCursorTest.java
@@ -30,6 +30,31 @@ import org.testng.annotations.Test;
 
 public class HiddenColumnsCursorTest
 {
+
+  @Test(groups = { "Functional" })
+  public void testConstructor()
+  {
+    HiddenColumnsCursor cursor = new HiddenColumnsCursor();
+    assertNull(cursor.findRegionForColumn(0, false));
+
+    List<int[]> hlist = new ArrayList<>();
+    cursor = new HiddenColumnsCursor(hlist);
+    assertNull(cursor.findRegionForColumn(0, false));
+
+    cursor = new HiddenColumnsCursor(hlist, 3, 12);
+    assertNull(cursor.findRegionForColumn(0, false));
+
+    hlist.add(new int[] { 3, 7 });
+    hlist.add(new int[] { 15, 25 });
+    cursor = new HiddenColumnsCursor(hlist);
+    HiddenCursorPosition p = cursor.findRegionForColumn(8, false);
+    assertEquals(1, p.getRegionIndex());
+
+    cursor = new HiddenColumnsCursor(hlist, 1, 5);
+    p = cursor.findRegionForColumn(8, false);
+    assertEquals(1, p.getRegionIndex());
+  }
+
   /**
    * Test the method which finds the corresponding region given a column
    */
@@ -38,7 +63,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 +72,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);
   }
 
@@ -92,11 +117,11 @@ public class HiddenColumnsCursorTest
    * Test the method which counts the number of hidden columns before a column
    */
   @Test(groups = { "Functional" })
-  public void testGetHiddenOffset()
+  public void testFindRegionForColumn_Visible()
   {
     HiddenColumnsCursor cursor = new HiddenColumnsCursor();
 
-    HiddenCursorPosition pos = cursor.findRegionForVisColumn(20);
+    HiddenCursorPosition pos = cursor.findRegionForColumn(20, true);
     assertNull(pos);
 
     List<int[]> hidden = new ArrayList<>();
@@ -105,23 +130,28 @@ 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);
+  }
 }