assertNull(ColorUtils.brighterThan(null));
}
- /**
- * @see http://www.rtapo.com/notes/named_colors.html
- */
@Test(groups = { "Functional" })
public void testToTkCode()
{
// '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
*/
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
@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")
{
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),