Changeset 17617 in josm

Timestamp:

2021-03-21T13:56:17+01:00 (4 years ago)

Author:

simon04

Message:

see #4626 - Add ValidationTaskPerformanceTest

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/ValidationTask.java (modified) (3 diffs)
• test/performance/org/openstreetmap/josm/PerformanceTestUtils.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/data/validation/ValidationTaskPerformanceTest.java (added)
• test/performance/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerPerformanceTest.java (modified) (1 diff)

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

@@ -8 +8 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.ValidatorLayer;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
@@ -36 +38 @@
                           Collection<OsmPrimitive> validatedPrimitives,
                           Collection<OsmPrimitive> formerValidatedPrimitives) {
-        super(tr("Validating"), false /*don't ignore exceptions */);
+        this(new PleaseWaitProgressMonitor(tr("Validating")), tests, validatedPrimitives, formerValidatedPrimitives);
+    }
+
+    protected ValidationTask(ProgressMonitor progressMonitor,
+                             Collection<Test> tests,
+                             Collection<OsmPrimitive> validatedPrimitives,
+                             Collection<OsmPrimitive> formerValidatedPrimitives) {
+        super(tr("Validating"), progressMonitor, false /*don't ignore exceptions */);
         this.validatedPrimitives = validatedPrimitives;
         this.formerValidatedPrimitives = formerValidatedPrimitives;
@@ -94 +103 @@
         }
     }
+
+    /**
+     * Gets the validation errors accumulated until this moment.
+     * @return The list of errors
+     */
+    public List<TestError> getErrors() {
+        return errors;
+    }
 }

trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java

@@ -37 +37 @@
     public static DataSet getNeubrandenburgDataSet() throws IOException, IllegalDataException {
         try (InputStream in = Compression.getUncompressedFileInputStream(new File(DATA_FILE))) {
-            return OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+            DataSet dataSet = OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+            dataSet.setName(DATA_FILE);
+            return dataSet;
         }
     }

trunk/test/performance/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerPerformanceTest.java

@@ -39 +39 @@
     @Test
     void testCity() {
-        tagChecker.visit(dsCity.allPrimitives());
+        PerformanceTestUtils.runPerformanceTest("MapCSSTagChecker on " + dsCity.getName(),
+                () -> tagChecker.visit(dsCity.allPrimitives()));
     }
 }