Changeset 11493 in josm

Timestamp:

2017-01-25T14:12:07+01:00 (7 years ago)

Author:

Don-vip

Message:

see #12627, see #14289 - add non regression unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/CachedFile.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/data/regress/12627 (added)
• test/data/regress/12627/overlapping.osm (added)
• test/data/regress/14289 (added)
• test/data/regress/14289/example2.osm (added)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (4 diffs)

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

@@ -463 +463 @@
 
     /**
+     * remove a style source; only accessed from MapPaintStyles
+     * @param style style source to remove
+     * @return {@code true} if this list contained the specified element
+     */
+    boolean remove(StyleSource style) {
+        return styleSources.remove(style);
+    }
+
+    /**
      * set the style sources; only accessed from MapPaintStyles
      * @param sources new style sources

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

@@ -290 +290 @@
 
     private static StyleSource fromSourceEntry(SourceEntry entry) {
+        if (entry.url == null && entry instanceof MapCSSStyleSource) {
+            return (MapCSSStyleSource) entry;
+        }
         Set<String> mimes = new HashSet<>(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
         try (CachedFile cf = new CachedFile(entry.url).setHttpAccept(Utils.join(", ", mimes))) {
@@ -419 +422 @@
         styles.add(source);
         loadStyleForFirstTime(source);
+        refreshStyles();
+        return source;
+    }
+
+    /**
+     * Remove a map paint style.
+     * @param entry map paint style
+     * @since 11493
+     */
+    public static void removeStyle(SourceEntry entry) {
+        StyleSource source = fromSourceEntry(entry);
+        if (styles.remove(source)) {
+            refreshStyles();
+        }
+    }
+
+    private static void refreshStyles() {
         MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
         fireMapPaintSylesUpdated();
@@ -425 +445 @@
             Main.map.mapView.repaint();
         }
-        return source;
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -272 +272 @@
         public Map<String, String> serialize(SourceEntry entry) {
             Map<String, String> res = new HashMap<>();
-            res.put("url", entry.url);
+            res.put("url", entry.url == null ? "" : entry.url);
             res.put("title", entry.title == null ? "" : entry.title);
             res.put("active", Boolean.toString(entry.active));

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -207 +207 @@
         File file = getFile();
         if (file == null) {
-            if (name.startsWith("resource://")) {
+            if (name != null && name.startsWith("resource://")) {
                 InputStream is = getClass().getResourceAsStream(
                         name.substring("resource:/".length()));
@@ -273 +273 @@
             }
         } catch (MalformedURLException e) {
-            if (name.startsWith("resource://")) {
+            if (name == null || name.startsWith("resource://")) {
                 return null;
             } else if (name.startsWith("josmdir://")) {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1166 +1166 @@
      */
     public static boolean isLocalUrl(String url) {
-        if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("resource://"))
+        if (url == null || url.startsWith("http://") || url.startsWith("https://") || url.startsWith("resource://"))
             return false;
         return true;

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -10 +10 @@
 import java.io.StringReader;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -32 +33 @@
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.ParseResult;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
 import org.openstreetmap.josm.io.OsmReader;
@@ -48 +51 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().projection();
+    public JOSMTestRules test = new JOSMTestRules().projection().platform();
 
     static MapCSSTagChecker buildTagChecker(String css) throws ParseException {
@@ -216 +219 @@
         }
     }
+
+    private void doTestNaturalWood(int ticket, String filename, int errorsCount, int setsCount) throws Exception {
+        final MapCSSTagChecker test = buildTagChecker(
+                "area:closed:areaStyle[tag(\"natural\") = parent_tag(\"natural\")] ⧉ area:closed:areaStyle[natural] {" +
+                "  throwWarning: tr(\"Overlapping Identical Natural Areas\");" +
+                "}");
+        final MapCSSStyleSource style = new MapCSSStyleSource(
+                "area[natural=wood] {" +
+                "    fill-color: woodarea#008000;" +
+                "}");
+        MapPaintStyles.addStyle(style);
+        try (InputStream is = TestUtils.getRegressionDataStream(ticket, filename)) {
+            test.visit(OsmReader.parseDataSet(is, null).allPrimitives());
+            List<TestError> errors = test.getErrors();
+            assertEquals(errorsCount, errors.size());
+            Set<Set<OsmPrimitive>> primitives = new HashSet<>();
+            for (TestError e : errors) {
+                primitives.add(new HashSet<>(e.getPrimitives()));
+            }
+            assertEquals(setsCount, primitives.size());
+        } finally {
+            MapPaintStyles.removeStyle(style);
+        }
+    }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12627">Bug #12627</a>.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Ignore("not fixed yet")
+    public void testTicket12627() throws Exception {
+        doTestNaturalWood(12627, "overlapping.osm", 1, 1);
+    }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14289">Bug #14289</a>.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Ignore("not fixed yet")
+    public void testTicket14289() throws Exception {
+        doTestNaturalWood(14289, "example2.osm", 3, 3);
+    }
 }