X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fviewmodel%2FViewportRangesTest.java;h=80bd4dbe7f2447235496a9c6328a864ae5f5025a;hb=607cd66d3ccb056b773d9c32271ebf08e06a451c;hp=9c0d41b406f70ff449457173e7ff55b07d86a5da;hpb=2b2c9e1a88930585de0b5c205e4ae6f0174440d2;p=jalview.git

diff --git a/test/jalview/viewmodel/ViewportRangesTest.java b/test/jalview/viewmodel/ViewportRangesTest.java
index 9c0d41b..80bd4db 100644
--- a/test/jalview/viewmodel/ViewportRangesTest.java
+++ b/test/jalview/viewmodel/ViewportRangesTest.java
@@ -23,6 +23,8 @@ public class ViewportRangesTest {
 
   AlignmentI al = gen.generate(20, 30, 1, 5, 5);
 
+  AlignmentI smallAl = gen.generate(7, 2, 2, 5, 5);
+
   @BeforeMethod
   public void cleanUp()
   {
@@ -126,7 +128,11 @@ public class ViewportRangesTest {
     assertEquals(vr.getEndRes(), 19);
 
     vr.setStartEndRes(al.getWidth(), al.getWidth());
-    assertEquals(vr.getEndRes(), al.getWidth());
+    assertEquals(vr.getEndRes(), al.getWidth() - 1);
+
+    ViewportRanges vrsmall = new ViewportRanges(smallAl);
+    vrsmall.setStartEndRes(al.getWidth(), al.getWidth());
+    assertEquals(vrsmall.getEndRes(), 6);
   }
 
   @Test(groups = { "Functional" })
@@ -196,7 +202,13 @@ public class ViewportRangesTest {
     // reset out of bounds start values to within bounds
     vr.setViewportStartAndWidth(35, 5);
     assertEquals(vr.getViewportWidth(), 5);
-    assertEquals(vr.getStartRes(), 20);
+    assertEquals(vr.getStartRes(), 16);
+
+    // small alignment doesn't get bounds reset
+    ViewportRanges vrsmall = new ViewportRanges(smallAl);
+    vrsmall.setViewportStartAndWidth(0, 63);
+    assertEquals(vrsmall.getViewportWidth(), 7);
+    assertEquals(vrsmall.getStartRes(), 0);
   }
 
   @Test(groups = { "Functional" })
@@ -283,12 +295,12 @@ public class ViewportRangesTest {
     vr.scrollRight(false);
     assertEquals(vr.getStartRes(), 0);
 
-    vr.setViewportStartAndWidth(19, 5);
+    vr.setViewportStartAndWidth(15, 5);
     vr.scrollRight(true);
-    assertEquals(vr.getStartRes(), 20);
+    assertEquals(vr.getStartRes(), 16);
     // can't scroll right past end
     vr.scrollRight(true);
-    assertEquals(vr.getStartRes(), 20);
+    assertEquals(vr.getStartRes(), 16);
   }
 
   @Test(groups = { "Functional" })
@@ -298,7 +310,7 @@ public class ViewportRangesTest {
 
     // hide last 2 columns
     HiddenColumns cols = new HiddenColumns();
-    cols.hideColumns(18, 19);
+    cols.hideColumns(19, 20);
     al.setHiddenColumns(cols);
 
     vr.setViewportStartAndWidth(1, 5);
@@ -308,12 +320,12 @@ public class ViewportRangesTest {
     vr.scrollRight(false);
     assertEquals(vr.getStartRes(), 0);
 
-    vr.setViewportStartAndWidth(19, 5);
+    vr.setViewportStartAndWidth(13, 5);
     vr.scrollRight(true);
-    assertEquals(vr.getStartRes(), 18);
+    assertEquals(vr.getStartRes(), 14);
     // can't scroll right past last visible col
     vr.scrollRight(true);
-    assertEquals(vr.getStartRes(), 18);
+    assertEquals(vr.getStartRes(), 14);
   }
 
   @Test(groups = { "Functional" })