Changeset 18839 in josm for trunk/test

Timestamp:

2023-09-21T19:04:05+02:00 (10 months ago)

Author:

taylor.smock

Message:

Fix #23179: Include changeset in note comment if feasible (patch by qeef, modified)

Modifications are as follows:

• Unit tests
• Better note matching
• Find multiple changesets referring the same note

Location:

trunk/test/unit/org/openstreetmap/josm/gui/dialogs

Files:

• NotesDialogTest.java (modified) (5 diffs)
• layer/DeleteLayerActionTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/NotesDialogTest.java

@@ -9 +9 @@
 
 import java.time.Instant;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 import javax.swing.JLabel;
@@ -16 +19 @@
 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.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.openstreetmap.josm.TestUtils;
@@ -21 +27 @@
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.notes.NoteComment;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.ChangesetCache;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -27 +35 @@
 import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
@@ -97 +106 @@
         assertDoesNotThrow(() -> closeAction.actionPerformed(null));
     }
+
+    static Stream<Arguments> testCloseActionGetRelatedChangesetUrls() {
+        return Stream.of(
+                Arguments.of(1, 0, Collections.singletonList("/note/123")),
+                Arguments.of(1, 0, Collections.singletonList("/note/231")),
+                Arguments.of(1, 1, Collections.singletonList("/note/1")),
+                Arguments.of(1, 2, Arrays.asList("/note/1", "/note/1 again")),
+                Arguments.of(1, 2, Arrays.asList("/note/1", "/note/1 again", "/note/12 here")),
+                Arguments.of(1, 2, Arrays.asList("/note/1", "/note/12 again", "/note/1 here")),
+                Arguments.of(1, 2, Arrays.asList("/note/12", "/note/1 again", "/note/1 here")),
+                Arguments.of(1, 3, Arrays.asList("/note/1", "/note/1 again", "/note/1 here")),
+                Arguments.of(1, 3, Arrays.asList("note 1", "note 1 again", "note 1 here"))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void testCloseActionGetRelatedChangesetUrls(long noteId, int expectedChangesets, List<String> changesetComments) {
+        try {
+            Config.getPref().put("osm-server.url", null);
+            final String[] apiList = {"osm.org", "openstreetmap.org", Config.getUrls().getBaseBrowseUrl()};
+            for (int i = 0; i < changesetComments.size(); i++) {
+                final String comment = changesetComments.get(i);
+                final Changeset cs = new Changeset(i + 1);
+                cs.put("comment", apiList[i % 3] + comment);
+                ChangesetCache.getInstance().update(cs);
+            }
+            final List<String> changesetUrls = NotesDialog.getRelatedChangesetUrls(noteId);
+            assertEquals(expectedChangesets, changesetUrls.size());
+        } finally {
+            ChangesetCache.getInstance().clear();
+        }
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerActionTest.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.layer;