Changeset 15051 in josm for trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java

Timestamp:

2019-05-05T17:35:29+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17634 - allow to define exceptions to the list of forbidden terms, through upload.comment.exception-terms property

File:

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

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

@@ -265 +265 @@
         Config.getPref().putList(prefix + ".mandatory-terms", null);
         Config.getPref().putList(prefix + ".forbidden-terms", null);
-        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def, def));
 
         Config.getPref().putList(prefix + ".mandatory-terms", Arrays.asList("foo"));
-        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def, def));
         assertEquals("The following required terms are missing: [foo]",
-                UploadAction.validateUploadTag("bar", prefix, def, def));
+                UploadAction.validateUploadTag("bar", prefix, def, def, def));
 
         Config.getPref().putList(prefix + ".forbidden-terms", Arrays.asList("bar"));
-        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
-        assertEquals("The following forbidden terms have been found: [bar]",
-                UploadAction.validateUploadTag("foobar", prefix, def, def));
-        assertEquals("The following forbidden terms have been found: [bar]",
-                UploadAction.validateUploadTag("FOOBAR", prefix, def, def));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def, def));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("foobar", prefix, def, def, def));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("FOOBAR", prefix, def, def, def));
+
+        Config.getPref().putList(prefix + ".exception-terms", Arrays.asList("barosm"));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("foobar", prefix, def, def, def));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("FOOBAR", prefix, def, def, def));
+        assertNull(UploadAction.validateUploadTag("foobarosm", prefix, def, def, def));
+        assertNull(UploadAction.validateUploadTag("FOOBAROSM", prefix, def, def, def));
     }