Changeset 18718 in josm for trunk

Timestamp:

2023-04-26T23:13:00+02:00 (12 months ago)

Author:

taylor.smock

Message:

See #22898: JOSM Validator CLI errors out when is run with --load-preferences argument

There was an additional problem related to the directories setup order.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/ValidatorCLI.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java (modified) (9 diffs)

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

@@ -163 +163 @@
     public void processArguments(final String[] argArray) {
         try {
+            // for right-left-hand traffic cache file, needed for preferences
+            Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
             // Ensure that preferences are only in memory
             Config.setPreferencesInstance(new MemoryPreferences());
@@ -348 +350 @@
         Logging.setLogLevel(this.logLevel);
         HttpClient.setFactory(Http1Client::new);
-        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance()); // for right-left-hand traffic cache file
         Config.setUrlsProvider(JosmUrls.getInstance());
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("epsg:3857".toUpperCase(Locale.ROOT)));

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

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
@@ -12 +11 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -29 +28 @@
 import javax.json.JsonObject;
 import javax.json.JsonReader;
-import javax.swing.SwingUtilities;
-
+
+import mockit.Mock;
+import mockit.MockUp;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -43 +44 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.OsmWriter;
 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.AnnotationUtils;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.ThreadSync;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
-
-import mockit.Mock;
-import mockit.MockUp;
 
 /**
@@ -61 +60 @@
 @BasicPreferences
 class ValidatorCLITest {
+    @RegisterExtension
+    ThreadSync.ThreadSyncExtension threadSync = new ThreadSync.ThreadSyncExtension();
+
     @TempDir
     static File temporaryDirectory;
 
     TestHandler handler;
-
-    private static void synchronizeThreads() {
-        MainApplication.worker.execute(() -> { /* Sync worker thread */ });
-        try {
-            SwingUtilities.invokeAndWait(() -> { /* Sync EDT thread */ });
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            fail(e);
-        } catch (InvocationTargetException e) {
-            fail(e);
-        }
-    }
 
     @BeforeEach
@@ -87 +77 @@
 
     @AfterEach
-    void tearDown() throws InterruptedException, InvocationTargetException {
-        synchronizeThreads();
+    void tearDown() {
         Logging.getLogger().removeHandler(this.handler);
         this.handler.close();
@@ -113 +102 @@
                         return Files.copy(file.toPath(), Paths.get(temporaryDirectory.getPath(), renamedValidator)).getFileName().toString();
                     } catch (IOException e) {
-                        fail(e);
+                        throw new UncheckedIOException(e);
                     }
-                    return null;
                 }).map(Arguments::of);
     }
@@ -138 +126 @@
         final File outputFile = new File(outputPath);
         assertTrue(outputFile.exists());
-        synchronizeThreads();
+        threadSync.threadSync();
         final List<JsonObject> errors = readJsonObjects(outputFile.toPath());
         assertEquals(3, errors.stream().map(ValidatorCLITest::getMessage).filter("Overlapping Identical Landuses"::equals).count());
@@ -182 +170 @@
      */
     @Test
-    void testNonRegression22898(final @TempDir Path preferencesLocation) throws IOException {
+    void testNonRegression22898(final @TempDir Path preferencesLocation) throws IOException, ReflectiveOperationException {
+        AnnotationUtils.resetStaticClass(Config.class);
         final ValidatorCLI validatorCLI = new ValidatorCLI();
         final Path preferences = preferencesLocation.resolve("preferences.xml");