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

diff --git a/test/jalview/util/ColorUtilsTest.java b/test/jalview/util/ColorUtilsTest.java
index 0acd806..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(groups = "Functional")
-  public void testGetAWTColorFromName() {
+  public void testGetAWTColorFromName()
+  {
     assertEquals(Color.white, ColorUtils.getAWTColorFromName("white"));
     assertEquals(Color.white, ColorUtils.getAWTColorFromName("White"));
     assertEquals(Color.white, ColorUtils.getAWTColorFromName("WHITE"));
@@ -229,7 +230,8 @@ public class ColorUtilsTest
   public void testCreateColourFromName()
   {
     assertEquals(Color.white, ColorUtils.createColourFromName(null));
-    assertEquals(new Color(20, 20, 20), ColorUtils.createColourFromName(""));
+    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),
@@ -243,48 +245,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);
-  }
 }