From ae93084a4079589326fed696ca2782b8793c3d42 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 4 Nov 2018 23:10:56 +0000 Subject: [PATCH v1] MainApplicationTest: fix for non-headless mode --- .../openstreetmap/josm/gui/DownloadParamType.java | 14 +++---- .../josm/gui/MainApplicationTest.java | 48 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/src/org/openstreetmap/josm/gui/DownloadParamType.java b/src/org/openstreetmap/josm/gui/DownloadParamType.java index 2cf2b3bab..81e7e98e9 100644 --- a/src/org/openstreetmap/josm/gui/DownloadParamType.java +++ b/src/org/openstreetmap/josm/gui/DownloadParamType.java @@ -123,14 +123,12 @@ public enum DownloadParamType { * @return the download task, or {@code null} */ public List> downloadGps(String param) { - if (!GraphicsEnvironment.isHeadless()) { - JOptionPane.showMessageDialog( - MainApplication.getMainFrame(), - tr("Parameter \"downloadgps\" does not accept file names or file URLs"), - tr("Warning"), - JOptionPane.WARNING_MESSAGE - ); - } + JOptionPane.showMessageDialog( + MainApplication.getMainFrame(), + tr("Parameter \"downloadgps\" does not accept file names or file URLs"), + tr("Warning"), + JOptionPane.WARNING_MESSAGE + ); return Collections.emptyList(); } diff --git a/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java index e30ac0bab..eff556252 100644 --- a/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java +++ b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java @@ -22,7 +22,9 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import java.awt.GraphicsEnvironment; import javax.swing.JComponent; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.UIManager; @@ -43,10 +45,14 @@ import org.openstreetmap.josm.plugins.PluginListParseException; import org.openstreetmap.josm.plugins.PluginListParser; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.mockers.HelpAwareOptionPaneMocker; +import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.PlatformManager; import org.openstreetmap.josm.tools.Shortcut; +import com.google.common.collect.ImmutableMap; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -164,6 +170,16 @@ public class MainApplicationTest { */ @Test public void testUpdateAndLoadPlugins() throws PluginListParseException { + TestUtils.assumeWorkingJMockit(); + final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker( + ImmutableMap.of( + "JOSM could not find information about the following plugins:
    " + + "
  • buildings_tools
  • plastic_laf
The plugins are not " + + "going to be loaded.", + "OK" + ) + ); + final String old = System.getProperty("josm.plugins"); try { System.setProperty("josm.plugins", "buildings_tools,plastic_laf"); @@ -189,6 +205,14 @@ public class MainApplicationTest { System.clearProperty("josm.plugins"); } } + + // TODO remove following headless check once similar check removed from HelpAwareOptionPane + if (!GraphicsEnvironment.isHeadless()) { + assertEquals(1, haMocker.getInvocationLog().size()); + Object[] invocationLogEntry = haMocker.getInvocationLog().get(0); + assertEquals(0, (int) invocationLogEntry[0]); + assertEquals("Warning", invocationLogEntry[2]); + } } /** @@ -267,9 +291,21 @@ public class MainApplicationTest { */ @Test public void testPostConstructorProcessCmdLineFileUrl() throws MalformedURLException { + TestUtils.assumeWorkingJMockit(); + final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker( + ImmutableMap.of( + "Parameter \"downloadgps\" does not accept file names or file URLs", JOptionPane.OK_OPTION + ) + ); + doTestPostConstructorProcessCmdLine( Paths.get(TestUtils.getTestDataRoot() + "multipolygon.osm").toUri().toURL().toExternalForm(), Paths.get(TestUtils.getTestDataRoot() + "minimal.gpx").toUri().toURL().toExternalForm(), false); + + assertEquals(1, jopsMocker.getInvocationLog().size()); + Object[] invocationLogEntry = jopsMocker.getInvocationLog().get(0); + assertEquals(JOptionPane.OK_OPTION, (int) invocationLogEntry[0]); + assertEquals("Warning", invocationLogEntry[2]); } /** @@ -278,9 +314,21 @@ public class MainApplicationTest { */ @Test public void testPostConstructorProcessCmdLineFilename() throws MalformedURLException { + TestUtils.assumeWorkingJMockit(); + final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker( + ImmutableMap.of( + "Parameter \"downloadgps\" does not accept file names or file URLs", JOptionPane.OK_OPTION + ) + ); + doTestPostConstructorProcessCmdLine( Paths.get(TestUtils.getTestDataRoot() + "multipolygon.osm").toFile().getAbsolutePath(), Paths.get(TestUtils.getTestDataRoot() + "minimal.gpx").toFile().getAbsolutePath(), false); + + assertEquals(1, jopsMocker.getInvocationLog().size()); + Object[] invocationLogEntry = jopsMocker.getInvocationLog().get(0); + assertEquals(JOptionPane.OK_OPTION, (int) invocationLogEntry[0]); + assertEquals("Warning", invocationLogEntry[2]); } /** -- 2.11.0