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

Timestamp:

2021-08-24T02:43:50+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20690 - fix #21240 - Refactoring of UploadDialog, HistoryComboBox and AutoCompletingComboBox (patch by marcello)

Location:

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

Files:

• io/BasicUploadSettingsPanelTest.java (modified) (2 diffs)
• io/ChangesetCommentModelTest.java (deleted)
• io/ChangesetManagementPanelTest.java (modified) (2 diffs)
• io/TagSettingsPanelTest.java (deleted)
• io/UploadDialogModelTest.java (added)
• io/UploadDialogTest.java (modified) (5 diffs)
• tagging/ac/AutoCompComboBoxModelTest.java (added)
• tagging/ac/AutoCompComboBoxTest.java (added)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.io;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.openstreetmap.josm.spi.preferences.Config;
 
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
@@ -18 +25 @@
     @Test
     void testBasicUploadSettingsPanel() {
-        assertNotNull(new BasicUploadSettingsPanel(new ChangesetCommentModel(), new ChangesetCommentModel(), new ChangesetReviewModel()));
+        assertNotNull(new BasicUploadSettingsPanel(new UploadDialogModel()));
+    }
+
+    private static void doTestGetLastChangesetTagFromHistory(String historyKey, List<String> def) {
+        Config.getPref().putList(historyKey, null);
+        Config.getPref().putInt(BasicUploadSettingsPanel.COMMENT_LAST_USED_KEY, 0);
+        Config.getPref().putInt(BasicUploadSettingsPanel.COMMENT_MAX_AGE_KEY, 30);
+        assertNull(BasicUploadSettingsPanel.getLastChangesetTagFromHistory(historyKey, def));          // age NOK (history empty)
+
+        Config.getPref().putList(historyKey, Arrays.asList("foo", "bar"));
+        assertNull(BasicUploadSettingsPanel.getLastChangesetTagFromHistory(historyKey, def));          // age NOK (history not empty)
+
+        Config.getPref().putLong(BasicUploadSettingsPanel.COMMENT_LAST_USED_KEY, System.currentTimeMillis() / 1000);
+        assertEquals("foo", BasicUploadSettingsPanel.getLastChangesetTagFromHistory(historyKey, def)); // age OK, history not empty
+
+        Config.getPref().putList(historyKey, null);
+        assertEquals(def.get(0), BasicUploadSettingsPanel.getLastChangesetTagFromHistory(historyKey, def));   // age OK, history empty
+    }
+
+    /**
+     * Test of {@link BasicUploadSettingsPanel#getLastChangesetTagFromHistory} method.
+     */
+    @Test
+    void testGetLastChangesetCommentFromHistory() {
+        doTestGetLastChangesetTagFromHistory(
+                BasicUploadSettingsPanel.COMMENT_HISTORY_KEY,
+                Arrays.asList("baz", "quux"));
+    }
+
+    /**
+     * Test of {@link BasicUploadSettingsPanel#getLastChangesetTagFromHistory} method.
+     */
+    @Test
+    void testGetLastChangesetSourceFromHistory() {
+        doTestGetLastChangesetTagFromHistory(
+                BasicUploadSettingsPanel.SOURCE_HISTORY_KEY,
+                BasicUploadSettingsPanel.getDefaultSources());
     }
 }

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

@@ -5 +5 @@
 
 import org.junit.jupiter.api.Test;
+
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
@@ -17 +18 @@
     @Test
     void testChangesetManagementPanel() {
-        assertNotNull(new ChangesetManagementPanel(new ChangesetCommentModel()));
+        assertNotNull(new ChangesetManagementPanel(new UploadDialogModel()));
     }
 }

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

@@ -13 +13 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 
 import javax.swing.JOptionPane;
@@ -19 +18 @@
 import org.junit.jupiter.api.Test;
 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;
@@ -82 +80 @@
             return new ConcurrentHashMap<>();
         }
-
-        @Override
-        public void forceUpdateActiveField() {
-            // Do nothing
-        }
     }
 
@@ -114 +107 @@
         // test with unassigned unicode characters ==> no unicode block
         assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort("\u0860"));
-    }
-
-    private static void doTestGetLastChangesetTagFromHistory(String historyKey, Supplier<String> methodToTest, String def) {
-        Config.getPref().putList(historyKey, null);
-        Config.getPref().putInt(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0);
-        Config.getPref().putInt(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, 30);
-        assertNull(methodToTest.get());          // age NOK (history empty)
-        Config.getPref().putList(historyKey, Arrays.asList("foo"));
-        assertNull(methodToTest.get());          // age NOK (history not empty)
-        Config.getPref().putLong(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, System.currentTimeMillis() / 1000);
-        assertEquals("foo", methodToTest.get()); // age OK, history not empty
-        Config.getPref().putList(historyKey, null);
-        assertEquals(def, methodToTest.get());   // age OK, history empty
-    }
-
-    /**
-     * Test of {@link UploadDialog#getLastChangesetCommentFromHistory} method.
-     */
-    @Test
-    void testGetLastChangesetCommentFromHistory() {
-        doTestGetLastChangesetTagFromHistory(
-                BasicUploadSettingsPanel.HISTORY_KEY,
-                UploadDialog::getLastChangesetCommentFromHistory,
-                null);
-    }
-
-    /**
-     * Test of {@link UploadDialog#getLastChangesetSourceFromHistory} method.
-     */
-    @Test
-    void testGetLastChangesetSourceFromHistory() {
-        doTestGetLastChangesetTagFromHistory(
-                BasicUploadSettingsPanel.SOURCE_HISTORY_KEY,
-                UploadDialog::getLastChangesetSourceFromHistory,
-                BasicUploadSettingsPanel.getDefaultSources().get(0));
     }
 
@@ -186 +144 @@
         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));
-    }
 }