X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignViewportTest.java;h=1cdcdb7efb7faaa7494769fe139876dbc2c81849;hb=4f094851cd2247ea2d982e7829a6f5b663042573;hp=5695b15ad5bb784304d07660b14ea1925c31bb45;hpb=483e7163b1fb8d4bcb9393014816c944befce328;p=jalview.git diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java index 5695b15..1cdcdb7 100644 --- a/test/jalview/gui/AlignViewportTest.java +++ b/test/jalview/gui/AlignViewportTest.java @@ -70,7 +70,8 @@ public class AlignViewportTest @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { - Jalview.main(new String[] { "-props", "test/jalview/testProps.jvprops" }); + Jalview.main(new String[] { "-nonews", "-props", + "test/jalview/testProps.jvprops" }); } @BeforeMethod(alwaysRun = true) @@ -345,16 +346,17 @@ public class AlignViewportTest public void testSetGlobalColourScheme() { /* - * test for JAL-2283 don't inadvertently turn on colour by conservation + * test for JAL-2283: don't inadvertently turn on colour by conservation */ - Cache.applicationProperties.setProperty("DEFAULT_COLOUR_PROT", "NONE"); + Cache.applicationProperties.setProperty("DEFAULT_COLOUR_PROT", "None"); Cache.applicationProperties.setProperty("SHOW_CONSERVATION", Boolean.TRUE.toString()); AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( "examples/uniref50.fa", DataSourceType.FILE); ColourSchemeI cs = new PIDColourScheme(); af.getViewport().setGlobalColourScheme(cs); - assertFalse(cs.conservationApplied()); + assertFalse(af.getViewport().getResidueShading() + .conservationApplied()); } @Test(groups = { "Functional" })