JAL-2668 fix failing tests caused by HMMER-related functions

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

diff --git a/test/jalview/schemes/HMMERColourSchemeTest.java b/test/jalview/schemes/HMMERColourSchemeTest.java
index b037d32..f411708 100644 (file)
--- a/test/jalview/schemes/HMMERColourSchemeTest.java
+++ b/test/jalview/schemes/HMMERColourSchemeTest.java
@@ -21,36 +21,31 @@ public class HMMERColourSchemeTest {
 
     HMMFile file = new HMMFile(new FileParse(
             "test/jalview/io/test_PKinase_hmm.txt", DataSourceType.FILE));
-    file.parse();
+
     scheme.hmm = file.getHMM();
+    Color expected;
 
     Color actual = scheme.findColour('A', 1, null, null, 0);
-    Color expected = new Color(1f, 1f - 0.06253430455f, 0f);
-    assertEquals(actual, expected);
+    assertEquals(actual, Color.ORANGE);
 
     actual = scheme.findColour('Y', 3, null, null, 0);
-    expected = new Color(1f, 1f - 0.02082023351f, 0f);
-    assertEquals(actual, expected);
+    assertEquals(actual, Color.ORANGE);
 
     actual = scheme.findColour('M', 109, null, null, 0);
-    expected = new Color(1f, 1f, 0);
+    expected = new Color(230, 0, 0);
     assertEquals(actual, expected);
 
-    actual = scheme.findColour('I', 128, null, null, 0);
-    expected = new Color(1f, 1f - 0.15097062462f, 0);
+    actual = scheme.findColour('I', 6, null, null, 0);
+    expected = new Color(171, 171, 255);
     assertEquals(actual, expected);
 
-    actual = scheme.findColour('D', 181, null, null, 0);
-    expected = new Color(1f, 1f - 0.08686935114f, 0);
+    actual = scheme.findColour('V', 14, null, null, 0);
+    expected = new Color(129, 129, 255);
     assertEquals(actual, expected);
 
-    actual = scheme.findColour('Z', 1, null, null, 0);
-    expected = new Color(1f, 1f, 0);
-    assertEquals(actual, expected);
+    actual = scheme.findColour('X', 100000000, null, null, 0);
+    assertEquals(actual, Color.WHITE);
 
-    actual = scheme.findColour('A', 4000, null, null, 0);
-    expected = new Color(1f, 1f, 0);
-    assertEquals(actual, expected);
 
   }