JAL-2759 Remove getVisibleBlocksIterator call

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

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index 57d716d..e66367b 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -119,7 +119,7 @@ public class HiddenColumnsTest
   {
     HiddenColumns cs = new HiddenColumns();
 
-    Iterator<int[]> visible = cs.getVisContigsIterator(3, 10);
+    Iterator<int[]> visible = cs.getVisContigsIterator(3, 10, false);
     int[] region = visible.next();
     assertEquals("[3, 9]", Arrays.toString(region));
     assertFalse(visible.hasNext());
@@ -131,7 +131,7 @@ public class HiddenColumnsTest
     // Test both ends visible region
 
     // start position is inclusive, end position exclusive
-    visible = cs.getVisContigsIterator(1, 13);
+    visible = cs.getVisContigsIterator(1, 13, false);
     region = visible.next();
     assertEquals("[1, 2]", Arrays.toString(region));
     region = visible.next();
@@ -141,7 +141,7 @@ public class HiddenColumnsTest
     assertFalse(visible.hasNext());
 
     // Test start hidden, end visible
-    visible = cs.getVisContigsIterator(4, 14);
+    visible = cs.getVisContigsIterator(4, 14, false);
     region = visible.next();
     assertEquals("[7, 7]", Arrays.toString(region));
     region = visible.next();
@@ -151,13 +151,13 @@ public class HiddenColumnsTest
     assertFalse(visible.hasNext());
 
     // Test start hidden, end hidden
-    visible = cs.getVisContigsIterator(3, 10);
+    visible = cs.getVisContigsIterator(3, 10, false);
     region = visible.next();
     assertEquals("[7, 7]", Arrays.toString(region));
     assertFalse(visible.hasNext());
 
     // Test start visible, end hidden
-    visible = cs.getVisContigsIterator(0, 13);
+    visible = cs.getVisContigsIterator(0, 13, false);
     region = visible.next();
     assertEquals("[0, 2]", Arrays.toString(region));
     region = visible.next();
@@ -167,7 +167,7 @@ public class HiddenColumnsTest
     assertFalse(visible.hasNext());
 
     // Test empty result
-    visible = cs.getVisContigsIterator(4, 6);
+    visible = cs.getVisContigsIterator(4, 6, false);
     assertFalse(visible.hasNext());
   }
 
@@ -796,7 +796,7 @@ public class HiddenColumnsTest
             false);
 
     // confirm that original contigs are as expected
-    Iterator<int[]> visible = hidden.getVisContigsIterator(0, 25);
+    Iterator<int[]> visible = hidden.getVisContigsIterator(0, 25, false);
     int[] region = visible.next();
     assertEquals("[0, 14]", Arrays.toString(region));
     region = visible.next();
@@ -807,7 +807,7 @@ public class HiddenColumnsTest
             view);
 
     // confirm that the contigs have changed to account for the gaps
-    visible = result.getVisContigsIterator(0, 25);
+    visible = result.getVisContigsIterator(0, 25, false);
     region = visible.next();
     assertEquals("[0, 10]", Arrays.toString(region));
     region = visible.next();
@@ -854,7 +854,7 @@ public class HiddenColumnsTest
             false);
 
     // confirm that original contigs are as expected
-    Iterator<int[]> visible = hidden.getVisContigsIterator(0, 20);
+    Iterator<int[]> visible = hidden.getVisContigsIterator(0, 20, false);
     int[] region = visible.next();
     assertEquals("[0, 6]", Arrays.toString(region));
     region = visible.next();
@@ -866,7 +866,7 @@ public class HiddenColumnsTest
             view);
 
     // confirm that the contigs have changed to account for the gaps
-    visible = result.getVisContigsIterator(0, 20);
+    visible = result.getVisContigsIterator(0, 20, false);
     region = visible.next();
     assertEquals("[0, 4]", Arrays.toString(region));
     region = visible.next();
@@ -1322,7 +1322,7 @@ public class HiddenColumnsTest
   public void testVisibleBlocksVisBoundsIterator()
   {
     HiddenColumns h = new HiddenColumns();
-    Iterator<int[]> regions = h.getVisibleBlocksIterator(0, 30, true);
+    Iterator<int[]> regions = h.getVisContigsIterator(0, 30, true);
 
     // only 1 visible region spanning 0-30 if nothing is hidden
     assertTrue(regions.hasNext());
@@ -1335,7 +1335,7 @@ public class HiddenColumnsTest
     // 2 regions one on either side
     // second region boundary accounts for hidden columns
     h.hideColumns(10, 15);
-    regions = h.getVisibleBlocksIterator(0, 30, true);
+    regions = h.getVisContigsIterator(0, 30, true);
 
     assertTrue(regions.hasNext());
     region = regions.next();
@@ -1349,7 +1349,7 @@ public class HiddenColumnsTest
     // single hidden region at left
     h = new HiddenColumns();
     h.hideColumns(0, 5);
-    regions = h.getVisibleBlocksIterator(0, 30, true);
+    regions = h.getVisContigsIterator(0, 30, true);
 
     assertTrue(regions.hasNext());
     region = regions.next();
@@ -1360,7 +1360,7 @@ public class HiddenColumnsTest
     // single hidden region at right
     h = new HiddenColumns();
     h.hideColumns(27, 30);
-    regions = h.getVisibleBlocksIterator(0, 30, true);
+    regions = h.getVisContigsIterator(0, 30, true);
 
     assertTrue(regions.hasNext());
     region = regions.next();
@@ -1375,7 +1375,7 @@ public class HiddenColumnsTest
     h = new HiddenColumns();
     h.hideColumns(0, 5);
     h.hideColumns(23, 25);
-    regions = h.getVisibleBlocksIterator(0, 30, true);
+    regions = h.getVisContigsIterator(0, 30, true);
 
     assertTrue(regions.hasNext());
     region = regions.next();
@@ -1390,7 +1390,7 @@ public class HiddenColumnsTest
     h = new HiddenColumns();
     h.hideColumns(27, 30);
     h.hideColumns(11, 14);
-    regions = h.getVisibleBlocksIterator(0, 30, true);
+    regions = h.getVisContigsIterator(0, 30, true);
 
     assertTrue(regions.hasNext());
     region = regions.next();
@@ -1408,7 +1408,7 @@ public class HiddenColumnsTest
     h = new HiddenColumns();
     h.hideColumns(27, 35);
     h.hideColumns(0, 4);
-    regions = h.getVisibleBlocksIterator(0, 30, true);
+    regions = h.getVisContigsIterator(0, 30, true);
 
     assertTrue(regions.hasNext());
     region = regions.next();
@@ -1426,7 +1426,7 @@ public class HiddenColumnsTest
     h.hideColumns(9, 11);
     h.hideColumns(22, 26);
 
-    regions = h.getVisibleBlocksIterator(0, 30, true);
+    regions = h.getVisContigsIterator(0, 30, true);
 
     assertTrue(regions.hasNext());
     region = regions.next();