Changeset 18870 in josm for trunk/test/unit/org/openstreetmap/josm/data/vector

Timestamp:

2023-10-16T15:19:07+02:00 (18 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/test/unit/org/openstreetmap/josm/data/vector

Files:

• VectorDataSetTest.java (modified) (3 diffs)
• VectorNodeTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/vector/VectorDataSetTest.java

@@ -15 +15 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.RepeatedTest;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -22 +21 @@
 import org.openstreetmap.josm.data.imagery.vectortile.mapbox.MapboxVectorTileSource;
 import org.openstreetmap.josm.gui.layer.imagery.MVTLayer;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
  * A test for {@link VectorDataSet}
  */
+@Projection
 class VectorDataSetTest {
     /**
@@ -63 +63 @@
         }
     }
-
-    @RegisterExtension
-    JOSMTestRules rule = new JOSMTestRules().projection();
 
     /**

trunk/test/unit/org/openstreetmap/josm/data/vector/VectorNodeTest.java

@@ -14 +14 @@
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -25 +24 @@
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
@@ -32 +31 @@
  * @since 17862
  */
+@Projection
 class VectorNodeTest {
-    @RegisterExtension
-    JOSMTestRules rule = new JOSMTestRules().projection();
-
     @Test
     void testLatLon() {