Changeset 19223 in josm for trunk/test/performance/org/openstreetmap

Timestamp:

2024-09-17T17:42:35+02:00 (3 months ago)

Author:

taylor.smock

Message:

Add JUnit5 tags to integration tests, functional tests, and performance tests

This should allow contributors to filter out integration tests inside the standard
test directory. Of specific note, this should reduce test runtime for contributors
by a non-trivial amount if contributors filter out the tagged tests.

For consistencies’ sake, tests in functional and performance were also
annotated. As such, if we ever merge the test directories, this will let us
filter which tests are run in CI.

Note that many functional tests don't have the annotation. This is because they
are manual tests.

Location:

trunk/test/performance/org/openstreetmap/josm

Files:

• data/osm/KeyValuePerformanceTest.java (modified) (2 diffs)
• data/osm/RoundingPerformanceTest.java (modified) (1 diff)
• data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java (modified) (2 diffs)
• data/osm/visitor/paint/StyledMapRendererPerformanceTest.java (modified) (1 diff)
• data/osm/visitor/paint/WireframeMapRendererPerformanceTest.java (modified) (1 diff)
• data/validation/ValidationTaskPerformanceTest.java (modified) (2 diffs)
• data/validation/tests/MapCSSTagCheckerPerformanceTest.java (modified) (2 diffs)
• gui/mappaint/MapRendererPerformanceTest.java (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSConditionPerformanceTest.java (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSPerformanceTest.java (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSStyleSourceFilterPerformanceTest.java (modified) (2 diffs)
• io/OsmReaderPerformanceTest.java (modified) (2 diffs)
• io/OsmWriterPerformanceTest.java (modified) (2 diffs)

trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java

@@ -20 +20 @@
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 
@@ -28 +29 @@
  * @author Michael Zangl
  */
+@PerformanceTest
 @Projection
 @Timeout(value = 15, unit = TimeUnit.MINUTES)

trunk/test/performance/org/openstreetmap/josm/data/osm/RoundingPerformanceTest.java

@@ -9 +9 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 
 /**
  * Checks that rounding of coordinates is not too slow.
  */
+@PerformanceTest
 class RoundingPerformanceTest {
 

trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java

@@ -24 +24 @@
 import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.testutils.annotations.Territories;
@@ -32 +33 @@
  * Abstract superclass of {@code StyledMapRendererPerformanceTest} and {@code WireframeMapRendererPerformanceTest}.
  */
+@PerformanceTest
 @Projection
 @Territories

trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java

@@ -12 +12 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 
 /**
  * Performance test of {@code StyledMapRenderer}.
  */
+@PerformanceTest
 class StyledMapRendererPerformanceTest extends AbstractMapRendererPerformanceTestParent {
 

trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRendererPerformanceTest.java

@@ -4 +4 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 
 /**
  * Performance test of {@code WireframeMapRenderer}.
  */
+@PerformanceTest
 class WireframeMapRendererPerformanceTest extends AbstractMapRendererPerformanceTestParent {
 

trunk/test/performance/org/openstreetmap/josm/data/validation/ValidationTaskPerformanceTest.java

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.testutils.annotations.Territories;
@@ -25 +26 @@
  */
 @BasicPreferences
+@PerformanceTest
 @Projection
 @Territories

trunk/test/performance/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerPerformanceTest.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.testutils.annotations.Territories;
@@ -14 +15 @@
  */
 @BasicPreferences
+@PerformanceTest
 @Projection
 @Territories

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java

@@ -46 +46 @@
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.testutils.annotations.Main;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.testutils.annotations.Territories;
@@ -56 +57 @@
 @BasicPreferences
 @Main
+@PerformanceTest
 @Projection
 @Territories

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

@@ -7 +7 @@
 import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.Op;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 
 /**
@@ -12 +13 @@
  * @author Michael Zangl
  */
+@PerformanceTest
 class MapCSSConditionPerformanceTest {
     /**

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.mappaint.MapRendererPerformanceTest;
 import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 
@@ -27 +28 @@
  *
  */
+@PerformanceTest
 @Projection
 class MapCSSPerformanceTest {

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator;
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 
@@ -17 +18 @@
  * @author Michael Zangl
  */
+@PerformanceTest
 @Projection
 @Timeout(value = 15, unit = TimeUnit.MINUTES)

trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java

@@ -17 +17 @@
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 
 /**
@@ -25 +26 @@
  * @author Michael Zangl
  */
+@PerformanceTest
 @Timeout(value = 15, unit = TimeUnit.MINUTES)
 class OsmReaderPerformanceTest {

trunk/test/performance/org/openstreetmap/josm/io/OsmWriterPerformanceTest.java

@@ -12 +12 @@
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.testutils.annotations.PerformanceTest;
 
 /**
@@ -18 +19 @@
  * For this, we use the neubrandenburg-file, which is a good real world example of an OSM file.
  */
+@PerformanceTest
 @Timeout(value = 15, unit = TimeUnit.MINUTES)
 class OsmWriterPerformanceTest {