X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignFrameTest.java;h=568d285c6be70abeee7861f9d089cd40149cfcbc;hb=14bfc6fb57f123b815f08dbf5b35544abd33b3af;hp=f13a8776e0694b661e7d42430693a5faaecadc57;hpb=1d6ce1bd2d0cf108d6207694e4aa6b845de11049;p=jalview.git diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java index f13a877..568d285 100644 --- a/test/jalview/gui/AlignFrameTest.java +++ b/test/jalview/gui/AlignFrameTest.java @@ -66,6 +66,9 @@ public class AlignFrameTest { JvOptionPane.setInteractiveMode(false); JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + + // BH 2020.03.22 solved the assertEquals(c, i_faded) problem below + Jalview.setSynchronous(true); } @Test(groups = "Functional") @@ -119,7 +122,8 @@ public class AlignFrameTest * seq1 feature in columns 1-5 is hidden * seq2 feature in columns 6-10 is shown */ - FeatureColourI fc = new FeatureColour(Color.red, Color.blue, 0f, 10f); + FeatureColourI fc = new FeatureColour(null, Color.red, Color.blue, null, + 0f, 10f); fc.setAboveThreshold(true); fc.setThreshold(5f); alignFrame.getFeatureRenderer().setColour("Metal", fc); @@ -163,7 +167,7 @@ public class AlignFrameTest @AfterMethod(alwaysRun = true) public void tearDown() { - Desktop.instance.closeAll_actionPerformed(null); + Desktop.getInstance().closeAll_actionPerformed(null); } /** @@ -174,7 +178,7 @@ public class AlignFrameTest public void setUp() { Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Cache.applicationProperties.setProperty("SHOW_IDENTITY", + Cache.getInstance().applicationProperties.setProperty("SHOW_IDENTITY", Boolean.TRUE.toString()); af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa", DataSourceType.FILE);