X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FColorUtilsTest.java;h=9c9437e9565ea3537ca668892487ff740581ea8b;hb=d79e3747b8ce78b1ac7aa83402e31b7e5dccfe1b;hp=77a03d6fd00427f93c484a4ce124037d9f3c638d;hpb=b0cee3aaf7d8873910939f97b6acb217d518968d;p=jalview.git

diff --git a/test/jalview/util/ColorUtilsTest.java b/test/jalview/util/ColorUtilsTest.java
index 77a03d6..9c9437e 100644
--- a/test/jalview/util/ColorUtilsTest.java
+++ b/test/jalview/util/ColorUtilsTest.java
@@ -102,8 +102,8 @@ public class ColorUtilsTest
     /*
      * value two-thirds of the way between min and max
      */
-    col = ColorUtils
-            .getGraduatedColour(30f, 10f, minColour, 40f, maxColour);
+    col = ColorUtils.getGraduatedColour(30f, 10f, minColour, 40f,
+            maxColour);
     assertEquals(153, col.getRed());
     // Color constructor rounds float value to nearest int
     assertEquals(167, col.getGreen());
@@ -112,15 +112,15 @@ public class ColorUtilsTest
     /*
      * value = min
      */
-    col = ColorUtils
-            .getGraduatedColour(10f, 10f, minColour, 30f, maxColour);
+    col = ColorUtils.getGraduatedColour(10f, 10f, minColour, 30f,
+            maxColour);
     assertEquals(minColour, col);
 
     /*
      * value = max
      */
-    col = ColorUtils
-            .getGraduatedColour(30f, 10f, minColour, 30f, maxColour);
+    col = ColorUtils.getGraduatedColour(30f, 10f, minColour, 30f,
+            maxColour);
     assertEquals(maxColour, col);
 
     /*
@@ -132,15 +132,15 @@ public class ColorUtilsTest
     /*
      * value > max
      */
-    col = ColorUtils
-            .getGraduatedColour(40f, 10f, minColour, 30f, maxColour);
+    col = ColorUtils.getGraduatedColour(40f, 10f, minColour, 30f,
+            maxColour);
     assertEquals(maxColour, col);
 
     /*
      * min = max
      */
-    col = ColorUtils
-            .getGraduatedColour(40f, 10f, minColour, 10f, maxColour);
+    col = ColorUtils.getGraduatedColour(40f, 10f, minColour, 10f,
+            maxColour);
     assertEquals(minColour, col);
   }
 
@@ -207,15 +207,16 @@ public class ColorUtilsTest
     assertNull(ColorUtils.parseColourString(null));
     assertNull(ColorUtils.parseColourString("rubbish"));
     assertEquals(Color.WHITE, ColorUtils.parseColourString("-1"));
-    assertNull(ColorUtils.parseColourString(String
-            .valueOf(Integer.MAX_VALUE)));
+    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
   }
 
-  @Test
-  public void testGetAWTColorFromName() {
+  @Test(groups = "Functional")
+  public void testGetAWTColorFromName()
+  {
     assertEquals(Color.white, ColorUtils.getAWTColorFromName("white"));
     assertEquals(Color.white, ColorUtils.getAWTColorFromName("White"));
     assertEquals(Color.white, ColorUtils.getAWTColorFromName("WHITE"));
@@ -224,4 +225,24 @@ public class ColorUtilsTest
     assertNull(ColorUtils.getAWTColorFromName(""));
     assertNull(ColorUtils.getAWTColorFromName(null));
   }
+
+  @Test(groups = "Functional")
+  public void testCreateColourFromName()
+  {
+    assertEquals(Color.white, ColorUtils.createColourFromName(null));
+    assertEquals(new Color(20, 20, 20),
+            ColorUtils.createColourFromName(""));
+    assertEquals(new Color(98, 131, 171),
+            ColorUtils.createColourFromName("None")); // no special treatment!
+    assertEquals(new Color(123, 211, 122),
+            ColorUtils.createColourFromName("hello world"));
+    assertEquals(new Color(27, 147, 112),
+            ColorUtils.createColourFromName("HELLO WORLD"));
+    /*
+     * the algorithm makes the same values for r,g,b if 
+     * the string consists of 3 repeating substrings
+     */
+    assertEquals(new Color(184, 184, 184),
+            ColorUtils.createColourFromName("HELLO HELLO HELLO "));
+  }
 }