Fix #23049: Informational errors cause validator dialog to occur on upload, even if they are not enabled

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18775 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: taylor.smock

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

@@ -14,7 +14,9 @@
 
 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;
 import org.openstreetmap.josm.data.validation.util.AggregatePrimitivesVisitor;
@@ -50,6 +52,10 @@ public boolean checkUpload(APIDataSet apiDataSet) {
         Collection<OsmPrimitive> visited = v.visit(apiDataSet.getPrimitivesToUpdate());
         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);
             } else {

test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java

@@ -1,14 +1,31 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions.upload;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
+import java.util.Collections;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import mockit.Mock;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
+import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.mockers.ExtendedDialogMocker;
 
 /**
  * Unit tests for class {@link ValidateUploadHook}.
@@ -20,7 +37,7 @@ class ValidateUploadHookTest {
      */
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().fakeAPI().timeout(30000);
+    public JOSMTestRules test = new JOSMTestRules().main().projection().fakeAPI().timeout(30000);
 
     /**
      * Test of {@link ValidateUploadHook#checkUpload} method.
@@ -29,4 +46,33 @@ class ValidateUploadHookTest {
     void testCheckUpload() {
         assertTrue(new ValidateUploadHook().checkUpload(new APIDataSet()));
     }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void testUploadOtherErrors(boolean otherEnabled) {
+        ValidatorPrefHelper.PREF_OTHER_UPLOAD.put(otherEnabled);
+        final DataSet ds = new DataSet();
+        final Way building = TestUtils.newWay("building=yes", new Node(new LatLon(33.2287665, -111.8259225)),
+                new Node(new LatLon(33.2287335, -111.8257513)), new Node(new LatLon(33.2285316, -111.8258086)),
+                new Node(new LatLon(33.2285696, -111.8259781)));
+        ds.addPrimitiveRecursive(building);
+        building.addNode(building.firstNode());
+        ds.addDataSource(new DataSource(new Bounds(33, -112, 34, -111), ""));
+        MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds,
+                "ValidateUploadHookTest#testUploadOtherErrors", null));
+        final ExtendedDialogMocker mocker =
+                new ExtendedDialogMocker(Collections.singletonMap("Suspicious data found. Upload anyway?", "Cancel")) {
+                    @Override
+                    protected String getString(ExtendedDialog instance) {
+                        return instance.getTitle();
+                    }
+
+                    @Mock
+                    public void dispose() {
+                        // Do nothing
+                    }
+                };
+        new ValidateUploadHook().checkUpload(new APIDataSet(ds));
+        assertEquals(!otherEnabled, mocker.getInvocationLog().isEmpty());
+    }
 }