Changeset 17275 in josm for trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java

Timestamp:

2020-10-28T20:41:00+01:00 (3 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/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java (modified) (5 diffs)

trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
@@ -15 +15 @@
 import javax.json.JsonValue;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
@@ -31 +31 @@
  * Various integration tests with Taginfo.
  */
-public class TaginfoTestIT {
+class TaginfoTestIT {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences().timeout(20000);
@@ -47 +47 @@
      */
     @Test
-    public void testCheckPopularTags() throws SAXException, IOException, ParseException {
+    void testCheckPopularTags() throws SAXException, IOException, ParseException {
         TaggingPresets.readFromPreferences();
         new TagChecker().initialize();
@@ -90 +90 @@
             System.err.println(error);
         }
-        assertTrue(errors.toString(), errors.isEmpty());
+        assertTrue(errors.isEmpty(), errors::toString);
     }
 }