Changeset 18870 in josm for trunk/src/org

Timestamp:

2023-10-16T15:19:07+02:00 (11 months 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/src/org/openstreetmap/josm/data/validation

Files:

• ValidatorCLI.java (modified) (1 diff)
• tests/CrossingWays.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java

@@ -356 +356 @@
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("epsg:3857".toUpperCase(Locale.ROOT)));
 
-        Territories.initializeInternalData();
+        if (Territories.getKnownIso3166Codes().isEmpty()) {
+            Territories.initializeInternalData();
+        }
         OsmValidator.initialize();
         MapPaintStyles.readFromPreferences();

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -458 +458 @@
                     List<Way> prims = Arrays.asList(es1.getWay(), es2.getWay());
                     if ((highlight = crossingWays.get(prims)) == null) {
-                        highlight = new ArrayList<>();
+                        highlight = new ArrayList<>(2);
                         highlight.add(es1);
                         highlight.add(es2);