X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignViewportTest.java;h=fa71b2eaa35b75ac48806965d2d1d9b615485494;hb=b2b7e99113e1f0962140fc72d989cc826799a2d4;hp=5695b15ad5bb784304d07660b14ea1925c31bb45;hpb=483e7163b1fb8d4bcb9393014816c944befce328;p=jalview.git diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java index 5695b15..fa71b2e 100644 --- a/test/jalview/gui/AlignViewportTest.java +++ b/test/jalview/gui/AlignViewportTest.java @@ -345,16 +345,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().getViewportColourScheme() + .conservationApplied()); } @Test(groups = { "Functional" })