Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/io/MultiFetchOverpassObjectReaderTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:

• trunk/test/unit/org/openstreetmap/josm/io/MultiFetchOverpassObjectReaderTest.java (modified) (6 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -20 +20 @@
  * Unit tests of {@link MultiFetchOverpassObjectReader}.
  */
-public class MultiFetchOverpassObjectReaderTest {
+class MultiFetchOverpassObjectReaderTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -33 +33 @@
      */
     @Test
-    public void testBuildRequestNodesString() {
+    void testBuildRequestNodesString() {
         List<OsmPrimitive> objects = Arrays.asList(new Node(123), new Node(126), new Node(130));
         String requestString;
@@ -61 +61 @@
      */
     @Test
-    public void testBuildRequestWaysString() {
+    void testBuildRequestWaysString() {
         List<OsmPrimitive> objects = Arrays.asList(new Way(123), new Way(126), new Way(130));
         String requestString;
@@ -86 +86 @@
      */
     @Test
-    public void testBuildRequestRelationsString() {
+    void testBuildRequestRelationsString() {
         List<OsmPrimitive> objects = Arrays.asList(new Relation(123), new Relation(126), new Relation(130));
         String requestString;
@@ -112 +112 @@
      */
     @Test
-    public void testBuildComplexString() {
+    void testBuildComplexString() {
         List<OsmPrimitive> objects = Arrays.asList(new Relation(123), new Relation(126), new Relation(130), new Way(88), new Way(99),
                 new Node(1));