Index: trunk/test/unit/org/openstreetmap/josm/tools/ColorHelperTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ColorHelperTest.java	(revision 16226)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ColorHelperTest.java	(revision 16252)
@@ -15,4 +15,32 @@
 
     /**
+     * Unit test of method {@link ColorHelper#html2color}.
+     */
+    @Test
+    public void testHtml2color() {
+        assertNull(ColorHelper.html2color(""));
+        assertNull(ColorHelper.html2color("xyz"));
+        assertEquals(Color.CYAN, ColorHelper.html2color("0ff"));
+        assertEquals(Color.CYAN, ColorHelper.html2color("#0ff"));
+        assertEquals(Color.CYAN, ColorHelper.html2color("00ffff"));
+        assertEquals(Color.CYAN, ColorHelper.html2color("#00ffff"));
+        assertEquals(Color.CYAN, ColorHelper.html2color("#00FFFF"));
+        assertEquals(new Color(0x12345678, true), ColorHelper.html2color("#34567812"));
+    }
+
+    /**
+     * Unit test of method {@link ColorHelper#color2html}.
+     */
+    @Test
+    public void testColor2html() {
+        assertNull(ColorHelper.color2html(null));
+        assertEquals("#FF0000", ColorHelper.color2html(Color.RED));
+        assertEquals("#00FFFF", ColorHelper.color2html(Color.CYAN));
+        assertEquals("#34567812", ColorHelper.color2html(new Color(0x12345678, true)));
+        assertEquals("#34567812", ColorHelper.color2html(new Color(0x12345678, true), true));
+        assertEquals("#345678", ColorHelper.color2html(new Color(0x12345678, true), false));
+    }
+
+    /**
      * Unit test of method {@link ColorHelper#getForegroundColor}.
      */
@@ -26,3 +54,56 @@
         assertEquals(Color.BLACK, ColorHelper.getForegroundColor(Color.WHITE));
     }
+
+    /**
+     * Test of {@link ColorHelper#float2int}
+     */
+    @Test
+    public void testColorFloat2int() {
+        assertNull(ColorHelper.float2int(null));
+        assertEquals(255, (int) ColorHelper.float2int(-1.0f));
+        assertEquals(0, (int) ColorHelper.float2int(-0.0f));
+        assertEquals(0, (int) ColorHelper.float2int(0.0f));
+        assertEquals(64, (int) ColorHelper.float2int(0.25f));
+        assertEquals(128, (int) ColorHelper.float2int(0.5f));
+        assertEquals(255, (int) ColorHelper.float2int(1.0f));
+        assertEquals(255, (int) ColorHelper.float2int(2.0f));
+    }
+
+    /**
+     * Test of {@link ColorHelper#int2float}
+     */
+    @Test
+    public void testColorInt2float() {
+        assertNull(ColorHelper.int2float(null));
+        assertEquals(1.0f, ColorHelper.int2float(-1), 1e-3);
+        assertEquals(0.0f, ColorHelper.int2float(0), 1e-3);
+        assertEquals(0.25f, ColorHelper.int2float(64), 1e-3);
+        assertEquals(0.502f, ColorHelper.int2float(128), 1e-3);
+        assertEquals(0.753f, ColorHelper.int2float(192), 1e-3);
+        assertEquals(1.0f, ColorHelper.int2float(255), 1e-3);
+        assertEquals(1.0f, ColorHelper.int2float(1024), 1e-3);
+    }
+
+    /**
+     * Test of {@link ColorHelper#alphaMultiply}
+     */
+    @Test
+    public void testAlphaMultiply() {
+        final Color color = new Color(0x12345678, true);
+        assertEquals(new Color(0x12345678, true), ColorHelper.alphaMultiply(color, 1f));
+        assertEquals(new Color(0x24345678, true), ColorHelper.alphaMultiply(color, 2f));
+    }
+
+    /**
+     * Test of {@link ColorHelper#complement}
+     */
+    @Test
+    public void testComplement() {
+        assertEquals(Color.cyan, ColorHelper.complement(Color.red));
+        assertEquals(Color.red, ColorHelper.complement(Color.cyan));
+        assertEquals(Color.magenta, ColorHelper.complement(Color.green));
+        assertEquals(Color.green, ColorHelper.complement(Color.magenta));
+        assertEquals(Color.yellow, ColorHelper.complement(Color.blue));
+        assertEquals(Color.blue, ColorHelper.complement(Color.yellow));
+    }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java	(revision 16226)
+++ trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java	(revision 16252)
@@ -8,5 +8,4 @@
 import static org.junit.Assert.assertTrue;
 
-import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
@@ -415,67 +414,4 @@
 
     /**
-     * Test of {@link Utils#toString}
-     */
-    @Test
-    public void testToString() {
-        assertEquals("null", Utils.toString(null));
-        assertEquals("#ff0000", Utils.toString(Color.red));
-        assertEquals("#345678(alpha=18)", Utils.toString(new Color(0x12345678, true)));
-    }
-
-    /**
-     * Test of {@link Utils#colorFloat2int}
-     */
-    @Test
-    public void testColorFloat2int() {
-        assertNull(Utils.colorFloat2int(null));
-        assertEquals(255, (int) Utils.colorFloat2int(-1.0f));
-        assertEquals(0, (int) Utils.colorFloat2int(-0.0f));
-        assertEquals(0, (int) Utils.colorFloat2int(0.0f));
-        assertEquals(64, (int) Utils.colorFloat2int(0.25f));
-        assertEquals(128, (int) Utils.colorFloat2int(0.5f));
-        assertEquals(255, (int) Utils.colorFloat2int(1.0f));
-        assertEquals(255, (int) Utils.colorFloat2int(2.0f));
-    }
-
-    /**
-     * Test of {@link Utils#colorInt2float}
-     */
-    @Test
-    public void testColorInt2float() {
-        assertNull(Utils.colorInt2float(null));
-        assertEquals(1.0f, Utils.colorInt2float(-1), 1e-3);
-        assertEquals(0.0f, Utils.colorInt2float(0), 1e-3);
-        assertEquals(0.25f, Utils.colorInt2float(64), 1e-3);
-        assertEquals(0.502f, Utils.colorInt2float(128), 1e-3);
-        assertEquals(0.753f, Utils.colorInt2float(192), 1e-3);
-        assertEquals(1.0f, Utils.colorInt2float(255), 1e-3);
-        assertEquals(1.0f, Utils.colorInt2float(1024), 1e-3);
-    }
-
-    /**
-     * Test of {@link Utils#alphaMultiply}
-     */
-    @Test
-    public void testAlphaMultiply() {
-        final Color color = new Color(0x12345678, true);
-        assertEquals(new Color(0x12345678, true), Utils.alphaMultiply(color, 1f));
-        assertEquals(new Color(0x24345678, true), Utils.alphaMultiply(color, 2f));
-    }
-
-    /**
-     * Test of {@link Utils#complement}
-     */
-    @Test
-    public void testComplement() {
-        assertEquals(Color.cyan, Utils.complement(Color.red));
-        assertEquals(Color.red, Utils.complement(Color.cyan));
-        assertEquals(Color.magenta, Utils.complement(Color.green));
-        assertEquals(Color.green, Utils.complement(Color.magenta));
-        assertEquals(Color.yellow, Utils.complement(Color.blue));
-        assertEquals(Color.blue, Utils.complement(Color.yellow));
-    }
-
-    /**
      * Test of {@link Utils#getMatches}
      */