Changeset 16447 in josm

Timestamp:

2020-05-17T17:24:29+02:00 (5 years ago)

Author:

GerdP

Message:

see #19053: remove wrong and previously obsolete method clean3000 and corresponding unit test
We want to be able to ignore groups like "shop inside shop"

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/OsmValidatorTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -294 +294 @@
      */
     static void cleanupIgnoredErrors() {
-        cleanup3000();
         if (ignoredErrors.size() > 1) {
             List<String> toRemove = new ArrayList<>();
@@ -316 +315 @@
             ignoredErrors.putAll(tmap);
         }
-    }
-
-    private static void cleanup3000() {
-        // see #19053
-        ignoredErrors.entrySet()
-                .removeIf(e -> e.getKey().equals("3000_" + e.getValue()));
     }
 

trunk/test/unit/org/openstreetmap/josm/data/validation/OsmValidatorTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
-
-import java.util.Collections;
 
 import org.junit.Before;
@@ -90 +87 @@
 
     /**
-     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/19053">Bug #19053</a>.
-     * {@link OsmValidator#cleanupIgnoredErrors()} must not combine primitives.
-     */
-    @Test
-    public void testCleanupIgnoredErrorsTicket19053() {
-        OsmValidator.addIgnoredError("3000_missing tag", "missing tag");
-        OsmValidator.cleanupIgnoredErrors();
-        assertEquals(Collections.emptyMap(), OsmValidator.getIgnoredErrors());
-    }
-
-    /**
      * Test that tests are really removed, and that core tests cannot be removed
      */