From 41c0ea0668410e36aec5e179e32b9674ff0a13d1 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 3 Nov 2018 00:27:47 +0000 Subject: [PATCH v1 4/4] ChangesetCacheManagerTest: fix testDownloadSelectedChangesetContentAction and testDownloadSelectedChangesetContentAction for non-headless mode --- .../dialogs/changeset/ChangesetCacheManagerTest.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java index 08456dae0..8018de807 100644 --- a/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java +++ b/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java @@ -6,6 +6,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.awt.GraphicsEnvironment; +import java.awt.event.ActionEvent; import javax.swing.JButton; import javax.swing.JDialog; @@ -141,9 +142,15 @@ public class ChangesetCacheManagerTest { */ @Test public void testDownloadSelectedChangesetContentAction() { + if (GraphicsEnvironment.isHeadless()) { + TestUtils.assumeWorkingJMockit(); + // to allow us to construct a JDialog + new WindowMocker(); + } + DownloadSelectedChangesetContentAction action = new DownloadSelectedChangesetContentAction(ChangesetCacheManager.buildModel()); action.valueChanged(null); - action.actionPerformed(null); + action.actionPerformed(new ActionEvent(new JDialog().getComponent(0), ActionEvent.ACTION_PERFORMED, "foo")); } /** @@ -151,9 +158,15 @@ public class ChangesetCacheManagerTest { */ @Test public void testDownloadSelectedChangesetsAction() { + if (GraphicsEnvironment.isHeadless()) { + TestUtils.assumeWorkingJMockit(); + // to allow us to construct a JDialog + new WindowMocker(); + } + DownloadSelectedChangesetsAction action = new DownloadSelectedChangesetsAction(ChangesetCacheManager.buildModel()); action.valueChanged(null); - action.actionPerformed(null); + action.actionPerformed(new ActionEvent(new JDialog().getComponent(0), ActionEvent.ACTION_PERFORMED, "foo")); } /** -- 2.11.0