Changeset 11648 in josm for trunk/test/unit

Timestamp:

2017-03-02T01:28:53+01:00 (8 years ago)

Author:

Don-vip

Message:

see #14422 - update unit test

File:

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

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

@@ -31 +31 @@
 
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.data.Bounds;
@@ -36 +37 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.preferences.projection.CodeProjectionChoice;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
@@ -48 +50 @@
  * program from the proj.4 library in path (or use <code>CS2CS_EXE</code> to set
  * the full path of the executable). Make sure the required *.gsb grid files
- * can be accessed, i.e. copy them from <code>data/projection</code> to <code>/usr/share/proj</code> or
+ * can be accessed, i.e. copy them from <code>data_nodist/projection</code> to <code>/usr/share/proj</code> or
  * wherever cs2cs expects them to be placed.
  *
@@ -75 +77 @@
 
     static Random rand = new SecureRandom();
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform();
 
     /**
@@ -284 +293 @@
     }
 
+    /**
+     * Test projections.
+     * @throws IOException if any I/O error occurs
+     */
     @Test
     public void testProjections() throws IOException {
@@ -296 +309 @@
             }
             if (!ref.def.equals(def0)) {
-                Assert.fail("definitions for " + ref.code + " do not match");
-            }
-            Projection proj = Projections.getProjectionByCode(ref.code);
-            double scale = ((CustomProjection) proj).getToMeter();
-            for (Pair<LatLon, EastNorth> p : ref.data) {
-                LatLon ll = p.a;
-                EastNorth enRef = p.b;
-                enRef = new EastNorth(enRef.east() * scale, enRef.north() * scale); // convert to meter
-
-                EastNorth en = proj.latlon2eastNorth(ll);
-                if (proj.switchXY()) {
-                    en = new EastNorth(en.north(), en.east());
-                }
-                en = new EastNorth(en.east() * scale, en.north() * scale); // convert to meter
-                final double EPSILON_EN = 1e-2; // 1cm
-                if (!isEqual(enRef, en, EPSILON_EN, true)) {
-                    String errorEN = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
-                            "        expected: eastnorth(%s,%s),%n" +
-                            "        but got:  eastnorth(%s,%s)!%n",
-                            proj.toString(), proj.toCode(), ll.lat(), ll.lon(), enRef.east(), enRef.north(), en.east(), en.north());
-                    fail.append(errorEN);
+                fail.append("definitions for ").append(ref.code).append(" do not match\n");
+            } else {
+                Projection proj = Projections.getProjectionByCode(ref.code);
+                double scale = ((CustomProjection) proj).getToMeter();
+                for (Pair<LatLon, EastNorth> p : ref.data) {
+                    LatLon ll = p.a;
+                    EastNorth enRef = p.b;
+                    enRef = new EastNorth(enRef.east() * scale, enRef.north() * scale); // convert to meter
+
+                    EastNorth en = proj.latlon2eastNorth(ll);
+                    if (proj.switchXY()) {
+                        en = new EastNorth(en.north(), en.east());
+                    }
+                    en = new EastNorth(en.east() * scale, en.north() * scale); // convert to meter
+                    final double EPSILON_EN = 1e-2; // 1cm
+                    if (!isEqual(enRef, en, EPSILON_EN, true)) {
+                        String errorEN = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
+                                "        expected: eastnorth(%s,%s),%n" +
+                                "        but got:  eastnorth(%s,%s)!%n",
+                                proj.toString(), proj.toCode(), ll.lat(), ll.lon(), enRef.east(), enRef.north(), en.east(), en.north());
+                        fail.append(errorEN);
+                    }
                 }
             }