Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / test / jalview / gui / AnnotationRowFilterTest.java

diff --git a/test/jalview/gui/AnnotationRowFilterTest.java b/test/jalview/gui/AnnotationRowFilterTest.java
index b575478..8408b80 100644 (file)
--- a/test/jalview/gui/AnnotationRowFilterTest.java
+++ b/test/jalview/gui/AnnotationRowFilterTest.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import static org.testng.Assert.assertEquals;
@@ -27,10 +47,10 @@ public class AnnotationRowFilterTest
   public void setUp()
   {
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
-    Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS",
-            Boolean.TRUE.toString());
-    Cache.applicationProperties.setProperty(Preferences.SHOW_AUTOCALC_ABOVE,
+    Cache.setPropertyNoSave("SHOW_ANNOTATIONS",
             Boolean.TRUE.toString());
+    Cache.setPropertyNoSave(
+            Preferences.SHOW_AUTOCALC_ABOVE, Boolean.TRUE.toString());
     af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa",
             DataSourceType.FILE);
     testee = new AnnotationRowFilter(af.viewport, af.alignPanel)
@@ -84,15 +104,13 @@ public class AnnotationRowFilterTest
             null);
     ann4.setSequenceRef(seq2);
     al.addAnnotation(ann4);
-    AlignmentAnnotation ann5 = new AlignmentAnnotation("Jnet", "Jnet",
-            null);
+    AlignmentAnnotation ann5 = new AlignmentAnnotation("Jnet", "Jnet", null);
     ann5.setSequenceRef(seq2);
     al.addAnnotation(ann5);
     /*
      * a second Jnet annotation for FER_BRANA
      */
-    AlignmentAnnotation ann6 = new AlignmentAnnotation("Jnet", "Jnet",
-            null);
+    AlignmentAnnotation ann6 = new AlignmentAnnotation("Jnet", "Jnet", null);
     ann6.setSequenceRef(seq2);
     al.addAnnotation(ann6);
 
@@ -100,7 +118,8 @@ public class AnnotationRowFilterTest
      * drop-down items with 'Per-sequence only' not checked
      */
     Vector<String> items = testee.getAnnotationItems(false);
-    assertEquals(items.toString(),
+    assertEquals(
+            items.toString(),
             "[Conservation, Quality, Consensus, Occupancy, ann1Label, Significance, Significance_1, Jronn_FER_CAPAA, Jronn_FER_BRANA, Jnet_FER_BRANA, Jnet_FER_BRANA_2]");
     assertEquals(testee.getAnnotationMenuLabel(ann1), "ann1Label");
     assertEquals(testee.getAnnotationMenuLabel(ann2), "Significance");