Changeset 36064 in osm for applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit

Timestamp:

2023-03-21T14:49:10+01:00 (2 years ago)

Author:

taylor.smock

Message:

See #16567: Convert most plugin tests to JUnit 5

Location:

applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse

Files:

• ToulouseModuleTest.java (modified) (1 diff)
• ToulouseModuleTestIT.java (modified) (4 diffs)

applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
 /**
  * Unit tests of {@link ToulouseModule} class.
  */
-public class ToulouseModuleTest {
-
-    /**
-     * Setup test.
-     */
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences();
-
+@BasicPreferences
+class ToulouseModuleTest {
     @Test
-    public void testHandlersConstruction() {
+    void testHandlersConstruction() {
         ToulouseModule module = new ToulouseModule(null);
         assertFalse(module.getHandlers().isEmpty());

applications/editors/josm/plugins/opendata/modules/fr.toulouse/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTestIT.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse;
 
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
@@ -8 +9 @@
 import java.util.TreeMap;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.tools.HttpClient;
 
@@ -17 +18 @@
  * Integration tests of {@link ToulouseModule} class.
  */
-public class ToulouseModuleTestIT {
-
-    /**
-     * Setup test.
-     */
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences().timeout(30_000);
-
+@BasicPreferences
+@Timeout(30)
+class ToulouseModuleTestIT {
     @Test
-    public void testUrlValidity() throws IOException {
+    void testUrlValidity() throws IOException {
         Map<String, Integer> errors = new TreeMap<>();
         for (AbstractDataSetHandler handler : new ToulouseModule(null).getNewlyInstanciatedHandlers()) {
@@ -34 +30 @@
             }
         }
-        assertTrue(errors.toString(), errors.isEmpty());
+        assertTrue(errors.isEmpty(), errors.toString());
     }
 }