X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fviewmodel%2FViewportRangesTest.java;fp=test%2Fjalview%2Fviewmodel%2FViewportRangesTest.java;h=636f8dd6e8d142e914e87828a260af7105e5e9d8;hb=88694463a2aea303694231603b61970f72a5a259;hp=80bd4dbe7f2447235496a9c6328a864ae5f5025a;hpb=ba61fc7a3397ce6b57640e0b19c76392a983768a;p=jalview.git

diff --git a/test/jalview/viewmodel/ViewportRangesTest.java b/test/jalview/viewmodel/ViewportRangesTest.java
index 80bd4db..636f8dd 100644
--- a/test/jalview/viewmodel/ViewportRangesTest.java
+++ b/test/jalview/viewmodel/ViewportRangesTest.java
@@ -25,12 +25,14 @@ public class ViewportRangesTest {
 
   AlignmentI smallAl = gen.generate(7, 2, 2, 5, 5);
 
-  @BeforeMethod
+  @BeforeMethod(alwaysRun = true)
   public void cleanUp()
   {
     ColumnSelection sel = new ColumnSelection();
     al.getHiddenColumns().revealAllHiddenColumns(sel);
     al.getHiddenSequences().showAll(null);
+    smallAl.getHiddenColumns().revealAllHiddenColumns(sel);
+    smallAl.getHiddenSequences().showAll(null);
   }
 
   @Test(groups = { "Functional" })
@@ -133,6 +135,12 @@ public class ViewportRangesTest {
     ViewportRanges vrsmall = new ViewportRanges(smallAl);
     vrsmall.setStartEndRes(al.getWidth(), al.getWidth());
     assertEquals(vrsmall.getEndRes(), 6);
+
+    // make visible alignment width = 0
+    smallAl.getHiddenColumns().hideColumns(0, 6);
+    vrsmall.setStartEndRes(0, 4);
+    assertEquals(vrsmall.getStartRes(), 0);
+    assertEquals(vrsmall.getEndRes(), 0);
   }
 
   @Test(groups = { "Functional" })
@@ -149,6 +157,14 @@ public class ViewportRangesTest {
 
     vr.setStartEndSeq(al.getHeight(), al.getHeight());
     assertEquals(vr.getEndSeq(), al.getHeight() - 1);
+
+    // make visible alignment height = 0
+    smallAl.getHiddenSequences().hideSequence(smallAl.getSequenceAt(0));
+    smallAl.getHiddenSequences().hideSequence(smallAl.getSequenceAt(0));
+    ViewportRanges vrsmall = new ViewportRanges(smallAl);
+    vrsmall.setStartEndSeq(0, 3);
+    assertEquals(vrsmall.getStartSeq(), 0);
+    assertEquals(vrsmall.getEndSeq(), 0);
   }
 
   @Test(groups = { "Functional" })