Ticket #18441: 18441.patch

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

@@ -165 +165 @@
         }
     }
 
+    /**
+     * Removes a test to the list of available tests. This will not remove core
+     * tests.
+     *
+     * @param testClass The test class
+     * @return {@code true} if the test was removed (see {@link Collection#remove})
+     * @since xxx
+     */
+    public static boolean removeTest(Class<? extends Test> testClass) {
+        boolean removed = false;
+        if (!Arrays.asList(CORE_TEST_CLASSES).contains(testClass)) {
+            removed = allTests.remove(testClass);
+            allTestsMap.remove(testClass.getName());
+        }
+        return removed;
+    }
+
     static {
         for (Class<? extends Test> testClass : CORE_TEST_CLASSES) {
             addTest(testClass);

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation;
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.validation.tests.Addresses;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -83 +85 @@
         assertTrue(OsmValidator.hasIgnoredError("1351:n_6871910559:w_733713588"));
     }
 
+    /**
+     * Test that tests are really removed, and that core tests cannot be removed
+     */
+    @Test
+    public void testRemoveTests() {
+        org.openstreetmap.josm.data.validation.Test test = new org.openstreetmap.josm.data.validation.Test("test") {
+        };
+        assertNotEquals(org.openstreetmap.josm.data.validation.Test.class, test.getClass());
+        OsmValidator.addTest(test.getClass());
+        assertTrue(OsmValidator.getAllAvailableTestClasses().contains(test.getClass()));
+        assertTrue(OsmValidator.removeTest(test.getClass()));
+        assertFalse(OsmValidator.removeTest(test.getClass()));
+        assertFalse(OsmValidator.getAllAvailableTestClasses().contains(test.getClass()));
+
+        assertTrue(OsmValidator.getAllAvailableTestClasses().contains(Addresses.class));
+        assertFalse(OsmValidator.removeTest(Addresses.class));
+        assertTrue(OsmValidator.getAllAvailableTestClasses().contains(Addresses.class));
+    }
+
 }