From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 30 Mar 2017 11:16:43 +0000 (+0100)
Subject: JAL-2346 JAL-1933 test updated to include Occupancy
X-Git-Tag: Release_2_10_3b1~336^2~2^2~1^2~2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e6ece19f50638d865cfd599b9c82de14b56c93c2;p=jalview.git

JAL-2346 JAL-1933 test updated to include Occupancy
---

diff --git a/test/jalview/gui/AnnotationRowFilterTest.java b/test/jalview/gui/AnnotationRowFilterTest.java
index 2785639..69a41c5 100644
--- a/test/jalview/gui/AnnotationRowFilterTest.java
+++ b/test/jalview/gui/AnnotationRowFilterTest.java
@@ -2,8 +2,6 @@ package jalview.gui;
 
 import static org.testng.Assert.assertEquals;
 
-import java.util.Vector;
-
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
@@ -11,6 +9,8 @@ import jalview.datamodel.SequenceI;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
 
+import java.util.Vector;
+
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -29,6 +29,8 @@ public class AnnotationRowFilterTest
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
     Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS",
             Boolean.TRUE.toString());
+    Cache.applicationProperties.setProperty(
+            Preferences.SHOW_AUTOCALC_ABOVE, Boolean.TRUE.toString());
     af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa",
             DataSourceType.FILE);
     testee = new AnnotationRowFilter(af.viewport, af.alignPanel)
@@ -98,7 +100,7 @@ public class AnnotationRowFilterTest
     Vector<String> items = testee.getAnnotationItems(false);
     assertEquals(
             items.toString(),
-            "[Conservation, Quality, Consensus, ann1Label, Significance, Significance_1, Jronn_FER_CAPAA, Jronn_FER_BRANA, Jnet_FER_BRANA, Jnet_FER_BRANA_2]");
+            "[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");
     assertEquals(testee.getAnnotationMenuLabel(ann2a), "Significance_1");