From 94fccf4c1177d90fb66075a08d4e701923a1025a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 1 Nov 2018 23:31:28 +0000 Subject: [PATCH v1 3/4] ChangesetCacheManagerTest: fix testDownloadMyChangesets for non-headless mode --- .../dialogs/changeset/ChangesetCacheManagerTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 df518ea21..08456dae0 100644 --- a/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java +++ b/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java @@ -1,6 +1,7 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.gui.dialogs.changeset; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -26,8 +27,11 @@ import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager.Remove import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager.ShowDetailAction; import org.openstreetmap.josm.gui.dialogs.changeset.query.ChangesetQueryDialog; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.mockers.HelpAwareOptionPaneMocker; import org.openstreetmap.josm.testutils.mockers.WindowMocker; +import com.google.common.collect.ImmutableMap; + import mockit.Invocation; import mockit.Mock; import mockit.MockUp; @@ -114,7 +118,22 @@ public class ChangesetCacheManagerTest { */ @Test public void testDownloadMyChangesets() { + TestUtils.assumeWorkingJMockit(); + final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker( + ImmutableMap.of( + "JOSM is currently running with an anonymous user. It cannot download
" + + "your changesets from the OSM server unless you enter your OSM user name
" + + "in the JOSM preferences.", + "OK" + ) + ); + new DownloadMyChangesets().actionPerformed(null); + + assertEquals(1, haMocker.getInvocationLog().size()); + Object[] invocationLogEntry = haMocker.getInvocationLog().get(0); + assertEquals(0, (int) invocationLogEntry[0]); + assertEquals("Warning", invocationLogEntry[2]); } /** -- 2.11.0