Changeset 14052 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences

Timestamp:

2018-07-26T22:01:31+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16010 - use JMockit to enable more extensive test coverage (patch by ris, modified)

see ​https://github.com/openstreetmap/josm/pull/24/commits for details

Location:

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

Files:

• advanced/ExportProfileActionTest.java (modified) (3 diffs)
• advanced/PreferencesTableTest.java (modified) (3 diffs)
• plugin/PluginPreferenceHighLevelTest.java (added)
• plugin/PluginPreferenceTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.advanced;
 
-import org.junit.BeforeClass;
+import javax.swing.JOptionPane;
+
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
+
+import com.google.common.collect.ImmutableMap;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -11 +18 @@
  */
 public class ExportProfileActionTest {
-
     /**
-     * Setup test.
+     * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().assertionsInEDT();
 
     /**
@@ -25 +30 @@
     @Test
     public void testAction() {
+        new JOptionPaneSimpleMocker(ImmutableMap.of(
+            "All the preferences of this group are default, nothing to save", JOptionPane.OK_OPTION
+        ));
         new ExportProfileAction(Main.pref, "foo", "bar").actionPerformed(null);
         new ExportProfileAction(Main.pref, "expert", "expert").actionPerformed(null);

trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java

@@ -9 +9 @@
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
+import javax.swing.JOptionPane;
+
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.preferences.advanced.PreferencesTable.AllSettingsTableModel;
 import org.openstreetmap.josm.spi.preferences.StringSetting;
-import org.openstreetmap.josm.gui.preferences.advanced.PreferencesTable.AllSettingsTableModel;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.mockers.ExtendedDialogMocker;
+import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
+
+import com.google.common.collect.ImmutableMap;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -19 +28 @@
  */
 public class PreferencesTableTest {
-
     /**
-     * Setup test.
+     * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().assertionsInEDT();
 
     private static PrefEntry newPrefEntry(String value) {
@@ -43 +50 @@
     @Test
     public void testPreferencesTable() {
+        new JOptionPaneSimpleMocker(ImmutableMap.of(
+            "Please select the row to edit.", JOptionPane.OK_OPTION,
+            "Please select the row to delete.", JOptionPane.OK_OPTION
+        ));
+        new ExtendedDialogMocker() {
+            @Override
+            protected int getMockResult(final ExtendedDialog instance) {
+                if (instance.getTitle().equals("Add setting")) {
+                    return 1 + this.getButtonPositionFromLabel(instance, "Cancel");
+                } else {
+                    return super.getMockResult(instance);
+                }
+            }
+        };
         PreferencesTable t = newTable();
         t.fireDataChanged();

trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java

@@ -10 +10 @@
 import java.util.Collections;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
@@ -19 +18 @@
 import org.openstreetmap.josm.plugins.PluginException;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.testutils.mockers.HelpAwareOptionPaneMocker;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import com.google.common.collect.ImmutableMap;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -24 +29 @@
  */
 public class PluginPreferenceTest {
-
     /**
      * Setup test.
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().assertionsInEDT().platform();
 
     /**
@@ -48 +51 @@
     public static PluginInformation getDummyPluginInformation() throws PluginException {
         return new PluginInformation(
-                new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin");
+                new File(TestUtils.getTestDataRoot() + "__files/plugin/dummy_plugin.v31772.jar"), "dummy_plugin");
     }
 
@@ -89 +92 @@
     @Test
     public void testNotifyDownloadResults() {
+        new HelpAwareOptionPaneMocker(ImmutableMap.<String, Object>builder()
+            .put("<html></html>", "OK")  // (buildDownloadSummary() output was empty)
+            .put("<html>Please restart JOSM to activate the downloaded plugins.</html>", "OK")
+            .build()
+        );
+
         PluginDownloadTask task = new PluginDownloadTask(NullProgressMonitor.INSTANCE, Collections.<PluginInformation>emptyList(), "");
         PluginPreference.notifyDownloadResults(null, task, false);