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 9c9437e..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 jalview.gui.JvOptionPane;
 
 import java.awt.Color;
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import jalview.gui.JvOptionPane;
 public class ColorUtilsTest
 {
 
@@ -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);
   }
 
@@ -206,6 +206,7 @@ public class ColorUtilsTest
      */
     assertNull(ColorUtils.parseColourString(null));
     assertNull(ColorUtils.parseColourString("rubbish"));
+    // from 2.11.2
     assertEquals(Color.WHITE, ColorUtils.parseColourString("-1"));
     assertNull(ColorUtils
             .parseColourString(String.valueOf(Integer.MAX_VALUE)));
@@ -215,8 +216,7 @@ public class ColorUtilsTest
   }
 
   @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"));
@@ -230,8 +230,7 @@ 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),