Changeset 18824 in josm for trunk/test

Timestamp:

2023-09-07T19:36:52+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix #23153: Remote Control API call is adding hashtags many times

This occurs due to adding the hashtags to the comment multiple times.

This is fixed by doing the following:
1) When finding hashtags from a comment, only return the distinct hashtags
2) When adding hashtags from the dataset, only add hashtags that are not already

part of the comment.

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.io;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.Main;
 
 /**
  * Unit tests of {@link UploadDialogModel} class.
  */
-public class UploadDialogModelTest {
-    /**
-     * Setup tests
-     */
-    @RegisterExtension
-    public JOSMTestRules test = new JOSMTestRules().preferences().main();
-
+@Main
+class UploadDialogModelTest {
     /**
      * Test of {@link UploadDialogModel}.
@@ -27 +21 @@
     @Test
     void testUploadDialogModel() {
-        assertNotNull(new UploadDialogModel());
+        assertDoesNotThrow(UploadDialogModel::new);
     }
 
@@ -65 +59 @@
     }
 
+    @Test
+    void testNonRegression23153() {
+        final DataSet dataSet = new DataSet();
+        dataSet.getChangeSetTags().put("hashtags", "duplicate");
+        final UploadDialogModel model = new UploadDialogModel();
+        final String hashTags = model.findHashTags("#duplicate #duplicate hashtag");
+        assertEquals("#duplicate", hashTags);
+        final String commentHashtags = UploadDialogModel.addHashTagsFromDataSet("There should be no " + hashTags, dataSet);
+        assertEquals("There should be no #duplicate", commentHashtags);
+    }
+
 }