Changeset 18893 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java

Timestamp:

2023-11-02T13:14:51+01:00 (11 months ago)

Author:

taylor.smock

Message:

Fix #16567: Upgrade to JUnit 5

JOSMTestRules and JOSMTestFixture can reset the default JOSM profile, which can
be unexpected for new contributors. This updates all tests to use JUnit 5 and
the new JUnit 5 annotations.

This also renames MapCSSStyleSourceFilterTest to MapCSSStyleSourceFilterPerformanceTest
to match the naming convention for performance tests and fixes some lint issues.

This was tested by running all tests individually and together.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java

@@ -13 +13 @@
 import java.util.logging.LogRecord;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
@@ -62 +60 @@
     protected static class LoggingHandler extends Handler {
 
-        private List<LogRecord> records = new ArrayList<>();
+        private final List<LogRecord> records = new ArrayList<>();
 
         @Override
@@ -79 +77 @@
         }
 
-    }
-
-    @BeforeAll
-    public static void setUpClass() {
-        JOSMFixture.createUnitTestFixture().init();
     }
 
@@ -153 +146 @@
         CapturingActiveLayerChangeListener listener2 = new CapturingActiveLayerChangeListener();
         layerManagerWithActive.addAndFireActiveLayerChangeListener(listener2);
-        assertSame(listener2.lastEvent.getPreviousActiveLayer(), null);
-        assertSame(listener2.lastEvent.getPreviousDataLayer(), null);
+        assertNull(listener2.lastEvent.getPreviousActiveLayer());
+        assertNull(listener2.lastEvent.getPreviousDataLayer());
 
         layerManagerWithActive.setActiveLayer(layer1);