Changeset 18690 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.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/RelationTest.java (modified) (7 diffs)

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

@@ -7 +7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -62 +61 @@
         BBox bbox = new BBox(w1);
         bbox.add(n3.getBBox());
-        Assert.assertEquals(bbox, r1.getBBox());
-        Assert.assertEquals(bbox, r2.getBBox());
+        assertEquals(bbox, r1.getBBox());
+        assertEquals(bbox, r2.getBBox());
 
         n3.setCoor(new LatLon(40, 40));
         bbox.add(n3.getBBox());
-        Assert.assertEquals(bbox, r1.getBBox());
-        Assert.assertEquals(bbox, r2.getBBox());
+        assertEquals(bbox, r1.getBBox());
+        assertEquals(bbox, r2.getBBox());
 
         r1.removeMembersFor(r2);
-        Assert.assertEquals(w1.getBBox(), r1.getBBox());
-        Assert.assertEquals(bbox, r2.getBBox());
+        assertEquals(w1.getBBox(), r1.getBBox());
+        assertEquals(bbox, r2.getBBox());
 
         w1.addNode(n3);
-        Assert.assertEquals(w1.getBBox(), r1.getBBox());
-        Assert.assertEquals(w1.getBBox(), r2.getBBox());
+        assertEquals(w1.getBBox(), r1.getBBox());
+        assertEquals(w1.getBBox(), r2.getBBox());
 
         // create incomplete node and add it to the relation, this must not change the bbox
@@ -85 +84 @@
         r2.addMember(new RelationMember("", n4));
 
-        Assert.assertEquals(oldBBox, r2.getBBox());
+        assertEquals(oldBBox, r2.getBBox());
     }
 
@@ -99 +98 @@
         r1.addMember(new RelationMember("", w1));
 
-        Assert.assertEquals(new BBox(w1), r1.getBBox());
+        assertEquals(new BBox(w1), r1.getBBox());
 
         DataSet ds = new DataSet();
@@ -107 +106 @@
         ds.addPrimitive(r1);
 
-        Assert.assertEquals(new BBox(w1), r1.getBBox());
+        assertEquals(new BBox(w1), r1.getBBox());
 
         ds.removePrimitive(r1);
 
         n1.setCoor(new LatLon(30, 40));
-        Assert.assertEquals(new BBox(w1), r1.getBBox());
+        assertEquals(new BBox(w1), r1.getBBox());
 
         ds.addPrimitive(r1);
-        Assert.assertEquals(new BBox(w1), r1.getBBox());
+        assertEquals(new BBox(w1), r1.getBBox());
     }
 
     /**
      * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12467">Bug #12467</a>.
-     * @throws Exception if any error occurs
      */
     @Test
-    void testTicket12467() throws Exception {
+    void testTicket12467() {
         Relation r = new Relation();
         r.put("type", "boundary");
@@ -146 +144 @@
     @Test
     void testCloneFromIAE() {
-        assertThrows(IllegalArgumentException.class, () -> new Relation().cloneFrom(new Node()));
+        final Relation relation = new Relation();
+        final Node node = new Node();
+        assertThrows(IllegalArgumentException.class, () -> relation.cloneFrom(node));
     }
 
@@ -154 +154 @@
     @Test
     void testLoadIAE() {
-        assertThrows(IllegalArgumentException.class, () -> new Relation().load(new NodeData()));
+        final Relation relation = new Relation();
+        final NodeData nodeData = new NodeData();
+        assertThrows(IllegalArgumentException.class, () -> relation.load(nodeData));
     }
 }