Index: trunk/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java (revision 14366) +++ trunk/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java (revision 14369) @@ -5,8 +5,14 @@ import static org.junit.Assert.assertNull; +import javax.swing.JOptionPane; + import org.junit.Rule; import org.junit.Test; +import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; import org.openstreetmap.josm.tools.LanguageInfo.LocaleType; + +import com.google.common.collect.ImmutableMap; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -89,4 +95,5 @@ @Test public void testEditAction() { + TestUtils.assumeWorkingJMockit(); IHelpBrowser browser = newHelpBrowser(); assertNull(browser.getUrl()); @@ -97,7 +104,21 @@ new HelpBrowser.EditAction(browser).actionPerformed(null); + final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker( + ImmutableMap.of( + "The current URL https://josm.openstreetmap.de/javadoc
is an external " + + "URL. Editing is only possible for help topics
on the help server " + + "https://josm.openstreetmap.de.", + JOptionPane.OK_OPTION + ) + ); + browser.openUrl(URL_3); assertEquals(URL_3, browser.getUrl()); new HelpBrowser.EditAction(browser).actionPerformed(null); + + assertEquals(1, jopsMocker.getInvocationLog().size()); + Object[] invocationLogEntry = jopsMocker.getInvocationLog().get(0); + assertEquals(JOptionPane.OK_OPTION, (int) invocationLogEntry[0]); + assertEquals("Warning", invocationLogEntry[2]); }