Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java

Timestamp:

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

File:

• trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Field;
@@ -9 +9 @@
 import java.util.Collection;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -29 +29 @@
  * Unit tests for class {@link CreateCircleAction}.
  */
-public final class CreateCircleActionTest {
+final class CreateCircleActionTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().projection();
@@ -45 +45 @@
      */
     @Test
-    public void testTicket7421case0() throws ReflectiveOperationException {
+    void testTicket7421case0() throws ReflectiveOperationException {
         DataSet dataSet = new DataSet();
 
@@ -65 +65 @@
         // Expected result: Dataset contain one closed way, clockwise
         Collection<Way> resultingWays = dataSet.getWays();
-        assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()),
-                   resultingWays.size(), 1);
+        assertSame(1, resultingWays.size(), String.format("Expect one way after perform action. %d found", resultingWays.size()));
         Way resultingWay = resultingWays.iterator().next();
-        assertTrue("Resulting way is not closed",
-                   resultingWay.isClosed());
-        assertTrue("Found anti-clockwize circle while way was clockwize",
-                   Geometry.isClockwise(resultingWay));
+        assertTrue(resultingWay.isClosed(), "Resulting way is not closed");
+        assertTrue(Geometry.isClockwise(resultingWay), "Found anti-clockwise circle while way was clockwise");
     }
 
@@ -102 +99 @@
      */
     @Test
-    public void testTicket7421case1() throws ReflectiveOperationException {
+    void testTicket7421case1() throws ReflectiveOperationException {
         DataSet dataSet = new DataSet();
 
@@ -127 +124 @@
             // Expected result: Dataset contain one closed way, clockwise
             Collection<Way> resultingWays = dataSet.getWays();
-            assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()),
-                       resultingWays.size(), 1);
+            assertSame(1, resultingWays.size(), String.format("Expect one way after perform action. %d found", resultingWays.size()));
             Way resultingWay = resultingWays.iterator().next();
-            assertTrue("Resulting way is not closed",
-                       resultingWay.isClosed());
-            assertTrue("Found anti-clockwise way while traffic is left hand.",
-                       Geometry.isClockwise(resultingWay));
+            assertTrue(resultingWay.isClosed(), "Resulting way is not closed");
+            assertTrue(Geometry.isClockwise(resultingWay), "Found anti-clockwise way while traffic is left hand.");
         } finally {
             // Restore left/right hand traffic database