Changeset 12907 in josm for trunk

Timestamp:

2017-09-29T13:26:48+02:00 (7 years ago)

Author:

bastiK

Message:

see #15273, see #15229 - fix tests and Jenkins warnings

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -252 +252 @@
                     try {
                         argBounds = new Bounds(getopt.getOptarg(), ",", Bounds.ParseMethod.LEFT_BOTTOM_RIGHT_TOP, false);
-                    } catch (IllegalArgumentException iae) {
+                    } catch (IllegalArgumentException iae) { // NOPMD
                         throw new IllegalArgumentException(tr("Unable to parse {0} parameter: {1}", "--bounds", iae.getMessage()));
                     }
@@ -292 +292 @@
                         double lat = LatLonParser.parseCoordinate(parts[1]);
                         argAnchor = new LatLon(lat, lon);
-                    } catch (IllegalArgumentException iae) {
+                    } catch (IllegalArgumentException iae) { // NOPMD
                         throw new IllegalArgumentException(tr("In option {0}: {1}", "--anchor", iae.getMessage()));
                     }
@@ -436 +436 @@
         Config.getPref().putBoolean("mappaint.auto_reload_local_styles", false); // unnecessary to listen for external changes
         String projCode = Optional.ofNullable(argProjection).orElse("epsg:3857");
-        Main.setProjection(Projections.getProjectionByCode(projCode.toUpperCase()));
+        Main.setProjection(Projections.getProjectionByCode(projCode.toUpperCase(Locale.US)));
 
         RightAndLefthandTraffic.initialize();

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java

@@ -32 +32 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().projection();
+    public JOSMTestRules test = new JOSMTestRules().projection().territories();
 
     @Parameterized.Parameters
@@ -163 +163 @@
         RenderingCLI cli = new RenderingCLI();
         cli.parseArguments(args);
-        cli.initialize();
         RenderingCLI.RenderingArea ra = cli.determineRenderingArea(null);
         Assert.assertThat(ra.scale, scaleMatcher);