Changeset 19108 in josm for trunk/test

Timestamp:

2024-06-17T19:37:02+02:00 (3 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x (followup of r19101)

File:

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

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

@@ -21 +21 @@
 import java.util.stream.Collectors;
 
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
@@ -29 +28 @@
 import org.openstreetmap.josm.testutils.annotations.ProjectionNadGrids;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Platform;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -144 +141 @@
     @Test
     void testNonRegression() throws IOException {
-        // Disable on Github Windows runners + Java 8, minor differences appeared around 2021-07-20
-        Assumptions.assumeFalse(
-                Utils.getJavaVersion() == 8
-                && Platform.determinePlatform() == Platform.WINDOWS
-                && System.getenv("GITHUB_WORKFLOW") != null);
         List<TestData> allData = readData();
         Set<String> dataCodes = allData.stream().map(data -> data.code).collect(Collectors.toSet());
@@ -160 +152 @@
         }
 
-        final boolean java9 = Utils.getJavaVersion() >= 9;
         for (TestData data : allData) {
             Projection proj = Projections.getProjectionByCode(data.code);
@@ -169 +160 @@
             EastNorth en = proj.latlon2eastNorth(data.ll);
             LatLon ll2 = proj.eastNorth2latlon(data.en);
-            if (!(java9 ? equalsJava9(en, data.en) : en.equals(data.en))) {
+            if (!equalsJava9(en, data.en)) {
                 String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
                         "        expected: eastnorth(%s,%s),%n" +
@@ -176 +167 @@
                 fail.append(error);
             }
-            if (!(java9 ? equalsJava9(ll2, data.ll2) : ll2.equals(data.ll2))) {
+            if (!equalsJava9(ll2, data.ll2)) {
                 String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
                         "        expected: latlon(%s,%s),%n" +