Changeset 32130 in osm for applications/editors/josm/plugins/opendata/test/unit/org

Timestamp:

2016-03-27T23:17:02+02:00 (9 years ago)

Author:

donvip

Message:

fix #josm12694 - robustness to invalid KML colors

File:

• applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.core.io.geographic;
 
-import java.io.File;
-import java.io.FileInputStream;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.io.InputStream;
@@ -28 +29 @@
         JOSMFixture.createUnitTestFixture().init();
     }
+
+    /**
+     * Unit test of {@link KmlReader#COLOR_PATTERN}
+     */
+    @Test
+    public void testColorPattern() {
+        assertTrue(KmlReader.COLOR_PATTERN.matcher("00112233").matches());
+        assertTrue(KmlReader.COLOR_PATTERN.matcher("44556677").matches());
+        assertTrue(KmlReader.COLOR_PATTERN.matcher("8899aabb").matches());
+        assertTrue(KmlReader.COLOR_PATTERN.matcher("CCDDEEFF").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("0011223").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("001122330").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("gg112233").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("red").matches());
+        assertFalse(KmlReader.COLOR_PATTERN.matcher("yellow").matches());
+    }
     
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12694">#12694</a>
+     * @throws IOException if an error occurs during reading
+     */
+    @Test
+    public void testTicket12694() throws IOException, XMLStreamException, FactoryConfigurationError {
+        try (InputStream is = TestUtils.getRegressionDataStream(12694, "Alvinรณpolis_314946.kml")) {
+            NonRegFunctionalTests.testGeneric("#12694", KmlReader.parseDataSet(is, null));
+        }
+    }
+
     /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/10214">#10214</a>
@@ -39 +67 @@
         }
     }
-    
+
     /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/7714">#7714</a>