JAL-2759 Changes to getVisibleSequenceStrings after review

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

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index 07a4810..316b003 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -292,9 +292,12 @@ public class HiddenColumnsTest
     // hide columns around most of sequence - leave one residue remaining
     cs.hideColumns(1, 3);
     cs.hideColumns(6, 11);
-    assertEquals("-D",
-            cs.getVisibleSequenceStrings(0, 5, new SequenceI[]
-    { seq })[0]);
+
+    Iterator<int[]> it = cs.getVisContigsIterator(0, 6, false);
+
+    assertEquals("-D", seq.getSequenceStringFromIterator(it));
+    // cs.getVisibleSequenceStrings(0, 5, new SequenceI[]
+    // { seq })[0]);
 
     assertEquals(1, cs.locateVisibleStartOfSequence(seq));
     cs.revealAllHiddenColumns(colsel);
@@ -925,37 +928,37 @@ public class HiddenColumnsTest
     HiddenColumns h = new HiddenColumns();
 
     // returns same value if no hidden cols
-    assertEquals(3, h.getHiddenBoundaryLeft(3));
+    assertEquals(3, h.getNextHiddenBoundary(true, 3));
 
     h.hideColumns(5, 10);
-    assertEquals(10, h.getHiddenBoundaryLeft(15));
-    assertEquals(3, h.getHiddenBoundaryLeft(3));
-    assertEquals(7, h.getHiddenBoundaryLeft(7));
+    assertEquals(10, h.getNextHiddenBoundary(true, 15));
+    assertEquals(3, h.getNextHiddenBoundary(true, 3));
+    assertEquals(7, h.getNextHiddenBoundary(true, 7));
 
     h.hideColumns(15, 20);
-    assertEquals(10, h.getHiddenBoundaryLeft(15));
-    assertEquals(20, h.getHiddenBoundaryLeft(21));
+    assertEquals(10, h.getNextHiddenBoundary(true, 15));
+    assertEquals(20, h.getNextHiddenBoundary(true, 21));
   }
 
   @Test(groups = "Functional")
-  public void testGetHiddenBoundaryRight()
+  public void testGetNextHiddenBoundary()
   {
     HiddenColumns h = new HiddenColumns();
 
     // returns same value if no hidden cols
-    assertEquals(3, h.getHiddenBoundaryRight(3));
+    assertEquals(3, h.getNextHiddenBoundary(false, 3));
 
     h.hideColumns(5, 10);
-    assertEquals(5, h.getHiddenBoundaryRight(3));
-    assertEquals(15, h.getHiddenBoundaryRight(15));
-    assertEquals(7, h.getHiddenBoundaryRight(7));
+    assertEquals(5, h.getNextHiddenBoundary(false, 3));
+    assertEquals(15, h.getNextHiddenBoundary(false, 15));
+    assertEquals(7, h.getNextHiddenBoundary(false, 7));
 
     h.hideColumns(15, 20);
-    assertEquals(15, h.getHiddenBoundaryRight(7));
-    assertEquals(15, h.getHiddenBoundaryRight(14));
+    assertEquals(15, h.getNextHiddenBoundary(false, 7));
+    assertEquals(15, h.getNextHiddenBoundary(false, 14));
 
     // returns same value if there is no next hidden column
-    assertEquals(22, h.getHiddenBoundaryRight(22));
+    assertEquals(22, h.getNextHiddenBoundary(false, 22));
   }
 
   @Test(groups = "Functional")
@@ -993,7 +996,7 @@ public class HiddenColumnsTest
     assertFalse(result.hasNext());
   }
 
-  @Test(groups = "Functional")
+  /* @Test(groups = "Functional")
   public void testGetVisibleSequenceStrings()
   {
     HiddenColumns h = new HiddenColumns();
@@ -1006,13 +1009,13 @@ public class HiddenColumnsTest
     assertEquals(2, result.length);
     assertEquals("WKQES", result[0]);
     assertEquals("RNDTG", result[1]);
-
+  
     h.hideColumns(6, 8);
     result = h.getVisibleSequenceStrings(5, 10, seqs);
     assertEquals(2, result.length);
     assertEquals("WS", result[0]);
     assertEquals("RG", result[1]);
-
+  
     SequenceI seq = new Sequence("RefSeq", "-A-SD-ASD--E---");
     ColumnSelection sel = new ColumnSelection();
     h.revealAllHiddenColumns(sel);
@@ -1021,7 +1024,7 @@ public class HiddenColumnsTest
     assertEquals("-D",
             h.getVisibleSequenceStrings(0, 5, new SequenceI[]
     { seq })[0]);
-  }
+  }*/
 
   @Test(groups = "Functional")
   public void testHideInsertionsFor()