Changeset 18690 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java

Timestamp:

2023-03-13T21:59:27+01:00 (3 years 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/data/osm/WaySegmentTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.Arrays;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
@@ -25 +27 @@
 
     @Test
-    void testForNodePair() throws Exception {
+    void testForNodePair() {
         final DataSet ds = new DataSet();
         final Node n1 = new Node(LatLon.ZERO);
@@ -42 +44 @@
         w.addNode(n4);
         w.addNode(n1);
-        Assert.assertEquals(WaySegment.forNodePair(w, n1, n2).getLowerIndex(), 0);
-        Assert.assertEquals(WaySegment.forNodePair(w, n1, n3).getLowerIndex(), 2);
-        Assert.assertEquals(WaySegment.forNodePair(w, n1, n4).getLowerIndex(), 4);
-        Assert.assertEquals(WaySegment.forNodePair(w, n4, n1).getLowerIndex(), 5);
-        try {
-            Assert.assertEquals(WaySegment.forNodePair(w, n3, n4).getLowerIndex(), 5);
-            throw new IllegalStateException("Expecting IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            System.out.println("Expected exception: " + expected.getMessage());
-        }
+        assertEquals(WaySegment.forNodePair(w, n1, n2).getLowerIndex(), 0);
+        assertEquals(WaySegment.forNodePair(w, n1, n3).getLowerIndex(), 2);
+        assertEquals(WaySegment.forNodePair(w, n1, n4).getLowerIndex(), 4);
+        assertEquals(WaySegment.forNodePair(w, n4, n1).getLowerIndex(), 5);
+        IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> WaySegment.forNodePair(w, n3, n4));
+        assertEquals("Node pair is not part of way!", iae.getMessage());
     }
 }