Changeset 14100 in josm

Timestamp:

2018-08-06T00:26:16+02:00 (6 years ago)

Author:

Don-vip

Message:

increase test coverage

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (3 diffs)
• data/osm/search/SearchCompilerTest.java (modified) (3 diffs)
• gui/TableCellRendererTest.java (modified) (2 diffs)
• tools/template_engine/TemplateEntryTest.java (added)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -26 +26 @@
 import java.util.Comparator;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -50 +51 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Utils;
+import org.reflections.Reflections;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
@@ -516 +518 @@
         }
     }
+
+    /**
+     * Returns all JOSM subtypes of the given class.
+     * @param <T> class
+     * @param superClass class
+     * @return all JOSM subtypes of the given class
+     */
+    public static <T> Set<Class<? extends T>> getJosmSubtypes(Class<T> superClass) {
+        return new Reflections("org.openstreetmap.josm").getSubTypesOf(superClass);
+    }
 }

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -14 +14 @@
 import java.util.Collection;
 import java.util.Collections;
-
+import java.util.Set;
+
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -39 +41 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Key;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -701 +706 @@
         }
     }
+
+    /**
+     * Unit test of methods {@link Match#equals} and {@link Match#hashCode}, including all subclasses.
+     */
+    @Test
+    public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
+        Set<Class<? extends Match>> matchers = TestUtils.getJosmSubtypes(Match.class);
+        Assert.assertTrue(matchers.size() >= 10); // if it finds less than 10 classes, something is broken
+        for (Class<?> c : matchers) {
+            Logging.debug(c.toString());
+            EqualsVerifier.forClass(c).usingGetClass()
+                .suppress(Warning.NONFINAL_FIELDS, Warning.INHERITED_DIRECTLY_FROM_OBJECT)
+                .withPrefabValues(TaggingPreset.class, newTaggingPreset("foo"), newTaggingPreset("bar"))
+                .verify();
+        }
+    }
+
+    private static TaggingPreset newTaggingPreset(String name) {
+        TaggingPreset result = new TaggingPreset();
+        result.name = name;
+        return result;
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java

@@ -16 +16 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Utils;
-import org.reflections.Reflections;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -61 +61 @@
     @Test
     public void testTableCellRenderer() throws ReflectiveOperationException {
-        Reflections reflections = new Reflections("org.openstreetmap.josm");
-        Set<Class<? extends TableCellRenderer>> renderers = reflections.getSubTypesOf(TableCellRenderer.class);
+        Set<Class<? extends TableCellRenderer>> renderers = TestUtils.getJosmSubtypes(TableCellRenderer.class);
         Assert.assertTrue(renderers.size() >= 10); // if it finds less than 10 classes, something is broken
         JTable tbl = new JTable(2, 2);