X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Frenderer%2Fseqfeatures%2FFeatureRendererTest.java;h=03398c02b9bf42602b0842921d5fd94269047164;hb=ef14d83cfe8ca0bb2271d50d638516cdc90c2b8b;hp=73ae9d7912169dfa9aacdbd2863924590a04f73a;hpb=07108e505ff923f3b5135ffbdbb79259fe53432e;p=jalview.git

diff --git a/test/jalview/renderer/seqfeatures/FeatureRendererTest.java b/test/jalview/renderer/seqfeatures/FeatureRendererTest.java
index 73ae9d7..03398c0 100644
--- a/test/jalview/renderer/seqfeatures/FeatureRendererTest.java
+++ b/test/jalview/renderer/seqfeatures/FeatureRendererTest.java
@@ -9,14 +9,14 @@ import jalview.api.AlignViewportI;
 import jalview.api.FeatureColourI;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
+import jalview.datamodel.features.FeatureMatcher;
+import jalview.datamodel.features.FeatureMatcherSet;
+import jalview.datamodel.features.FeatureMatcherSetI;
 import jalview.gui.AlignFrame;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
 import jalview.schemes.FeatureColour;
 import jalview.util.matcher.Condition;
-import jalview.util.matcher.KeyedMatcher;
-import jalview.util.matcher.KeyedMatcherSet;
-import jalview.util.matcher.KeyedMatcherSetI;
 import jalview.viewmodel.seqfeatures.FeatureRendererModel.FeatureSettingsBean;
 
 import java.awt.Color;
@@ -68,9 +68,8 @@ public class FeatureRendererTest
     seqs.get(2).addSequenceFeature(
             new SequenceFeature("Pfam", "Desc", 14, 22, 2f, "RfamGroup"));
     // bug in findAllFeatures - group not checked for a known feature type
-    seqs.get(2).addSequenceFeature(
-            new SequenceFeature("Rfam", "Desc", 5, 9, Float.NaN,
-                    "RfamGroup"));
+    seqs.get(2).addSequenceFeature(new SequenceFeature("Rfam", "Desc", 5, 9,
+            Float.NaN, "RfamGroup"));
     // existing feature type with null group
     seqs.get(3).addSequenceFeature(
             new SequenceFeature("Rfam", "Desc", 5, 9, Float.NaN, null));
@@ -129,7 +128,8 @@ public class FeatureRendererTest
     data[1] = new FeatureSettingsBean("Pfam", colour, null, false);
     data[2] = new FeatureSettingsBean("Scop", colour, null, false);
     fr.setFeaturePriority(data);
-    assertEquals(fr.getRenderOrder(), Arrays.asList("Scop", "Pfam", "Rfam"));
+    assertEquals(fr.getRenderOrder(),
+            Arrays.asList("Scop", "Pfam", "Rfam"));
     assertEquals(fr.getDisplayedFeatureTypes(), Arrays.asList("Rfam"));
 
     /*
@@ -260,7 +260,7 @@ public class FeatureRendererTest
     features = fr.findFeaturesAtColumn(seq, 5);
     assertEquals(features.size(), 1);
     assertTrue(features.contains(sf8));
-    
+
     /*
      * give "Type3" features a graduated colour scheme
      * - first with no threshold
@@ -412,7 +412,7 @@ public class FeatureRendererTest
     // score 6 is half way from yellow(255, 255, 0) to red(255, 0, 0)
     Color expected = new Color(255, 128, 0);
     assertEquals(fr.getColour(sf2), expected);
-    
+
     /*
      * above threshold, score is above threshold - no change
      */
@@ -468,14 +468,14 @@ public class FeatureRendererTest
     // with filter on AF < 4
     gc.setAboveThreshold(false);
     assertEquals(fr.getColour(sf2), expected);
-    KeyedMatcherSetI filter = new KeyedMatcherSet();
-    filter.and(new KeyedMatcher(Condition.LT, 4f, "AF"));
+    FeatureMatcherSetI filter = new FeatureMatcherSet();
+    filter.and(FeatureMatcher.byAttribute(Condition.LT, "4.0", "AF"));
     fr.setFeatureFilter("Cath", filter);
     assertNull(fr.getColour(sf2));
 
     // with filter on 'Consequence contains missense'
-    filter = new KeyedMatcherSet();
-    filter.and(new KeyedMatcher(Condition.Contains, "missense",
+    filter = new FeatureMatcherSet();
+    filter.and(FeatureMatcher.byAttribute(Condition.Contains, "missense",
             "Consequence"));
     fr.setFeatureFilter("Cath", filter);
     // if feature has no Consequence attribute, no colour
@@ -487,10 +487,10 @@ public class FeatureRendererTest
     sf2.setValue("Consequence", "Missense variant");
     assertEquals(fr.getColour(sf2), expected);
 
-    // with filter on CSQ.Feature contains "ENST01234"
-    filter = new KeyedMatcherSet();
-    filter.and(new KeyedMatcher(Condition.Matches, "ENST01234", "CSQ",
-            "Feature"));
+    // with filter on CSQ:Feature contains "ENST01234"
+    filter = new FeatureMatcherSet();
+    filter.and(FeatureMatcher.byAttribute(Condition.Matches, "ENST01234",
+            "CSQ", "Feature"));
     fr.setFeatureFilter("Cath", filter);
     // if feature has no CSQ data, no colour
     assertNull(fr.getColour(sf2));