X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FSeqPanelTest.java;h=7b75bfb046ed2797c0e21a1d5fe1205e62e0d9e0;hb=1dab7652c8e85071f68f5a4889e071d6a480ae80;hp=53b4259b781916d583cbe223cb1e9caf7275cab4;hpb=14d7fc7b354d68634fdb65c20ace15741a5b685f;p=jalview.git diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java index 53b4259..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,7 +765,11 @@ 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; + + int expected = w / charWidth; + expected = Math.min( + alignFrame.getViewport().getRanges().getEndRes(), + expected); int col = testee.findColumn(evt); assertEquals(col, expected);