X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2Ffeatures%2FFeatureMatcherSetTest.java;h=47c47a9f674344ee856c27f3c4c114cae1b53a60;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=34bc8feeb5c2a6894a6032711ebc62f96575f908;hpb=ec44bf310ff6aaa0438f486dadc65f2af385d99d;p=jalview.git diff --git a/test/jalview/datamodel/features/FeatureMatcherSetTest.java b/test/jalview/datamodel/features/FeatureMatcherSetTest.java index 34bc8fe..47c47a9 100644 --- a/test/jalview/datamodel/features/FeatureMatcherSetTest.java +++ b/test/jalview/datamodel/features/FeatureMatcherSetTest.java @@ -104,7 +104,8 @@ public class FeatureMatcherSetTest * OR failed attribute and score conditions with matched label condition */ fms = new FeatureMatcherSet(); - fms.or(fm2).or(byScoreFail); + fms.or(fm2); + fms.or(byScoreFail); assertFalse(fms.matches(sf)); fms.or(byLabelPass); assertTrue(fms.matches(sf)); @@ -239,8 +240,8 @@ public class FeatureMatcherSetTest } /** - * Tests for the 'compound attribute' key i.e. where first key's value is a map - * from which we take the value for the second key, e.g. CSQ : Consequence + * Tests for the 'compound attribute' key i.e. where first key's value is a + * map from which we take the value for the second key, e.g. CSQ : Consequence */ @Test(groups = "Functional") public void testMatches_compoundKey() @@ -296,11 +297,11 @@ public class FeatureMatcherSetTest FeatureMatcherI fm1 = FeatureMatcher.byAttribute(Condition.LT, "1.2", "AF"); assertEquals(fm1.toStableString(), "AF LT 1.2"); - + FeatureMatcher fm2 = FeatureMatcher.byAttribute(Condition.NotContains, "path", "CLIN_SIG"); assertEquals(fm2.toStableString(), "CLIN_SIG NotContains path"); - + /* * AND them */ @@ -313,7 +314,7 @@ public class FeatureMatcherSetTest fms.and(fm2); assertEquals(fms.toStableString(), "(AF LT 1.2) AND (CLIN_SIG NotContains path)"); - + /* * OR them */ @@ -324,7 +325,7 @@ public class FeatureMatcherSetTest fms.or(fm2); assertEquals(fms.toStableString(), "(AF LT 1.2) OR (CLIN_SIG NotContains path)"); - + /* * attribute or value including space is quoted */ @@ -375,7 +376,7 @@ public class FeatureMatcherSetTest fms = FeatureMatcherSet .fromString("(AF LT 1.2) and (CLIN_SIG NotContains path)"); assertEquals(fms.toStableString(), descriptor); - + descriptor = "(AF LT 1.2) OR (CLIN_SIG NotContains path)"; fms = FeatureMatcherSet.fromString(descriptor); assertEquals(fms.toStableString(), descriptor); @@ -389,7 +390,7 @@ public class FeatureMatcherSetTest fms = FeatureMatcherSet .fromString("(AF LT 1.2) or CLIN_SIG NotContains path"); assertEquals(fms.toStableString(), descriptor); - + descriptor = "(AF LT 1.2) OR (CLIN_SIG NotContains path) OR ('CSQ:Poly Phen' NotMatches 'foo bar')"; fms = FeatureMatcherSet.fromString(descriptor); assertEquals(fms.toStableString(), descriptor);