X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Futil%2FColorUtilsTest.java;h=9c9437e9565ea3537ca668892487ff740581ea8b;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=fa4091fab151d3eaefb58cdb782821050f303011;hpb=e7338a61f3ce96dadf44ac80b2b32cc5ba4b94c8;p=jalview.git diff --git a/test/jalview/util/ColorUtilsTest.java b/test/jalview/util/ColorUtilsTest.java index fa4091f..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),