Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java

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

File:

• trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.projection;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.security.SecureRandom;
@@ -11 +11 @@
 
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -19 +19 @@
  * Unit tests for class {@link Projection}.
  */
-public class ProjectionTest {
+class ProjectionTest {
 
     private static final Random rand = new SecureRandom();
@@ -30 +30 @@
      */
     @Test
-    public void testProjections() {
+    void testProjections() {
         error = false;
         text = "";
@@ -120 +120 @@
      */
     @Test
-    public void testProjs() {
+    void testProjs() {
         error2 = false;
         text2 = "";
@@ -150 +150 @@
             Assert.fail();
         }
-        assertTrue("missing test: "+projIds, projIds.isEmpty());
+        assertTrue(projIds.isEmpty(), "missing test: "+projIds);
     }
 
@@ -170 +170 @@
             EastNorth en = p.latlon2eastNorth(ll1);
             LatLon ll2 = p.eastNorth2latlon(en);
-            assertTrue(p.toCode() + " at " + ll1 + " is " + ll2, ll2.isValid());
+            assertTrue(ll2.isValid(), p.toCode() + " at " + ll1 + " is " + ll2);
             double dist = ll1.greatCircleDistance(ll2);
             if (dist > eps) {
@@ -189 +189 @@
      */
     @Test
-    public void testSwedishProjections() {
+    void testSwedishProjections() {
         for (int code = 3006; code <= 3018; code++) {
             assertTrue(Projections.getProjectionByCode("EPSG:"+code).switchXY());