Changeset 12989 in josm for trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.java

Timestamp:

2017-10-12T19:56:13+02:00 (7 years ago)

Author:

bastiK

Message:

closes #15410 - update tests + minor fixes

File:

• trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.awt.Color;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -28 +24 @@
 
     /**
-     * Test color name.
-     */
-    @Test
-    public void testColorName() {
-        assertEquals("Layer: {5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx",
-                Main.pref.getColorName("layer.{5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx"));
-    }
-
-    /**
-     * Test color alpha.
-     */
-    @Test
-    public void testColorAlpha() {
-        assertEquals(0x12, new ColorProperty("foo", new Color(0x12345678, true)).get().getAlpha());
-        assertTrue(Main.pref.putColor("bar", new Color(0x12345678, true)));
-        assertEquals(0x12, new ColorProperty("bar", Color.RED).get().getAlpha());
-    }
-
-    /**
-     * Test color name and alpha.
-     */
-    @Test
-    public void testColorNameAlpha() {
-        assertEquals(0x12, new ColorProperty("foo", new Color(0x12345678, true)).get().getAlpha());
-        assertEquals(new Color(0x34, 0x56, 0x78, 0x12), Main.pref.getDefaultColor("foo"));
-        assertEquals(0x12, Main.pref.getDefaultColor("foo").getAlpha());
-    }
-
-    /**
      * Test {@link Preferences#toXML}.
      */