Merge branch 'develop' into features/mchmmer

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

diff --git a/test/jalview/datamodel/HiddenSequencesTest.java b/test/jalview/datamodel/HiddenSequencesTest.java
index 5b2bbd4..efd71e6 100644 (file)
--- a/test/jalview/datamodel/HiddenSequencesTest.java
+++ b/test/jalview/datamodel/HiddenSequencesTest.java
@@ -31,6 +31,7 @@ import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
 
 import jalview.gui.AlignViewport;
 import jalview.gui.JvOptionPane;
+import jalview.viewmodel.AlignmentViewport;
 
 import java.util.List;
 
@@ -208,15 +209,17 @@ public class HiddenSequencesTest
     assertEquals(6, hs.findIndexWithoutHiddenSeqs(9));
 
     /*
-     * hide first sequence only
+     * hide first two sequences
      */
     hs.showAll(null);
     hs.hideSequence(seqs[0]);
-    for (int i = 1; i < height; i++)
+    hs.hideSequence(seqs[1]);
+    assertEquals(-1, hs.findIndexWithoutHiddenSeqs(0));
+    assertEquals(-1, hs.findIndexWithoutHiddenSeqs(1));
+    for (int i = 2; i < height; i++)
     {
-      assertEquals(i - 1, hs.findIndexWithoutHiddenSeqs(i));
+      assertEquals(i - 2, hs.findIndexWithoutHiddenSeqs(i));
     }
-    assertEquals(-1, hs.findIndexWithoutHiddenSeqs(0));
   }
 
   /**
@@ -485,7 +488,7 @@ public class HiddenSequencesTest
      * represent seqs 2-4 with seq3
      * this hides seq2 and seq4 but not seq3
      */
-    AlignViewport av = new AlignViewport(al);
+    AlignmentViewport av = new AlignViewport(al);
     SequenceGroup sg = new SequenceGroup();
     sg.addSequence(seqs[1], false);
     sg.addSequence(seqs[2], false);