X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FFeatureSettingsTest.java;h=55f21114d8b15582c39180b1c87c75f53338405f;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=6d8a47e0799c1b0eece262127425608e59a81f43;hpb=ed1529065c002bb837ea2572b00d1dfdceaa6050;p=jalview.git diff --git a/test/jalview/gui/FeatureSettingsTest.java b/test/jalview/gui/FeatureSettingsTest.java index 6d8a47e..55f2111 100644 --- a/test/jalview/gui/FeatureSettingsTest.java +++ b/test/jalview/gui/FeatureSettingsTest.java @@ -4,6 +4,13 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; +import java.awt.Color; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; + +import org.testng.annotations.Test; + import jalview.api.FeatureColourI; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; @@ -15,13 +22,7 @@ import jalview.io.FileLoader; import jalview.schemes.FeatureColour; import jalview.schemes.FeatureColourTest; import jalview.util.matcher.Condition; - -import java.awt.Color; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; - -import org.testng.annotations.Test; +import jalview.viewmodel.seqfeatures.FeatureRendererModel; public class FeatureSettingsTest { @@ -50,7 +51,7 @@ public class FeatureSettingsTest /* * set colour schemes for features */ - FeatureRenderer fr = af.getFeatureRenderer(); + FeatureRendererModel fr = af.getFeatureRenderer(); // type1: red fr.setColour("type1", new FeatureColour(Color.red)); @@ -155,11 +156,12 @@ public class FeatureSettingsTest assertTrue(fc.isBelowThreshold()); assertEquals(fc.getThreshold(), 3f); - assertEquals(fr.getFeatureFilter("type1").toStableString(), "Label Contains x"); + assertEquals(fr.getFeatureFilter("type1").toStableString(), + "Label Contains x"); assertEquals(fr.getFeatureFilter("type2").toStableString(), "(Score LE 2.4) AND (Score GT 1.1)"); assertEquals(fr.getFeatureFilter("type3").toStableString(), - "(AF Contains X) OR (CSQ:PolyPhen NE 0.0)"); + "(AF Contains X) OR (CSQ:PolyPhen NE 0)"); } /**