Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/actions/corrector

Timestamp:

2020-10-28T20:41:00+01:00 (4 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

Location:

trunk/test/unit/org/openstreetmap/josm/actions/corrector

Files:

• ReverseWayNoTagCorrectorTest.java (modified) (3 diffs)
• ReverseWayTagCorrectorTest.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayNoTagCorrectorTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.corrector;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-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.Tag;
 import org.openstreetmap.josm.data.osm.Tagged;
@@ -16 +16 @@
  * Unit tests of {@link ReverseWayNoTagCorrector} class.
  */
-public class ReverseWayNoTagCorrectorTest {
+class ReverseWayNoTagCorrectorTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -29 +29 @@
      */
     @Test
-    public void testDirectionalTags() {
+    void testDirectionalTags() {
         assertEquals(1, ReverseWayNoTagCorrector.getDirectionalTags(new Tag("waterway", "drain")).size());
         assertEquals(1, ReverseWayNoTagCorrector.getDirectionalTags(new Tag("man_made", "embankment")).size());

trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrectorTest.java

@@ -8 +8 @@
 
 import org.junit.Assert;
-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.correction.TagCorrection;
 import org.openstreetmap.josm.data.osm.Node;
@@ -24 +24 @@
  * Unit tests of {@link ReverseWayTagCorrector} class.
  */
-public class ReverseWayTagCorrectorTest {
+class ReverseWayTagCorrectorTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -38 +38 @@
      */
     @Test
-    public void testUtilityClass() throws ReflectiveOperationException {
+    void testUtilityClass() throws ReflectiveOperationException {
         UtilityClassTestUtil.assertUtilityClassWellDefined(ReverseWayTagCorrector.TagSwitcher.class);
     }
@@ -46 +46 @@
      */
     @Test
-    public void testTagSwitch() {
+    void testTagSwitch() {
         // oneway
         assertSwitch(new Tag("oneway", "yes"), new Tag("oneway", "-1"));
@@ -121 +121 @@
      */
     @Test
-    public void testSwitchingWayNodes() {
+    void testSwitchingWayNodes() {
         final Map<OsmPrimitive, List<TagCorrection>> tagCorrections = getTagCorrectionsForWay("direction=forward");
         Assert.assertEquals(1, tagCorrections.size());
@@ -132 +132 @@
      */
     @Test
-    public void testNotSwitchingWayNodes() {
+    void testNotSwitchingWayNodes() {
         Assert.assertEquals(0, getTagCorrectionsForWay("direction=SSW").size());
         Assert.assertEquals(0, getTagCorrectionsForWay("direction=145").size());