X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FHiddenColumnsTest.java;fp=test%2Fjalview%2Fdatamodel%2FHiddenColumnsTest.java;h=95c9fc6f93ccddf87fa9f91d8582f16220aaa712;hb=a946e51c2626014b3d4b0bc2790770e847f08bf4;hp=bc1e7b737e246be8e24baf3c4ba25a1f534d210e;hpb=02bdd4e842db62a0c9c3a36bbddd2b4f7249df92;p=jalview.git

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index bc1e7b7..95c9fc6 100644
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -329,17 +329,17 @@ public class HiddenColumnsTest
     assertEquals(2, seq.findIndex(seq.getStart()));
 
     // no hidden columns
-    assertEquals(seq.findIndex(seq.getStart()) - 1, cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(seq.findIndex(seq.getStart()) - 1, cs.locateVisibleStartOfSequence(seq));
 
     // hidden column on gap after end of sequence - should not affect bounds
     colsel.hideSelectedColumns(13, al.getHiddenColumns());
-    assertEquals(seq.findIndex(seq.getStart()) - 1,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(seq.findIndex(seq.getStart()) - 1,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     // hidden column on gap before beginning of sequence - should vis bounds by
     // one
     colsel.hideSelectedColumns(0, al.getHiddenColumns());
-    assertEquals(seq.findIndex(seq.getStart()) - 2,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(seq.findIndex(seq.getStart()) - 2,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     // hide columns around most of sequence - leave one residue remaining
@@ -349,117 +349,117 @@ public class HiddenColumnsTest
             cs.getVisibleSequenceStrings(0, 5, new SequenceI[]
     { seq })[0]);
 
-    assertEquals(1, cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(1, cs.locateVisibleStartOfSequence(seq));
     cs.revealAllHiddenColumns(colsel);
 
     // hide whole sequence - should just get location of hidden region
     // containing sequence
     cs.hideColumns(1, 11);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 15);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     SequenceI seq2 = new Sequence("RefSeq2", "-------A-SD-ASD--E---");
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(7, 17);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq2));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq2));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(3, 17);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq2));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq2));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(3, 19);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq2));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq2));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 0);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 1);
-    assertEquals(1,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(1,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 2);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(1, 1);
-    assertEquals(2,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(2,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(1, 2);
-    assertEquals(1,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(1,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(1, 3);
-    assertEquals(1,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(1,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 2);
     cs.hideColumns(5, 6);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 2);
     cs.hideColumns(5, 6);
     cs.hideColumns(9, 10);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 2);
     cs.hideColumns(7, 11);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(2, 4);
     cs.hideColumns(7, 11);
-    assertEquals(1,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(1,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(2, 4);
     cs.hideColumns(7, 12);
-    assertEquals(1,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(1,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(1, 11);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 12);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 4);
     cs.hideColumns(6, 12);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 1);
     cs.hideColumns(3, 12);
-    assertEquals(0,cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(0,cs.locateVisibleStartOfSequence(seq));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(3, 14);
     cs.hideColumns(17, 19);
-    assertEquals(3,cs.locateVisibleBoundsOfSequence(seq2));
+    assertEquals(3,cs.locateVisibleStartOfSequence(seq2));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(3, 7);
     cs.hideColumns(9, 14);
     cs.hideColumns(17, 19);
-    assertEquals(9,cs.locateVisibleBoundsOfSequence(seq2));
+    assertEquals(9,cs.locateVisibleStartOfSequence(seq2));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(0, 1);
     cs.hideColumns(3, 4);
     cs.hideColumns(6, 8);
     cs.hideColumns(10, 12);
-    assertEquals(6, cs.locateVisibleBoundsOfSequence(seq));
+    assertEquals(6, cs.locateVisibleStartOfSequence(seq));
 
   }