Changeset 12001 in josm

Timestamp:

2017-04-25T11:14:08+02:00 (7 years ago)

Author:

bastiK

Message:

see #13387 - simpler logic

File:

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

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

@@ -189 +189 @@
             EastNorth en = proj.latlon2eastNorth(data.ll);
             LatLon ll2 = proj.eastNorth2latlon(data.en);
-            boolean eqJava8 = !java9 && en.equals(data.en);
-            boolean eqJava9 = java9 && equalsJava9(en, data.en);
-            if (!eqJava8 && !eqJava9) {
+            if (!(java9 ? equalsJava9(en, data.en) : en.equals(data.en))) {
                 String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
                         "        expected: eastnorth(%s,%s),%n" +
@@ -198 +196 @@
                 fail.append(error);
             }
-            eqJava8 = !java9 && ll2.equals(data.ll2);
-            eqJava9 = java9 && equalsJava9(ll2, data.ll2);
-            if (!eqJava8 && !eqJava9) {
+            if (!(java9 ? equalsJava9(ll2, data.ll2) : ll2.equals(data.ll2))) {
                 String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
                         "        expected: latlon(%s,%s),%n" +