Changeset 18870 in josm for trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

2023-10-16T15:19:07+02:00 (2 years ago)

Author:

taylor.smock

Message:

See #16567: Update to JUnit 5

This converts most tests to use @Annotations. There are also some performance
improvements as it relates to tests.

Location:

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• MapCSSPerformanceTest.java (modified) (4 diffs)
• MapCSSStyleSourceFilterTest.java (modified) (4 diffs)

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java

@@ -11 +11 @@
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.BeforeAll;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.data.Bounds;
@@ -22 +20 @@
 import org.openstreetmap.josm.gui.mappaint.MapRendererPerformanceTest;
 import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
@@ -28 +27 @@
  *
  */
+@Projection
 class MapCSSPerformanceTest {
 
@@ -46 +46 @@
                       "Please update configuration settings in the unit test file.");
           }
-    }
-
-    /**
-     * Setup test.
-     */
-    @BeforeAll
-    public static void createJOSMFixture() {
-        JOSMFixture.createPerformanceTestFixture().init(true);
     }
 

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java

@@ -4 +4 @@
 import java.util.concurrent.TimeUnit;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
@@ -13 +11 @@
 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator;
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
@@ -18 +17 @@
  * @author Michael Zangl
  */
+@Projection
 @Timeout(value = 15, unit = TimeUnit.MINUTES)
 class MapCSSStyleSourceFilterTest {
@@ -82 +82 @@
 
     /**
-     * Prepare the test.
-     */
-    @BeforeAll
-    public static void createJOSMFixture() {
-        JOSMFixture.createPerformanceTestFixture().init(true);
-    }
-
-    /**
      * Time how long it takes to evaluate [key=value] rules
      */