From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 24 Oct 2016 13:52:35 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2283consColourEnabled' into develop
X-Git-Tag: Release_2_10_0b1~2^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c255072dbd17cc1d7876546c87baacfe5de34f7e;hp=2d0cd4e8412eda3b980a20f4e7b2c452666f6895;p=jalview.git

Merge branch 'bug/JAL-2283consColourEnabled' into develop
---

diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java
index d7b26b0..00c52ed 100644
--- a/test/jalview/gui/AlignViewportTest.java
+++ b/test/jalview/gui/AlignViewportTest.java
@@ -338,11 +338,9 @@ public class AlignViewportTest
     /*
      * test for JAL-2283 don't inadvertently turn on colour by conservation
      */
-    Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS",
-            Boolean.TRUE.toString());
-    Cache.applicationProperties.setProperty("SHOW_CONSERVATION",
-            Boolean.FALSE.toString());
     Cache.applicationProperties.setProperty("DEFAULT_COLOUR_PROT", "NONE");
+    Cache.applicationProperties.setProperty("SHOW_CONSERVATION",
+            Boolean.TRUE.toString());
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
             "examples/uniref50.fa", FormatAdapter.FILE);
     ColourSchemeI cs = new PIDColourScheme();