From 79a2a00607b2afd46dd5d7c857bc2203db6f3c79 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 27 Mar 2018 19:21:17 +0100 Subject: [PATCH v2 12/28] PluginPreferenceTest: convert to use of HelpAwareOptionPaneMocker --- .../preferences/plugin/PluginPreferenceTest.java | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java index 9731f9e34..7c89cd081 100644 --- a/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java +++ b/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java @@ -9,28 +9,31 @@ import java.util.Arrays; import java.util.Collection; 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; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.plugins.PluginDownloadTask; import org.openstreetmap.josm.plugins.PluginException; import org.openstreetmap.josm.plugins.PluginInformation; +import org.openstreetmap.josm.testutils.HelpAwareOptionPaneMocker; +import org.openstreetmap.josm.testutils.JOSMTestRules; + +import com.google.common.collect.ImmutableMap; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Unit tests of {@link PluginPreference} class. */ 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(); /** * Unit test of {@link PluginPreference#PluginPreference}. @@ -88,6 +91,12 @@ public class PluginPreferenceTest { */ @Test public void testNotifyDownloadResults() { + new HelpAwareOptionPaneMocker(ImmutableMap.builder() + .put("", "OK") // (buildDownloadSummary() output was empty) + .put("Please restart JOSM to activate the downloaded plugins.", "OK") + .build() + ); + PluginDownloadTask task = new PluginDownloadTask(NullProgressMonitor.INSTANCE, Collections.emptyList(), ""); PluginPreference.notifyDownloadResults(null, task, false); PluginPreference.notifyDownloadResults(null, task, true); -- 2.11.0