X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fgui%2FAlignFrameTest.java;fp=test%2Fjalview%2Fgui%2FAlignFrameTest.java;h=68f02826f9d6d018398ec4defc4b7ba5a3ad483c;hb=2648baffe71899ac8aaeebeb344e651cadbcdc75;hp=779941b32f39f65c9a5926c81e815d93531bf5f0;hpb=5bf9d1929f1821170e5052976cf4e7435fb29ab4;p=jalview.git diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java index 779941b..68f0282 100644 --- a/test/jalview/gui/AlignFrameTest.java +++ b/test/jalview/gui/AlignFrameTest.java @@ -158,6 +158,7 @@ public class AlignFrameTest * use read-only test properties file */ Cache.loadProperties("test/jalview/io/testProps.jvprops"); + Cache.setPropertyNoSave("SHOW_JWS2_SERVICES", Boolean.FALSE.toString()); Jalview.main(new String[] { "-nonews" }); } @@ -341,6 +342,7 @@ public class AlignFrameTest @Test(groups = "Functional") public void testColourThresholdActions() { + AlignViewport av = af.getViewport(); AlignmentI al = av.getAlignment(); @@ -374,7 +376,12 @@ public class AlignFrameTest SliderPanel sp = SliderPanel.getSliderPanel(); assertTrue(sp.isForConservation()); assertEquals(sp.getValue(), 30); // initial slider setting + + // BH 2019.08.28 this was necessary so that rs was updated + af.changeColour_actionPerformed(JalviewColourScheme.Helix.toString()); + sp.valueChanged(10); + assertSame(rs, av.getResidueShading()); c = rs.findColour('I', 14, ferCapan); Color i_faded = new Color(196, 186, 196); @@ -499,6 +506,21 @@ public class AlignFrameTest assertEquals(c, s_original); } + private void waitSome() + { + + // just a hack + synchronized (this) + { + try + { + wait(250); + } catch (InterruptedException e) + { + } + } + } + /** * Verify that making a New View transfers alignment and group colour schemes, * including any thresholds, to the new view. Because New View is performed by