X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FColorUtilsTest.java;h=08d77b625c7570d51bbd9f20e6e9ac2ee7ad0491;hb=f0fd407e5fad67185a9813c57bfc50aacaf1de6e;hp=0acd806c5ef0a3914b7bb10e5933ef07f8faa200;hpb=37651a9d177de05ff938276071c16ba95ac44c73;p=jalview.git

diff --git a/test/jalview/util/ColorUtilsTest.java b/test/jalview/util/ColorUtilsTest.java
index 0acd806..08d77b6 100644
--- a/test/jalview/util/ColorUtilsTest.java
+++ b/test/jalview/util/ColorUtilsTest.java
@@ -71,9 +71,6 @@ public class ColorUtilsTest
     assertNull(ColorUtils.brighterThan(null));
   }
 
-  /**
-   * @see http://www.rtapo.com/notes/named_colors.html
-   */
   @Test(groups = { "Functional" })
   public void testToTkCode()
   {
@@ -188,8 +185,9 @@ public class ColorUtilsTest
     // 'hex' prefixes _not_ wanted here
     assertNull(ColorUtils.parseColourString("0x" + hexColour));
     assertNull(ColorUtils.parseColourString("#" + hexColour));
-    // out of range, but Color constructor just or's the rgb value with 0
-    assertEquals(Color.black, ColorUtils.parseColourString("1000000"));
+    // hex values must be 6 hex digits
+    assertNull(ColorUtils.parseColourString("1000000"));
+    assertNull(ColorUtils.parseColourString("0ff00"));
 
     /*
      * by RGB triplet
@@ -206,7 +204,7 @@ public class ColorUtilsTest
      */
     assertNull(ColorUtils.parseColourString(null));
     assertNull(ColorUtils.parseColourString("rubbish"));
-    assertEquals(Color.WHITE, ColorUtils.parseColourString("-1"));
+    assertNull(ColorUtils.parseColourString("-1"));
     assertNull(ColorUtils.parseColourString(String
             .valueOf(Integer.MAX_VALUE)));
     assertNull(ColorUtils.parseColourString("100,200,300")); // out of range
@@ -216,13 +214,13 @@ public class ColorUtilsTest
 
   @Test(groups = "Functional")
   public void testGetAWTColorFromName() {
-    assertEquals(Color.white, ColorUtils.getAWTColorFromName("white"));
-    assertEquals(Color.white, ColorUtils.getAWTColorFromName("White"));
-    assertEquals(Color.white, ColorUtils.getAWTColorFromName("WHITE"));
-    assertEquals(Color.pink, ColorUtils.getAWTColorFromName("pink"));
-    assertNull(ColorUtils.getAWTColorFromName("mauve")); // no such name
-    assertNull(ColorUtils.getAWTColorFromName(""));
-    assertNull(ColorUtils.getAWTColorFromName(null));
+    assertEquals(Color.white, ColorUtils.getColorFromName("white"));
+    assertEquals(Color.white, ColorUtils.getColorFromName("White"));
+    assertEquals(Color.white, ColorUtils.getColorFromName("WHITE"));
+    assertEquals(Color.pink, ColorUtils.getColorFromName("pink"));
+    assertNull(ColorUtils.getColorFromName("mauve")); // no such name
+    assertNull(ColorUtils.getColorFromName(""));
+    assertNull(ColorUtils.getColorFromName(null));
   }
 
   @Test(groups = "Functional")
@@ -243,48 +241,4 @@ public class ColorUtilsTest
     assertEquals(new Color(184, 184, 184),
             ColorUtils.createColourFromName("HELLO HELLO HELLO "));
   }
-
-  /**
-   * Tests for the method that returns a colour graduated between darker() and
-   * brighter()
-   */
-  @Test(groups = { "Functional" })
-  public void testGetGraduatedColour_darkerToBrighter()
-  {
-    final Color colour = new Color(180, 200, 220);
-  
-    /*
-     * value half-way between min and max does _not_ mean colour unchanged
-     * darker (*.7) is (126, 140, 154)
-     * brighter (*1/.7) is (255, 255, 255)
-     * midway is (190, 197, 204)
-     */
-    Color col = ColorUtils.getGraduatedColour(20f, 10f, 30f, colour);
-    assertEquals(190, col.getRed());
-    assertEquals(197, col.getGreen());
-    assertEquals(204, col.getBlue());
-
-    // minValue (or less) returns colour.darker()
-    // - or would do if Color.darker calculated better!
-    col = ColorUtils.getGraduatedColour(10f, 10f, 30f, colour);
-    assertEquals(col, new Color(126, 140, 154));
-    // Color.darker computes 125.999999 and rounds down!
-    assertEquals(new Color(125, 140, 154), colour.darker());
-    col = ColorUtils.getGraduatedColour(-10f, 10f, 30f, colour);
-    assertEquals(new Color(126, 140, 154), col);
-
-    // maxValue (or more) returns colour.brighter()
-    col = ColorUtils.getGraduatedColour(30f, 10f, 30f, colour);
-    assertEquals(colour.brighter(), col);
-    col = ColorUtils.getGraduatedColour(40f, 10f, 30f, colour);
-    assertEquals(colour.brighter(), col);
-
-    /*
-     * 'linear' mid-point between 0.7 and 1/0.7 is 1.057
-     * so the '
-     */
-    Color c = new Color(200, 200, 200);
-    col = ColorUtils.getGraduatedColour(106f, 0f, 200f, c);
-    assertEquals(c, col);
-  }
 }