Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / test / jalview / util / ColorUtilsTest.java

diff --git a/test/jalview/util/ColorUtilsTest.java b/test/jalview/util/ColorUtilsTest.java
index 9d9482c..1ee0392 100644 (file)
--- a/test/jalview/util/ColorUtilsTest.java
+++ b/test/jalview/util/ColorUtilsTest.java
@@ -24,13 +24,13 @@ import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertSame;
 
+
 import java.awt.Color;
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import jalview.gui.JvOptionPane;
-
 public class ColorUtilsTest
 {
 
@@ -206,9 +206,10 @@ public class ColorUtilsTest
      */
     assertNull(ColorUtils.parseColourString(null));
     assertNull(ColorUtils.parseColourString("rubbish"));
-    assertNull(ColorUtils.parseColourString("-1"));
-    assertNull(ColorUtils.parseColourString(String
-            .valueOf(Integer.MAX_VALUE)));
+    // from 2.11.2
+    assertEquals(Color.WHITE, ColorUtils.parseColourString("-1"));
+    assertNull(ColorUtils
+            .parseColourString(String.valueOf(Integer.MAX_VALUE)));
     assertNull(ColorUtils.parseColourString("100,200,300")); // out of range
     assertNull(ColorUtils.parseColourString("100,200")); // too few
     assertNull(ColorUtils.parseColourString("100,200,100,200")); // too many