Changeset 18918 in josm for trunk/test/unit/org/openstreetmap/josm/testutils/annotations

Timestamp:

2023-12-19T17:09:19+01:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #23290: Validate the regions a tag is expected to be in (patch by Sarabjeet108, modified)

Modifications are as follows:

• Allow the use of the new region attributes for keys inside a preset
• Basic tests

regions comes from Vespucci's extensions: ​https://vespucci.io/tutorials/presets/#extensions

File:

• trunk/test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java

@@ -9 +9 @@
 import java.util.Collection;
 
+import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -25 +26 @@
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @BasicPreferences
+@Territories
 @ExtendWith(TaggingPresets.TaggingPresetsExtension.class)
 public @interface TaggingPresets {
 
-    class TaggingPresetsExtension implements BeforeEachCallback {
+    class TaggingPresetsExtension implements BeforeEachCallback, BeforeAllCallback {
         private static int expectedHashcode = 0;
+
+        @Override
+        public void beforeAll(ExtensionContext extensionContext) throws Exception {
+            setup();
+        }
 
         @Override
@@ -37 +44 @@
 
         /**
-         * Setup the tagging presets
+         * Set up the tagging presets
          */
         public static synchronized void setup() {