Changeset 13870 in josm

Timestamp:

2018-05-29T22:36:33+02:00 (6 years ago)

Author:

wiktorn

Message:

Fix NPE when style title is null

Closes: #16333

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/LayerDetails.java (modified) (1 diff)
• test/data/regress/16333 (added)
• test/data/regress/16333/capabilities.xml (added)
• test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/LayerDetails.java

@@ -117 +117 @@
      */
     public void addStyle(String name, String title) {
-        this.styles.put(name, title);
+        this.styles.put(name, title == null ? "" : title);
     }
 

trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java

@@ -97 +97 @@
                 wms.buildGetMapUrl(wms.getLayers(), (List<String>) null, true));
     }
+
+    /**
+     * Regression test for bug #16333 (null style name)
+     * @throws IOException if any I/O error occurs
+     * @throws WMSGetCapabilitiesException  never
+     */
+    @Test
+    public void testTicket16333() throws IOException, WMSGetCapabilitiesException {
+        tileServer.stubFor(
+                WireMock.get(WireMock.anyUrl())
+                .willReturn(WireMock.aResponse().withBody(
+                        Files.readAllBytes(Paths.get(TestUtils.getRegressionDataFile(16333, "capabilities.xml")))
+                ))
+        );
+        WMSImagery wms = new WMSImagery(tileServer.url("any"));
+        assertEquals("https://duinoord.xs4all.nl/geoserver/ows?SERVICE=WMS&", wms.buildRootUrl());
+        assertEquals(null, wms.getLayers().get(0).getName());
+        assertEquals("", wms.getLayers().get(0).getTitle());
+
+        assertEquals("bag:Matching Street", wms.getLayers().get(0).getChildren().get(0).getName());
+        assertEquals("Dichtstbijzijnde straat", wms.getLayers().get(0).getChildren().get(0).getTitle());
+
+    }
 }