Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

[jalview.git] / test / jalview / schemes / ResidueColourSchemeTest.java

diff --git a/test/jalview/schemes/ResidueColourSchemeTest.java b/test/jalview/schemes/ResidueColourSchemeTest.java
index e6dc9e6..c3ea385 100644 (file)
--- a/test/jalview/schemes/ResidueColourSchemeTest.java
+++ b/test/jalview/schemes/ResidueColourSchemeTest.java
@@ -81,11 +81,11 @@ public class ResidueColourSchemeTest
     rcs.setThreshold(0, true);
     assertTrue(rcs.aboveThreshold('a', 0));
     assertTrue(rcs.aboveThreshold('S', 0));
-    assertFalse(rcs.aboveThreshold('W', 0));
+    assertTrue(rcs.aboveThreshold('W', 0));
     assertTrue(rcs.aboveThreshold('R', 1));
-    assertFalse(rcs.aboveThreshold('W', 2));
+    assertTrue(rcs.aboveThreshold('W', 2));
     assertTrue(rcs.aboveThreshold('t', 3));
-    assertFalse(rcs.aboveThreshold('Q', 3));
+    assertTrue(rcs.aboveThreshold('Q', 3));
 
     /*
      * with threshold, include gaps
@@ -207,8 +207,7 @@ public class ResidueColourSchemeTest
             .isApplicableTo(peptide));
     assertFalse(new ClustalxColourScheme(nucleotide, null)
             .isApplicableTo(nucleotide));
-    // Blosum requires presence of Conservation annotation
-    assertFalse(new Blosum62ColourScheme().isApplicableTo(peptide));
+    assertTrue(new Blosum62ColourScheme().isApplicableTo(peptide));
     assertFalse(new Blosum62ColourScheme().isApplicableTo(nucleotide));
     assertTrue(new BuriedColourScheme().isApplicableTo(peptide));
     assertFalse(new BuriedColourScheme().isApplicableTo(nucleotide));
@@ -225,11 +224,6 @@ public class ResidueColourSchemeTest
     assertTrue(new ZappoColourScheme().isApplicableTo(peptide));
     assertFalse(new ZappoColourScheme().isApplicableTo(nucleotide));
 
-    peptide.addAnnotation(new AlignmentAnnotation("Conservation",
-            "Conservation", new Annotation[1], 0f, 11f,
-            AlignmentAnnotation.BAR_GRAPH));
-    assertTrue(new Blosum62ColourScheme().isApplicableTo(peptide));
-
     /*
      * nucleotide-specific colour schemes
      */