Changeset 18690 in josm for trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrectorTest.java

Timestamp:

2023-03-13T21:59:27+01:00 (13 months ago)

Author:

taylor.smock

Message:

See #16567: Convert all assertion calls to JUnit 5 (patch by gaben, modified)

The modifications are as follows:

• Merge DomainValidatorTest.testIDN and DomainValidatorTest.testIDNJava6OrLater
• Update some tests to use @ParameterizedTest (DomainValidatorTest)
• Replace various exception blocks with assertThrows. These typically looked like

      try {
          // Something that should throw an exception here
          fail("An exception should have been thrown");
      } catch (Exception e) {
          // Verify the exception matches expectations here
      }
  

• Replace assertTrue(val instanceof Clazz) with assertInstanceOf
• Replace JUnit 4 @Suite with JUnit 5 @Suite

Both the original patch and the modified patch fix various lint issues.

File:

• trunk/test/unit/org/openstreetmap/josm/actions/corrector/ReverseWayTagCorrectorTest.java (modified) (6 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions.corrector;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
@@ -7 +11 @@
 import java.util.stream.Stream;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -105 +108 @@
 
     private void assertSwitch(Tag oldTag, Tag newTag) {
-        Assert.assertEquals(newTag, ReverseWayTagCorrector.TagSwitcher.apply(oldTag));
+        assertEquals(newTag, ReverseWayTagCorrector.TagSwitcher.apply(oldTag));
     }
 
@@ -128 +131 @@
     void testSwitchingWayNodes() {
         final Map<OsmPrimitive, List<TagCorrection>> tagCorrections = getTagCorrectionsForWay("direction=forward");
-        Assert.assertEquals(1, tagCorrections.size());
-        Assert.assertEquals(Collections.singletonList(new TagCorrection("direction", "forward", "direction", "backward")),
+        assertEquals(1, tagCorrections.size());
+        assertEquals(Collections.singletonList(new TagCorrection("direction", "forward", "direction", "backward")),
                 tagCorrections.values().iterator().next());
     }
@@ -138 +141 @@
     @Test
     void testNotSwitchingWayNodes() {
-        Assert.assertEquals(0, getTagCorrectionsForWay("direction=SSW").size());
-        Assert.assertEquals(0, getTagCorrectionsForWay("direction=145").size());
+        assertEquals(0, getTagCorrectionsForWay("direction=SSW").size());
+        assertEquals(0, getTagCorrectionsForWay("direction=145").size());
     }
 
@@ -148 +151 @@
     void testIsReversible() {
         Way w0 = buildWayWithMiddleNode("highway=stop");
-        Assert.assertTrue(ReverseWayTagCorrector.isReversible(w0));
+        assertTrue(ReverseWayTagCorrector.isReversible(w0));
         Way w1 = buildWayWithMiddleNode("direction=forward");
-        Assert.assertFalse(ReverseWayTagCorrector.isReversible(w1));
-        Assert.assertEquals(3, w1.getNodesCount());
+        assertFalse(ReverseWayTagCorrector.isReversible(w1));
+        assertEquals(3, w1.getNodesCount());
         w1.getNodes().forEach(n -> n.setKeys(null));
-        Assert.assertTrue(ReverseWayTagCorrector.isReversible(w1));
+        assertTrue(ReverseWayTagCorrector.isReversible(w1));
         w1.put("oneway", "yes");
-        Assert.assertFalse(ReverseWayTagCorrector.isReversible(w1));
+        assertFalse(ReverseWayTagCorrector.isReversible(w1));
     }