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 8e5c06b..8408b80 100644 (file)
--- a/test/jalview/gui/AnnotationRowFilterTest.java
+++ b/test/jalview/gui/AnnotationRowFilterTest.java
@@ -47,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)
@@ -104,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);
 
@@ -120,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");