Changeset 10060 in josm

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk

Files:

• data_nodist/projection/projection-regression-test-data-java9 (deleted)
• src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -458 +458 @@
 
     /**
-     * Returns the value rounded to OSM precisions, i.e. to {@link LatLon#MAX_SERVER_PRECISION}.
+     * Returns the value rounded to OSM precisions, i.e. to {@link #MAX_SERVER_PRECISION}.
      * @param value lat/lon value
      *
@@ -468 +468 @@
 
     /**
-     * Returns the value rounded to OSM precision. This function is now the same as
-     * {@link #roundToOsmPrecision(double)}, since the rounding error has been fixed.
-     * @param value lat/lon value
-     *
-     * @return rounded value
-     * @deprecated Use {@link #roundToOsmPrecision(double)} instead
-     */
-    @Deprecated
-    public static double roundToOsmPrecisionStrict(double value) {
-        return roundToOsmPrecision(value);
-    }
-
-    /**
-     * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to
-     * MAX_SERVER_PRECISION
+     * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to {@link #MAX_SERVER_PRECISION}
      *
      * @return a clone of this lat LatLon
@@ -491 +477 @@
                 roundToOsmPrecision(lon())
                 );
-    }
-
-    /**
-     * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to
-     * MAX_SERVER_PRECISION
-     *
-     * @return a clone of this lat LatLon
-     * @deprecated Use {@link #getRoundedToOsmPrecision()} instead
-     */
-    @Deprecated
-    public LatLon getRoundedToOsmPrecisionStrict() {
-        return getRoundedToOsmPrecision();
     }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -173 +173 @@
         // Critical: only allow TLS ("serverAuth" = 1.3.6.1.5.5.7.3.1)
         ext.set(ExtendedKeyUsageExtension.NAME, new ExtendedKeyUsageExtension(Boolean.TRUE,
-                new Vector<ObjectIdentifier>(Arrays.asList(new ObjectIdentifier("1.3.6.1.5.5.7.3.1")))));
+                new Vector<>(Arrays.asList(new ObjectIdentifier("1.3.6.1.5.5.7.3.1")))));
 
         if (san != null) {

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);