X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignmentPanelTest.java;h=80dc939bcc2b4214333c63026fd7ff1fdae00323;hb=55ebdfcc6bd979605c9bb2b4092a422b035bc27e;hp=fd67ac4d068e4d62e2761a765a2070e0551b2a69;hpb=1bbf9cd2904a084b5f4df2db064a477480e5c688;p=jalview.git diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java index fd67ac4..80dc939 100644 --- a/test/jalview/gui/AlignmentPanelTest.java +++ b/test/jalview/gui/AlignmentPanelTest.java @@ -168,7 +168,7 @@ public class AlignmentPanelTest * or without hidden columns */ @Test(groups = "Functional") - public void TestSetScrollValues() + public void testSetScrollValues() { ViewportRanges ranges = af.getViewport().getRanges(); af.alignPanel.setScrollValues(0, 0); @@ -233,26 +233,47 @@ public class AlignmentPanelTest * when switching from wrapped back to unwrapped mode (JAL-2739) */ @Test(groups = "Functional") - public void TestUpdateLayout_endRes() + public void testUpdateLayout_endRes() { // get details of original alignment dimensions ViewportRanges ranges = af.getViewport().getRanges(); int endres = ranges.getEndRes(); + // System.out.println("APT range end0 " + ranges.getEndRes()); // wrap af.alignPanel.getAlignViewport().setWrapAlignment(true); af.alignPanel.updateLayout(); af.paintImmediately(af.getBounds()); - + waitSome(); + // System.out.println("APT range end1 " + ranges.getEndRes()); // endRes has changed assertNotEquals(ranges.getEndRes(), endres); // unwrap af.alignPanel.getAlignViewport().setWrapAlignment(false); af.alignPanel.updateLayout(); + waitSome(); af.paintImmediately(af.getBounds()); + + // System.out.println("APT range end3 " + ranges.getEndRes()); + // endRes back to original value assertEquals(ranges.getEndRes(), endres); } + + private void waitSome() + { + + // just a hack + synchronized (this) + { + try + { + wait(250); + } catch (InterruptedException e) + { + } + } + } }