From e6ece19f50638d865cfd599b9c82de14b56c93c2 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Thu, 30 Mar 2017 12:16:43 +0100 Subject: [PATCH 1/1] JAL-2346 JAL-1933 test updated to include Occupancy --- test/jalview/gui/AnnotationRowFilterTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 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"); -- 1.7.10.2