Changeset 10060 in josm for trunk/test/unit

Timestamp:

2016-03-27T19:26:23+02:00 (8 years ago)

Author:

Don-vip

Message:

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

File:

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

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

@@ -44 +44 @@
 
     private static final String PROJECTION_DATA_FILE = "data_nodist/projection/projection-regression-test-data";
-    private static final String PROJECTION_DATA_FILE_JAVA_9 = "data_nodist/projection/projection-regression-test-data-java9";
 
     private static class TestData {
@@ -51 +50 @@
         public EastNorth en;
         public LatLon ll2;
-    }
-
-    private static String getProjectionDataFile() {
-        return TestUtils.getJavaVersion() >= 9 ? PROJECTION_DATA_FILE_JAVA_9 : PROJECTION_DATA_FILE;
     }
 
@@ -71 +66 @@
 
         List<TestData> prevData = new ArrayList<>();
-        if (new File(getProjectionDataFile()).exists()) {
+        if (new File(PROJECTION_DATA_FILE).exists()) {
             prevData = readData();
         }
@@ -93 +88 @@
         Random rand = new Random();
         try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
-                new FileOutputStream(getProjectionDataFile()), StandardCharsets.UTF_8))) {
+                new FileOutputStream(PROJECTION_DATA_FILE), StandardCharsets.UTF_8))) {
             out.write("# Data for test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java\n");
             out.write("# Format: 1. Projection code; 2. lat/lon; 3. lat/lon projected -> east/north; 4. east/north (3.) inverse projected\n");
@@ -118 +113 @@
 
     private static List<TestData> readData() throws IOException, FileNotFoundException {
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(getProjectionDataFile()),
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE),
                 StandardCharsets.UTF_8))) {
             List<TestData> result = new ArrayList<>();
@@ -136 +131 @@
                 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 = new EastNorth(LatLon.roundToOsmPrecision(en.a), LatLon.roundToOsmPrecision(en.b));
+                    next.ll2 = next.ll2.getRoundedToOsmPrecision();
+                }
 
                 result.add(next);