Changeset 18306 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2021-11-03T01:08:48+01:00 (3 years ago)

Author:

Don-vip

Message:

see #21476 - fix non-regression test in CI environment (patch by taylor.smock)

File:

• trunk/test/unit/org/openstreetmap/josm/actions/UploadActionTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/UploadActionTest.java

@@ -10 +10 @@
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Ignore;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27 +27 @@
 import org.openstreetmap.josm.testutils.mockers.WindowMocker;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Territories;
 
 import mockit.Invocation;
@@ -39 +40 @@
 class UploadActionTest {
     // Only needed for layer cleanup. And user identity cleanup. And ensuring that data isn't accidentally uploaded.
+    // Note that the setUp method can be replaced by the @Territories extension, when that is merged.
     @RegisterExtension
     JOSMTestRules josmTestRules = new JOSMTestRules().main().projection().fakeAPI();
+
+    @BeforeAll
+    static void setUp() {
+        // Territories is needed due to test pollution. One of the listeners
+        // that may get registered on SelectionEventManager requires
+        // Territories. Rather unfortunately, we also need the external data to
+        // avoid the NPE.
+        Territories.initialize();
+    }
 
     /**
@@ -46 +57 @@
      */
     @Test
-    @Ignore("doesn't work on CI")
     void testNonRegression21476() {
         TestUtils.assumeWorkingJMockit();