Changeset 18714 in josm for trunk

Timestamp:

2023-04-25T16:11:37+02:00 (12 months ago)

Author:

taylor.smock

Message:

Fix #22898: JOSM Validator CLI errors out when is run with --load-preferences argument (patch by emanuel_raymond, modified)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/ValidatorCLI.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java

@@ -431 +431 @@
             if (pref instanceof MemoryPreferences) {
                 final MemoryPreferences memoryPreferences = (MemoryPreferences) pref;
-                tempPreferences.getAllSettings().entrySet().stream().filter(entry -> entry.getValue().isNew())
-                        .forEach(entry -> memoryPreferences.putSetting(entry.getKey(), entry.getValue()));
+                tempPreferences.getAllSettings().forEach(memoryPreferences::putSetting);
             } else {
                 throw new JosmRuntimeException(tr("Preferences are not the expected type"));

trunk/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java

@@ -10 +10 @@
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.lang.reflect.InvocationTargetException;
@@ -46 +47 @@
 import org.openstreetmap.josm.io.OsmWriterFactory;
 import org.openstreetmap.josm.spi.lifecycle.Lifecycle;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.tools.Logging;
@@ -177 +179 @@
 
     /**
+     * A non-regression test for #22898: Validator CLI errors out when is run with --load-preferences argument
+     */
+    @Test
+    void testNonRegression22898(final @TempDir Path preferencesLocation) throws IOException {
+        final ValidatorCLI validatorCLI = new ValidatorCLI();
+        final Path preferences = preferencesLocation.resolve("preferences.xml");
+        try (OutputStream fos = Files.newOutputStream(preferences)) {
+            final String pref = "<config>\n" +
+                    "    <preferences operation=\"replace\">\n" +
+                    "        <list key='plugins'>\n" +
+                    "          <entry value='baz'/>\n" +
+                    "        </list>\n" +
+                    "    </preferences>\n" +
+                    "</config>";
+            fos.write(pref.getBytes(StandardCharsets.UTF_8));
+        }
+        validatorCLI.processArguments(new String[]{"--load-preferences=" + preferences,
+                "--input", "resources/styles/standard/elemstyles.mapcss"});
+        assertEquals(Collections.singletonList("baz"), Config.getPref().getList("plugins"));
+    }
+
+    /**
      * Read json objects from a file
      * @param path The file to read