Changeset 19223 in josm for trunk/test/unit

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/unit/org/openstreetmap/josm

Files:

• data/validation/routines/DomainValidatorTestIT.java (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSParserTestIT.java (modified) (2 diffs)
• gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (2 diffs)
• gui/preferences/map/MapPaintPreferenceTestIT.java (modified) (2 diffs)
• gui/preferences/map/TaggingPresetPreferenceTestIT.java (modified) (2 diffs)
• gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTestIT.java (modified) (2 diffs)
• io/CertificateAmendmentTestIT.java (modified) (2 diffs)
• plugins/PluginHandlerTestIT.java (modified) (2 diffs)
• testutils/ImageTestUtils.java (modified) (1 diff)
• testutils/annotations/FunctionalTest.java (added)
• testutils/annotations/IntegrationTest.java (added)
• testutils/annotations/PerformanceTest.java (added)
• tools/PlatformHookTestIT.java (modified) (1 diff)
• tools/TerritoriesTestIT.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java

@@ -48 +48 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -58 +59 @@
  */
 @HTTPS
+@IntegrationTest
 class DomainValidatorTestIT {
     /**

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTestIT.java

@@ -6 +6 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 
@@ -13 +14 @@
 @HTTPS
 @Projection
+@IntegrationTest
 class MapCSSParserTestIT {
     /**

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -68 +68 @@
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
 import org.openstreetmap.josm.testutils.annotations.I18n;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 import org.openstreetmap.josm.testutils.annotations.ProjectionNadGrids;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -79 +80 @@
 @HTTPS
 @I18n
+@IntegrationTest
 @org.openstreetmap.josm.testutils.annotations.Projection
 @ProjectionNadGrids

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java

@@ -27 +27 @@
 import org.openstreetmap.josm.gui.preferences.AbstractExtendedSourceEntryTestCase;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -33 +34 @@
  */
 @HTTPS
+@IntegrationTest
 @Timeout(value = 15, unit = TimeUnit.MINUTES)
 class MapPaintPreferenceTestIT extends AbstractExtendedSourceEntryTestCase {

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -39 +39 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -51 +52 @@
  */
 @HTTPS
+@IntegrationTest
 @Territories
 @Timeout(value = 20, unit = TimeUnit.MINUTES)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTestIT.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.preferences.AbstractExtendedSourceEntryTestCase;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 
 /**
@@ -30 +31 @@
  */
 @HTTPS
+@IntegrationTest
 @Timeout(20)
 class ValidatorTagCheckerRulesPreferenceTestIT extends AbstractExtendedSourceEntryTestCase {

trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java

@@ -18 +18 @@
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 
 /**
@@ -23 +24 @@
  */
 @HTTPS
+@IntegrationTest
 @Timeout(20)
 class CertificateAmendmentTestIT {

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java

@@ -42 +42 @@
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.Plugins;
@@ -56 +57 @@
 @BasicPreferences
 @HTTPS
+@IntegrationTest
 @Main
 @Projection

trunk/test/unit/org/openstreetmap/josm/testutils/ImageTestUtils.java

@@ -148 +148 @@
     public static void writeDebugImages(@Nonnull Path directory, @Nonnull String filePrefix, @Nonnull BufferedImage diff,
                                         @Nullable BufferedImage oldImage, @Nullable BufferedImage newImage) {
-        if (!UPDATE_ALL) {
+        if (!UPDATE_ALL && false) {
             return;
         }

trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookTestIT.java

@@ -11 +11 @@
 
 import jakarta.json.Json;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 
 /**
  * Integration tests of {@link PlatformHook} class.
  */
+@IntegrationTest
 class PlatformHookTestIT {
     /**

trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java

@@ -14 +14 @@
  */
 @Projection
+@org.openstreetmap.josm.testutils.annotations.Territories
 class TerritoriesTestIT {
     /**