Changeset 14311 in josm for trunk/test/unit/org/openstreetmap/josm/data/imagery

Timestamp:

2018-10-09T20:04:07+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16824 - better display of WMS errors

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJobTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJobTest.java

@@ -14 +14 @@
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.commons.jcs.access.behavior.ICacheAccess;
@@ -145 +146 @@
     @Test
     public void testServiceExceptionPattern() {
-        test("missing parameters ['version', 'format']",
+        testServiceException("missing parameters ['version', 'format']",
                 "<?xml version=\"1.0\"?>\n" +
                 "<!DOCTYPE ServiceExceptionReport SYSTEM \"http://schemas.opengis.net/wms/1.1.1/exception_1_1_1.dtd\">\n" +
@@ -151 +152 @@
                 "    <ServiceException>missing parameters ['version', 'format']</ServiceException>\n" +
                 "</ServiceExceptionReport>");
-        test("Parameter 'layers' contains unacceptable layer names.",
+        testServiceException("Parameter 'layers' contains unacceptable layer names.",
                 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\r\n" +
                 "<!DOCTYPE ServiceExceptionReport SYSTEM \"http://schemas.opengis.net/wms/1.1.1/exception_1_1_1.dtd\">\r\n" +
@@ -162 +163 @@
     }
 
-    private static void test(String expected, String xml) {
-        Matcher m = TMSCachedTileLoaderJob.SERVICE_EXCEPTION_PATTERN.matcher(xml);
+    /**
+     * Tests that {@code TMSCachedTileLoaderJob#CDATA_PATTERN} is correct.
+     */
+    @Test
+    public void testCdataPattern() {
+        testCdata("received unsuitable wms request: no <grid> with suitable srs found for layer capitais",
+                "<![CDATA[\r\n" +
+                "received unsuitable wms request: no <grid> with suitable srs found for layer capitais\r\n" +
+                "]]>");
+    }
+
+    private static void testServiceException(String expected, String xml) {
+        test(TMSCachedTileLoaderJob.SERVICE_EXCEPTION_PATTERN, expected, xml);
+    }
+
+    private static void testCdata(String expected, String xml) {
+        test(TMSCachedTileLoaderJob.CDATA_PATTERN, expected, xml);
+    }
+
+    private static void test(Pattern pattern, String expected, String xml) {
+        Matcher m = pattern.matcher(xml);
         assertTrue(xml, m.matches());
         assertEquals(expected, Utils.strip(m.group(1)));