X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FColorUtilsTest.java;h=1ee0392c480af7bf0dbc00e72ddb48cf754ff127;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=9d9482ca1bf3f4381aea215d78027f1daf5cd00e;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/test/jalview/util/ColorUtilsTest.java b/test/jalview/util/ColorUtilsTest.java index 9d9482c..1ee0392 100644 --- 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