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

Timestamp:

2021-07-16T09:16:33+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #21064 - Add JUnit 5 extension for preferences (patch by taylor.smock)

Location:

trunk/test/unit/org/openstreetmap/josm/data/vector

Files:

• VectorRelationTest.java (modified) (3 diffs)
• VectorWayTest.java (modified) (3 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.vector;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import java.util.Arrays;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -14 +8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.Arrays;
+
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+
+import org.junit.jupiter.api.Test;
+
 /**
  * Test class for {@link VectorRelation}
@@ -19 +19 @@
  * @since 17862
  */
+@BasicPreferences
 class VectorRelationTest {
-    @RegisterExtension
-    JOSMTestRules rule = new JOSMTestRules();
-
     @Test
     void testMembers() {

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.vector;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
@@ -10 +21 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 /**
@@ -50 +52 @@
 
     @Test
+    @BasicPreferences
     void testNodes() {
         VectorNode node1 = new VectorNode("test");