Changeset 17275 in josm for trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.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/BoundariesTestIT.java (modified) (7 diffs)

trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.InputStream;
@@ -11 +11 @@
 import java.util.stream.Collectors;
 
-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.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -24 +24 @@
  * Test of boundaries OSM file.
  */
-public class BoundariesTestIT {
+class BoundariesTestIT {
 
     private static final List<String> RETIRED_ISO3166_1_CODES = Arrays.asList(
@@ -50 +50 @@
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -59 +59 @@
      */
     @Test
-    public void testBoundariesFile() throws Exception {
+    void testBoundariesFile() throws Exception {
         try (InputStream is = getClass().getResourceAsStream("/data/boundaries.osm")) {
             DataSet ds = OsmReader.parseDataSet(is, null);
@@ -67 +67 @@
             for (String code : iso31661a2) {
                 if (!RETIRED_ISO3166_1_CODES.contains(code)) {
-                    assertEquals(code, 1, tagged.stream().filter(SearchCompiler.compile("ISO3166-1\\:alpha2="+code)).count());
+                    assertEquals(1, tagged.stream().filter(SearchCompiler.compile("ISO3166-1\\:alpha2="+code)).count(), code);
                 }
             }
@@ -73 +73 @@
             for (OsmPrimitive p : tagged.stream().filter(SearchCompiler.compile("ISO3166-1\\:alpha2")).collect(Collectors.toList())) {
                 String code = p.get("ISO3166-1:alpha2");
-                assertTrue(code, iso31661a2.contains(code) || EXCEPTIONNALY_RESERVED_ISO3166_1_CODES.contains(code));
+                assertTrue(iso31661a2.contains(code) || EXCEPTIONNALY_RESERVED_ISO3166_1_CODES.contains(code), code);
             }
             // Check presence of all ISO-3166-2 codes for USA, Canada, Australia (for speed limits)
             for (String code : ISO3166_2_CODES) {
-                assertEquals(code, 1, tagged.stream().filter(SearchCompiler.compile("ISO3166-2="+code)).count());
+                assertEquals(1, tagged.stream().filter(SearchCompiler.compile("ISO3166-2="+code)).count(), code);
             }
         }