Merge branch 'develop' into features/JAL-2094_colourInterface

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

diff --git a/test/jalview/schemes/FeatureColourTest.java b/test/jalview/schemes/FeatureColourTest.java
index ccae3e8..db64cf5 100644 (file)
--- a/test/jalview/schemes/FeatureColourTest.java
+++ b/test/jalview/schemes/FeatureColourTest.java
@@ -172,7 +172,7 @@ public class FeatureColourTest
      */
     fc = new FeatureColour(Color.GREEN, Color.RED, 12f, 25f);
     String greenHex = Format.getHexString(Color.GREEN);
-    String expected = String.format("domain\t%s|%s|12.0|25.0|none",
+    String expected = String.format("domain\t%s|%s|abso|12.0|25.0|none",
             greenHex, redHex);
     assertEquals(expected, fc.toJalviewFormat("domain"));
 
@@ -180,7 +180,7 @@ public class FeatureColourTest
      * colour ranges over the actual score ranges (not min/max)
      */
     fc.setAutoScaled(true);
-    expected = String.format("domain\t%s|%s|abso|12.0|25.0|none", greenHex,
+    expected = String.format("domain\t%s|%s|12.0|25.0|none", greenHex,
             redHex);
     assertEquals(expected, fc.toJalviewFormat("domain"));
 
@@ -189,7 +189,7 @@ public class FeatureColourTest
      */
     fc.setThreshold(12.5f);
     fc.setBelowThreshold(true);
-    expected = String.format("domain\t%s|%s|abso|12.0|25.0|below|12.5",
+    expected = String.format("domain\t%s|%s|12.0|25.0|below|12.5",
             greenHex, redHex);
     assertEquals(expected, fc.toJalviewFormat("domain"));
 
@@ -198,6 +198,7 @@ public class FeatureColourTest
      */
     fc.setThreshold(12.5f);
     fc.setAboveThreshold(true);
+    fc.setAutoScaled(false);
     expected = String.format("domain\t%s|%s|abso|12.0|25.0|above|12.5",
             greenHex, redHex);
     assertEquals(expected, fc.toJalviewFormat("domain"));