Changeset 12826 in josm for trunk/test/unit

Timestamp:

2017-09-12T00:58:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI references from PreferencesUtils

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/PreferencesUtilsTest.java (added)
• gui/io/CustomConfiguratorTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/io/CustomConfiguratorTest.java

@@ -13 +13 @@
 import java.util.Collections;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -24 +23 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.trajano.commons.testing.UtilityClassTestUtil;
 
 /**
@@ -37 +35 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
-
-    /**
-     * Setup test.
-     */
-    @Before
-    public void setUp() {
-        CustomConfigurator.resetLog();
-    }
-
-    /**
-     * Test method for {@link CustomConfigurator#log}.
-     */
-    @Test
-    public void testLog() {
-        assertEquals("", CustomConfigurator.getLog());
-        CustomConfigurator.log("test");
-        assertEquals("test\n", CustomConfigurator.getLog());
-        CustomConfigurator.log("%d\n", 100);
-        assertEquals("test\n100\n", CustomConfigurator.getLog());
-        CustomConfigurator.log("test");
-        assertEquals("test\n100\ntest\n", CustomConfigurator.getLog());
-    }
 
     /**
@@ -106 +82 @@
         assertTrue(Main.pref.getCollection("test").isEmpty());
         CustomConfigurator.readXML(TestUtils.getTestDataRoot() + "customconfigurator", "append.xml");
-        String log = CustomConfigurator.getLog();
+        String log = PreferencesUtils.getLog();
         assertFalse(log, log.contains("Error"));
         assertFalse(Main.pref.getCollection("test").isEmpty());
@@ -117 +93 @@
         assertEquals(1, pref.getCollection("lorem_ipsum").size());
         CustomConfigurator.readXML(new File(TestUtils.getTestDataRoot() + "customconfigurator", "replace.xml"), pref);
-        log = CustomConfigurator.getLog();
+        log = PreferencesUtils.getLog();
         assertFalse(log, log.contains("Error"));
         assertEquals(9, pref.getCollection("lorem_ipsum").size());
     }
-
-    /**
-     * Tests that {@code PreferencesUtils} satisfies utility class criterias.
-     * @throws ReflectiveOperationException if an error occurs
-     */
-    @Test
-    public void testUtilityClass() throws ReflectiveOperationException {
-        UtilityClassTestUtil.assertUtilityClassWellDefined(PreferencesUtils.class);
-    }
 }