X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FSeqPanelTest.java;h=7b75bfb046ed2797c0e21a1d5fe1205e62e0d9e0;hb=1dab7652c8e85071f68f5a4889e071d6a480ae80;hp=17e04bf93ecdfed088042540ffa3dd50300523cd;hpb=5721b73c6d5de84b21a989a8734e4c161f5dc630;p=jalview.git

diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java
index 17e04bf..7b75bfb 100644
--- a/test/jalview/gui/SeqPanelTest.java
+++ b/test/jalview/gui/SeqPanelTest.java
@@ -60,6 +60,7 @@ public class SeqPanelTest
   @BeforeClass(alwaysRun = true)
   public void setUpJvOptionPane()
   {
+    Jalview.setSynchronous(true);
     JvOptionPane.setInteractiveMode(false);
     JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
   }
@@ -724,7 +725,6 @@ public class SeqPanelTest
     final int charWidth = alignFrame.getViewport().getCharWidth();
     assertTrue(charWidth > 0); // sanity check
     assertEquals(alignFrame.getViewport().getRanges().getStartRes(), 0);
-
     /*
      * mouse at top left of unwrapped panel
      */
@@ -765,8 +765,13 @@ public class SeqPanelTest
     SeqCanvas seqCanvas = alignFrame.alignPanel.getSeqPanel().seqCanvas;
     int w = seqCanvas.getWidth();
     // limited to number of whole columns, base 0
-    int expected = w / charWidth - 1;
-    assertEquals(testee.findColumn(evt), expected);
+
+    int expected = w / charWidth;
+    expected = Math.min(
+            alignFrame.getViewport().getRanges().getEndRes(),
+            expected);
+    int col = testee.findColumn(evt);
+    assertEquals(col, expected);
 
     /*
      * hide columns 5-10 (base 1)
@@ -776,7 +781,8 @@ public class SeqPanelTest
     // x is in 6th visible column, absolute column 12, or 11 base 0
     evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0,
             false, 0);
-    assertEquals(testee.findColumn(evt), 11);
+    col = testee.findColumn(evt);
+    assertEquals(col, 11);
   }
 
   @Test(groups = "Functional")