Changeset 9524 in josm

Timestamp:

2016-01-18T01:46:48+01:00 (9 years ago)

Author:

Don-vip

Message:

CustomConfigurator - add unit test, javadoc, and use JavaScript engine instead of rhino, gone with Java 8 (replaced by Nashorn)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/CustomConfigurator.java (modified) (3 diffs)
• test/data/customconfigurator (added)
• test/data/customconfigurator/append.xml (added)
• test/data/customconfigurator/replace.xml (added)
• test/unit/org/openstreetmap/josm/data/CustomConfiguratorTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -97 +97 @@
     }
 
+    /**
+     * Resets the log.
+     */
+    public static void resetLog() {
+        summary = new StringBuilder();
+    }
+
+    /**
+     * Read configuration script from XML file, modifying main preferences
+     * @param dir - directory
+     * @param fileName - XML file name
+     */
     public static void readXML(String dir, String fileName) {
         readXML(new File(dir, fileName));
@@ -474 +486 @@
             try {
                 this.mainPrefs = mainPrefs;
-                summary = new StringBuilder();
-                engine = new ScriptEngineManager().getEngineByName("rhino");
+                resetLog();
+                engine = new ScriptEngineManager().getEngineByName("JavaScript");
                 engine.eval("API={}; API.pref={}; API.fragments={};");
 
@@ -493 +505 @@
             } catch (Exception ex) {
                 log("Error: initializing script engine: "+ex.getMessage());
+                Main.error(ex);
             }
         }

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -10 +11 @@
 import java.nio.file.Files;
 import java.util.Arrays;
+import java.util.Collections;
 
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -26 +30 @@
      */
     @BeforeClass
-    public static void setUp() {
+    public static void setUpBeforeClass() {
         JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Setup test.
+     */
+    @Before
+    public void setUp() {
+        CustomConfigurator.resetLog();
     }
 
@@ -79 +91 @@
         Utils.deleteFile(tmp);
     }
+
+    /**
+     * Test method for {@link CustomConfigurator#readXML}.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testReadXML() throws IOException {
+        // Test 1 - read(dir, file) + append
+        Main.pref.putCollection("test", Collections.<String>emptyList());
+        assertTrue(Main.pref.getCollection("test").isEmpty());
+        CustomConfigurator.readXML(TestUtils.getTestDataRoot() + "customconfigurator", "append.xml");
+        String log = CustomConfigurator.getLog();
+        System.out.println(log);
+        assertFalse(log.contains("Error"));
+        assertFalse(Main.pref.getCollection("test").isEmpty());
+
+        // Test 1 - read(file, pref) + replace
+        Preferences pref = new Preferences();
+        pref.putCollection("lorem_ipsum", Arrays.asList("only 1 string"));
+        assertEquals(1, pref.getCollection("lorem_ipsum").size());
+        CustomConfigurator.readXML(new File(TestUtils.getTestDataRoot() + "customconfigurator", "replace.xml"), pref);
+        log = CustomConfigurator.getLog();
+        System.out.println(log);
+        assertFalse(log.contains("Error"));
+        assertEquals(9, pref.getCollection("lorem_ipsum").size());
+    }
 }