Changeset 12795 in josm for trunk

Timestamp:

2017-09-09T10:35:27+02:00 (7 years ago)

Author:

bastiK

Message:

see #15273, see #15229 - fix unit tests, PMD, etc.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/projection/ProjectionCLI.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/coor/conversion/LatLonParserTest.java (added)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java

@@ -54 +54 @@
         private double lat = Double.NaN;
         private double lon = Double.NaN;
+    }
+
+    private LatLonParser() {
+        // private constructor
     }
 

trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java

@@ -33 +33 @@
     public static final ProjectionCLI INSTANCE = new ProjectionCLI();
 
-    private boolean argInverse = false;
-    private boolean argSwitchInput = false;
-    private boolean argSwitchOutput = false;
+    private boolean argInverse = false;         // NOPMD
+    private boolean argSwitchInput = false;     // NOPMD
+    private boolean argSwitchOutput = false;    // NOPMD
 
     @Override
@@ -62 +62 @@
                 argSwitchOutput = true;
                 break;
+            default:
+                // ignore
             }
         }
@@ -127 +129 @@
                 "    EOF\n"+
                 "       => 1250371.1334500168 6545331.055189664\n" +
-                "          -1.3208998232319113E7 4486401.160664663\n" +
-                "";
+                "          -1.3208998232319113E7 4486401.160664663\n";
     }
 

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -978 +978 @@
         Main.toolbar = toolbar;
         ProjectionPreference.setProjection();
-        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
-                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_LOCAL,
-                NTV2Proj4DirGridShiftFileSource.getInstance());
-        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
-                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_DOWNLOAD,
-                JOSM_WEBSITE_NTV2_SOURCE);
+        setupNadGridSources();
         GuiHelper.translateJavaInternalMessages();
         preConstructorInit();
@@ -1037 +1032 @@
             RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
         }
+    }
+
+    /**
+     * Setup the sources for NTV2 grid shift files for projection support.
+     * @since 12795
+     */
+    public static void setupNadGridSources() {
+        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
+                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_LOCAL,
+                NTV2Proj4DirGridShiftFileSource.getInstance());
+        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
+                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_DOWNLOAD,
+                JOSM_WEBSITE_NTV2_SOURCE);
     }
 

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -121 +121 @@
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
 
+        // setup projection grid files
+        MainApplication.setupNadGridSources();
+
         // make sure we don't upload to or test against production
         url = OsmApi.getOsmApi().getBaseUrl().toLowerCase(Locale.ENGLISH).trim();

trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

@@ -269 +269 @@
     }
 
-    /**
-     * Unit test of {@link LatLon#parse} method.
-     */
-    @Test
-    public void testParse() {
-        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("49.29918° 19.24788°"));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("N 49.29918 E 19.24788°"));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("49.29918° 19.24788°"));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("N 49.29918 E 19.24788"));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("n 49.29918 e 19.24788"));
-        assertEquals(new LatLon(-19 - 24.788 / 60, -49 - 29.918 / 60), LatLon.parse("W 49°29.918' S 19°24.788'"));
-        assertEquals(new LatLon(-19 - 24.788 / 60, -49 - 29.918 / 60), LatLon.parse("w 49°29.918' s 19°24.788'"));
-        assertEquals(new LatLon(49 + 29. / 60 + 04. / 3600, 19 + 24. / 60 + 43. / 3600), LatLon.parse("N 49°29'04\" E 19°24'43\""));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("49.29918 N, 19.24788 E"));
-        assertEquals(new LatLon(49.29918, 19.24788), LatLon.parse("49.29918 n, 19.24788 e"));
-        assertEquals(new LatLon(49 + 29. / 60 + 21. / 3600, 19 + 24. / 60 + 38. / 3600), LatLon.parse("49°29'21\" N 19°24'38\" E"));
-        assertEquals(new LatLon(49 + 29. / 60 + 51. / 3600, 19 + 24. / 60 + 18. / 3600), LatLon.parse("49 29 51, 19 24 18"));
-        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLon.parse("49 29, 19 24"));
-        assertEquals(new LatLon(19 + 24. / 60, 49 + 29. / 60), LatLon.parse("E 49 29, N 19 24"));
-        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLon.parse("49° 29; 19° 24"));
-        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLon.parse("49° 29; 19° 24"));
-        assertEquals(new LatLon(49 + 29. / 60, -19 - 24. / 60), LatLon.parse("N 49° 29, W 19° 24"));
-        assertEquals(new LatLon(-49 - 29.5 / 60, 19 + 24.6 / 60), LatLon.parse("49° 29.5 S, 19° 24.6 E"));
-        assertEquals(new LatLon(49 + 29.918 / 60, 19 + 15.88 / 60), LatLon.parse("N 49 29.918 E 19 15.88"));
-        assertEquals(new LatLon(49 + 29.4 / 60, 19 + 24.5 / 60), LatLon.parse("49 29.4 19 24.5"));
-        assertEquals(new LatLon(-49 - 29.4 / 60, 19 + 24.5 / 60), LatLon.parse("-49 29.4 N -19 24.5 W"));
-    }
-
-    /**
-     * Unit test of {@link LatLon#parse} method - invalid case 1.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testParseInvalid1() {
-        LatLon.parse("48°45'S 23°30'S");
-    }
-
-    /**
-     * Unit test of {@link LatLon#parse} method - invalid case 2.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    public void testParseInvalid2() {
-        LatLon.parse("47°45'N 24°00'S");
-    }
 }

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

@@ -84 +84 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().timeout(30_000);
+    public JOSMTestRules test = new JOSMTestRules().platform().projectionNadGrids().timeout(30_000);
 
     /**

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

@@ -24 +24 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform();
+    public JOSMTestRules test = new JOSMTestRules().projectionNadGrids().platform();
 
     /**

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -55 +55 @@
     private boolean platform;
     private boolean useProjection;
+    private boolean useProjectionNadGrids;
     private boolean commands;
     private boolean allowMemoryManagerLeaks;
@@ -154 +155 @@
     public JOSMTestRules projection() {
         useProjection = true;
+        return this;
+    }
+
+    /**
+     * Set up loading of NTV2 grit shift files to support projections that need them.
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules projectionNadGrids() {
+        useProjectionNadGrids = true;
         return this;
     }
@@ -313 +323 @@
         if (useProjection) {
             Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+        }
+
+        if (useProjectionNadGrids) {
+            MainApplication.setupNadGridSources();
         }