Changeset 7033 in josm for trunk/test/unit/org/openstreetmap/josm/data/projection

Timestamp:

2014-05-01T02:34:43+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - global use of try-with-resources, according to

• ​http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
• ​https://blogs.oracle.com/darcy/entry/project_coin_null_try_with

File:

• trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) (1 diff)

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

@@ -49 +49 @@
     @Test
     public void test() throws IOException, FileNotFoundException {
-        BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream("data_nodist/projection-reference-data.csv"), Utils.UTF_8));
-        StringBuilder fail = new StringBuilder();
-        String line;
-        while ((line = in.readLine()) != null) {
-            if (line.startsWith("#")) {
-                continue;
-            }
-            String[] f = line.split(",");
-            String code = f[0];
-            double lat = Double.parseDouble(f[1]);
-            double lon = Double.parseDouble(f[2]);
-            double east = Double.parseDouble(f[3]);
-            double north = Double.parseDouble(f[4]);
-            Projection p = Projections.getProjectionByCode(code);
-            {
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(
+                new FileInputStream("data_nodist/projection-reference-data.csv"), Utils.UTF_8))) {
+            StringBuilder fail = new StringBuilder();
+            String line;
+            while ((line = in.readLine()) != null) {
+                if (line.startsWith("#")) {
+                    continue;
+                }
+                String[] f = line.split(",");
+                String code = f[0];
+                double lat = Double.parseDouble(f[1]);
+                double lon = Double.parseDouble(f[2]);
+                double east = Double.parseDouble(f[3]);
+                double north = Double.parseDouble(f[4]);
+                Projection p = Projections.getProjectionByCode(code);
                 EastNorth en = p.latlon2eastNorth(new LatLon(lat, lon));
-                String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
+                String errorEN = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
                         "        expected: eastnorth(%s,%s),%n" +
                         "        but got:  eastnorth(%s,%s)!%n",
                         p.toString(), code, lat, lon, east, north, en.east(), en.north());
-                double EPSILON = 1e-3; // 1 mm accuracy
-                if (Math.abs(east - en.east()) > EPSILON || Math.abs(north - en.north()) > EPSILON) {
-                    fail.append(error);
+                double EPSILON_EN = 1e-3; // 1 mm accuracy
+                if (Math.abs(east - en.east()) > EPSILON_EN || Math.abs(north - en.north()) > EPSILON_EN) {
+                    fail.append(errorEN);
                 }
-            }
-            {
                 LatLon ll = p.eastNorth2latlon(new EastNorth(east, north));
-                String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
+                String errorLL = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
                         "        expected: latlon(%s,%s),%n" +
                         "        but got:  latlon(%s,%s)!%n",
                         p.toString(), code, east, north, lat, lon, ll.lat(), ll.lon());
-                double EPSILON = Math.toDegrees(1e-3 / 6378137); // 1 mm accuracy (or better)
-                if (Math.abs(lat - ll.lat()) > EPSILON || Math.abs(lon - ll.lon()) > EPSILON) {
+                double EPSILON_LL = Math.toDegrees(1e-3 / 6378137); // 1 mm accuracy (or better)
+                if (Math.abs(lat - ll.lat()) > EPSILON_LL || Math.abs(lon - ll.lon()) > EPSILON_LL) {
                     if (!("yes".equals(System.getProperty("suppressPermanentFailure")) && code.equals("EPSG:21781"))) {
-                        fail.append(error);
+                        fail.append(errorLL);
                     }
                 }
             }
-        }
-        Utils.close(in);
-        if (fail.length() > 0) {
-            System.err.println(fail.toString());
-            throw new AssertionError(fail.toString());
+            if (fail.length() > 0) {
+                System.err.println(fail.toString());
+                throw new AssertionError(fail.toString());
+            }
         }
     }