Changeset 18776 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-07-10T22:19:01+02:00 (16 months ago)

Author:

taylor.smock

Message:

See #23049, fix an issue where tests might visit the entire dataset during upload

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/upload/ValidateUploadHook.java (modified) (2 diffs)
• data/validation/ValidationTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.data.validation.OsmValidator;
-import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.data.validation.ValidationTask;
@@ -53 +51 @@
         OsmValidator.initializeTests();
         new ValidationTask(errors -> {
-            if (!Boolean.TRUE.equals(ValidatorPrefHelper.PREF_OTHER_UPLOAD.get())) {
-                // Use >= just in case we add additional levels.
-                errors.removeIf(error -> error.getSeverity().getLevel() >= Severity.OTHER.getLevel());
-            }
             if (errors.stream().allMatch(TestError::isIgnored)) {
                 returnCode.set(true);

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

@@ -108 +108 @@
         }
         if (this.onFinish != null) {
+            // Remove any low severity issues if they are not desired.
+            if (!(Boolean.TRUE.equals(ValidatorPrefHelper.PREF_OTHER.get()) &&
+                    (!this.beforeUpload || Boolean.TRUE.equals(ValidatorPrefHelper.PREF_OTHER_UPLOAD.get())))) {
+                // Use >= just in case we add additional levels.
+                this.errors.removeIf(error -> error.getSeverity().getLevel() >= Severity.OTHER.getLevel());
+            }
             this.onFinish.accept(this.errors);
         }
@@ -125 +131 @@
             getProgressMonitor().setCustomText(tr("Test {0}/{1}: Starting {2}", testCounter, tests.size(), test.getName()));
             test.setBeforeUpload(this.beforeUpload);
-            test.setPartialSelection(formerValidatedPrimitives != null);
+            // Pre-upload checks only run on a partial selection.
+            test.setPartialSelection(this.beforeUpload || formerValidatedPrimitives != null);
             test.startTest(getProgressMonitor().createSubTaskMonitor(validatedPrimitives.size(), false));
             test.visit(validatedPrimitives);