Changeset 17523 in josm for trunk/test/unit/org

Timestamp:

2021-02-22T12:27:24+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20519 - NPE in Upload Dialog

File:

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

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

@@ -20 +20 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.io.UploadDialog.UploadAction;
 import org.openstreetmap.josm.io.UploadStrategySpecification;
@@ -195 +196 @@
         doTestValidateUploadTag("upload.source");
     }
+
+    @Test
+    void testGetCommentWithDataSetHashTag() {
+        assertEquals("", UploadDialog.getCommentWithDataSetHashTag(null, null));
+        DataSet ds = new DataSet();
+        assertEquals("foo", UploadDialog.getCommentWithDataSetHashTag("foo", ds));
+        ds.getChangeSetTags().put("hashtags", "bar");
+        assertEquals("foo #bar", UploadDialog.getCommentWithDataSetHashTag("foo", ds));
+        ds.getChangeSetTags().put("hashtags", "bar;baz;#bar");
+        assertEquals("foo #bar #baz", UploadDialog.getCommentWithDataSetHashTag("foo", ds));
+    }
 }