X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAnnotationRowFilterTest.java;h=8e5c06b3631b31b2263129f98206d8bf1c30745e;hb=279c6495df1a0de231600a2d283098c7411c4730;hp=2785639d88bb374d27949760f5e25c1009fd0c42;hpb=2963965a346b42b6b9a2d0878ee076220be7077b;p=jalview.git
diff --git a/test/jalview/gui/AnnotationRowFilterTest.java b/test/jalview/gui/AnnotationRowFilterTest.java
index 2785639..8e5c06b 100644
--- a/test/jalview/gui/AnnotationRowFilterTest.java
+++ b/test/jalview/gui/AnnotationRowFilterTest.java
@@ -1,9 +1,27 @@
+/*
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
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 +29,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 +49,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)
@@ -82,13 +104,15 @@ 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);
@@ -96,9 +120,8 @@ public class AnnotationRowFilterTest
* drop-down items with 'Per-sequence only' not checked
*/
Vector 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]");
+ 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");
assertEquals(testee.getAnnotationMenuLabel(ann2a), "Significance_1");