Changeset 10065 in josm for trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

Timestamp:

2016-03-28T03:07:18+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - rework projection regression test for java 9

File:

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

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

@@ -135 +135 @@
                 next.en = new EastNorth(en.a, en.b);
                 next.ll2 = new LatLon(ll2.a, ll2.b);
-                if (TestUtils.getJavaVersion() >= 9) {
-                    next.ll = next.ll.getRoundedToOsmPrecision();
-                    next.en = getRoundedToOsmPrecision(en.a, en.b);
-                    next.ll2 = next.ll2.getRoundedToOsmPrecision();
-                }
 
                 result.add(next);
@@ -191 +186 @@
             }
             EastNorth en = proj.latlon2eastNorth(data.ll);
+            LatLon ll2 = proj.eastNorth2latlon(data.en);
             if (TestUtils.getJavaVersion() >= 9) {
                 en = getRoundedToOsmPrecision(en.east(), en.north());
+                ll2 = ll2.getRoundedToOsmPrecision();
+                data.en = getRoundedToOsmPrecision(data.en.east(), data.en.north());
+                data.ll2 = data.ll2.getRoundedToOsmPrecision();
             }
             if (!en.equals(data.en)) {
@@ -201 +200 @@
                 fail.append(error);
             }
-            LatLon ll2 = proj.eastNorth2latlon(data.en);
-            if (TestUtils.getJavaVersion() >= 9) {
-                ll2 = ll2.getRoundedToOsmPrecision();
-            }
             if (!ll2.equals(data.ll2)) {
                 String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +