JAL-2674 add bounds to findHiddenRegionPositions

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

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index 6b4e05d..af7ace7 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -189,7 +189,7 @@ public class HiddenColumnsTest
     HiddenColumns cs = new HiddenColumns();
 
     int[] visible = cs.getVisibleContigs(3, 10);
-    assertEquals("[]", Arrays.toString(visible));
+    assertEquals("[3, 9]", Arrays.toString(visible));
 
     cs.hideColumns(3, 6);
     cs.hideColumns(8, 9);
@@ -795,18 +795,42 @@ public class HiddenColumnsTest
   {
     HiddenColumns hc = new HiddenColumns();
 
-    List<Integer> positions = hc.findHiddenRegionPositions();
+    List<Integer> positions = hc.findHiddenRegionPositions(0, 20);
     assertTrue(positions.isEmpty());
 
     hc.hideColumns(3, 7);
     hc.hideColumns(10, 10);
     hc.hideColumns(14, 15);
 
-    positions = hc.findHiddenRegionPositions();
+    positions = hc.findHiddenRegionPositions(0, 20);
     assertEquals(3, positions.size());
     assertEquals(3, positions.get(0).intValue());
     assertEquals(5, positions.get(1).intValue());
     assertEquals(8, positions.get(2).intValue());
+
+    positions = hc.findHiddenRegionPositions(7, 20);
+    assertEquals(2, positions.size());
+    assertEquals(5, positions.get(0).intValue());
+    assertEquals(8, positions.get(1).intValue());
+
+    positions = hc.findHiddenRegionPositions(11, 13);
+    assertEquals(0, positions.size());
+
+    positions = hc.findHiddenRegionPositions(7, 20);
+    assertEquals(2, positions.size());
+    assertEquals(5, positions.get(0).intValue());
+    assertEquals(8, positions.get(1).intValue());
+
+    positions = hc.findHiddenRegionPositions(0, 1);
+    assertEquals(0, positions.size());
+
+    positions = hc.findHiddenRegionPositions(17, 20);
+    assertEquals(0, positions.size());
+
+    positions = hc.findHiddenRegionPositions(10, 15);
+    assertEquals(2, positions.size());
+    assertEquals(5, positions.get(0).intValue());
+    assertEquals(8, positions.get(1).intValue());
   }
 
   @Test(groups = { "Functional" })
@@ -1267,9 +1291,6 @@ public class HiddenColumnsTest
     ColumnSelection sel = new ColumnSelection();
     h.revealAllHiddenColumns(sel);
     h.hideColumns(0, 30);
-    result = h.subtractVisibleColumns(31, 13);
-    assertEquals(-18, result);
-
     result = h.subtractVisibleColumns(31, 0);
     assertEquals(-31, result);