Changeset 15015 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2019-04-22T16:43:22+02:00 (6 years ago)

Author:

Don-vip

Message:

see #17634 - use case insensitive comparison, forbid google as source

File:

• trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java

@@ -9 +9 @@
 import java.awt.GraphicsEnvironment;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -261 +262 @@
 
     private static void doTestValidateUploadTag(String prefix) {
+        List<String> def = Collections.emptyList();
         Config.getPref().putList(prefix + ".mandatory-terms", null);
         Config.getPref().putList(prefix + ".forbidden-terms", null);
-        assertNull(UploadAction.validateUploadTag("foo", prefix));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
 
         Config.getPref().putList(prefix + ".mandatory-terms", Arrays.asList("foo"));
-        assertNull(UploadAction.validateUploadTag("foo", prefix));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
         assertEquals("The following required terms are missing: [foo]",
-                UploadAction.validateUploadTag("bar", prefix));
+                UploadAction.validateUploadTag("bar", prefix, def, def));
 
         Config.getPref().putList(prefix + ".forbidden-terms", Arrays.asList("bar"));
-        assertNull(UploadAction.validateUploadTag("foo", prefix));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
         assertEquals("The following forbidden terms have been found: [bar]",
-                UploadAction.validateUploadTag("foobar", prefix));
+                UploadAction.validateUploadTag("foobar", prefix, def, def));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("FOOBAR", prefix, def, def));
     }