Changeset 10061 in josm

Timestamp:

2016-03-28T00:00:48+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - reduce double precision in unit tests to avoid tiny differences with JDK9

File:

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

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

@@ -112 +112 @@
     }
 
+    private static EastNorth getRoundedToOsmPrecision(double east, double north) {
+        return new EastNorth(LatLon.roundToOsmPrecision(east), LatLon.roundToOsmPrecision(north));
+    }
+
     private static List<TestData> readData() throws IOException, FileNotFoundException {
         try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE),
@@ -133 +137 @@
                 if (TestUtils.getJavaVersion() >= 9) {
                     next.ll = next.ll.getRoundedToOsmPrecision();
-                    next.en = new EastNorth(LatLon.roundToOsmPrecision(en.a), LatLon.roundToOsmPrecision(en.b));
+                    next.en = getRoundedToOsmPrecision(en.a, en.b);
                     next.ll2 = next.ll2.getRoundedToOsmPrecision();
                 }
@@ -187 +191 @@
             }
             EastNorth en = proj.latlon2eastNorth(data.ll);
+            if (TestUtils.getJavaVersion() >= 9) {
+                en = getRoundedToOsmPrecision(en.east(), en.north());
+            }
             if (!en.equals(data.en)) {
                 String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
@@ -195 +202 @@
             }
             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" +