JAL-3858 improved contactInterval computation and added detailed test coverage for...

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

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index cc5744f..abde7c6 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -216,18 +216,15 @@ public class HiddenColumnsTest
     cs.hideColumns(10, 11);
     cs.hideColumns(5, 7);
     Iterator<int[]> regions = cs.iterator();
-    assertEquals("[5, 7]",
-            Arrays.toString(regions.next()));
+    assertEquals("[5, 7]", Arrays.toString(regions.next()));
 
     HiddenColumns cs2 = new HiddenColumns(cs);
     regions = cs2.iterator();
     assertTrue(cs2.hasHiddenColumns());
     assertEquals(2, cs2.getNumberOfRegions());
     // hidden columns are held in column order
-    assertEquals("[5, 7]",
-            Arrays.toString(regions.next()));
-    assertEquals("[10, 11]",
-            Arrays.toString(regions.next()));
+    assertEquals("[5, 7]", Arrays.toString(regions.next()));
+    assertEquals("[10, 11]", Arrays.toString(regions.next()));
   }
 
   @Test(groups = "Functional")
@@ -242,8 +239,7 @@ public class HiddenColumnsTest
     Iterator<int[]> regions = cs2.iterator();
 
     // only [5,7] returned, offset by 1
-    assertEquals("[4, 6]",
-            Arrays.toString(regions.next()));
+    assertEquals("[4, 6]", Arrays.toString(regions.next()));
     assertEquals(3, cs2.getSize());
 
     cs2 = new HiddenColumns(cs, 8, 15, 4);
@@ -251,15 +247,13 @@ public class HiddenColumnsTest
     assertTrue(cs2.hasHiddenColumns());
 
     // only [10,11] returned, offset by 4
-    assertEquals("[6, 7]",
-            Arrays.toString(regions.next()));
+    assertEquals("[6, 7]", Arrays.toString(regions.next()));
     assertEquals(2, cs2.getSize());
 
     cs2 = new HiddenColumns(cs, 6, 10, 4);
     assertFalse(cs2.hasHiddenColumns());
   }
 
-
   @Test(groups = { "Functional" })
   public void testHideColumns()
   {
@@ -307,26 +301,22 @@ public class HiddenColumnsTest
     cs.hideColumns(4, 5);
     regions = cs.iterator();
     assertEquals(1, cs.getNumberOfRegions());
-    assertEquals("[3, 6]",
-            Arrays.toString(regions.next()));
+    assertEquals("[3, 6]", Arrays.toString(regions.next()));
     assertEquals(cs.getSize(), 4);
     cs.hideColumns(3, 5);
     regions = cs.iterator();
     assertEquals(1, cs.getNumberOfRegions());
-    assertEquals("[3, 6]",
-            Arrays.toString(regions.next()));
+    assertEquals("[3, 6]", Arrays.toString(regions.next()));
     assertEquals(cs.getSize(), 4);
     cs.hideColumns(4, 6);
     regions = cs.iterator();
     assertEquals(1, cs.getNumberOfRegions());
-    assertEquals("[3, 6]",
-            Arrays.toString(regions.next()));
+    assertEquals("[3, 6]", Arrays.toString(regions.next()));
     assertEquals(cs.getSize(), 4);
     cs.hideColumns(3, 6);
     regions = cs.iterator();
     assertEquals(1, cs.getNumberOfRegions());
-    assertEquals("[3, 6]",
-            Arrays.toString(regions.next()));
+    assertEquals("[3, 6]", Arrays.toString(regions.next()));
     assertEquals(cs.getSize(), 4);
 
     cs.revealAllHiddenColumns(colsel);
@@ -1129,7 +1119,7 @@ public class HiddenColumnsTest
   public void testBoundedStartIterator()
   {
     HiddenColumns h = new HiddenColumns();
-    Iterator<Integer> it = h.getBoundedStartIterator(0, 10);
+    Iterator<Integer> it = h.getStartRegionIterator(0, 10);
 
     // no hidden columns = nothing to iterate over
     assertFalse(it.hasNext());
@@ -1138,7 +1128,7 @@ public class HiddenColumnsTest
     // all regions are returned
     h.hideColumns(3, 10);
     h.hideColumns(14, 16);
-    it = h.getBoundedStartIterator(0, 20);
+    it = h.getStartRegionIterator(0, 20);
     assertTrue(it.hasNext());
     int next = it.next();
     assertEquals(3, next);
@@ -1148,12 +1138,12 @@ public class HiddenColumnsTest
 
     // [start,end] does not contain a start of a region
     // no regions to iterate over
-    it = h.getBoundedStartIterator(4, 5);
+    it = h.getStartRegionIterator(4, 5);
     assertFalse(it.hasNext());
 
     // [start,end] fully contains 1 region and start of last
     // - 2 regions returned
-    it = h.getBoundedStartIterator(3, 7);
+    it = h.getStartRegionIterator(3, 7);
     assertTrue(it.hasNext());
     next = it.next();
     assertEquals(3, next);
@@ -1163,7 +1153,7 @@ public class HiddenColumnsTest
 
     // [start,end] contains whole of last region
     // - 1 region returned
-    it = h.getBoundedStartIterator(4, 20);
+    it = h.getStartRegionIterator(4, 20);
     assertTrue(it.hasNext());
     next = it.next();
     assertEquals(6, next);
@@ -1309,7 +1299,7 @@ public class HiddenColumnsTest
     HiddenColumns h = new HiddenColumns();
     Iterator<Integer> it = h.getVisibleColsIterator(0, 10);
 
-    assertTrue(it instanceof VisibleColsIterator);
+    assertTrue(it instanceof RangeElementsIterator);
   }
 
   @Test(groups = "Functional")