Ticket #16855: v1-0001-OsmDataLayerTest-fix-for-non-headless-mode.patch

File v1-0001-OsmDataLayerTest-fix-for-non-headless-mode.patch, 2.7 KB (added by ris, 8 years ago)

  • src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java 

    From f6963e3dec856a152e47c12e7551c464b196636b Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 18 Oct 2018 20:38:42 +0100
Subject: [PATCH v1 1/2] OsmDataLayerTest: fix for non-headless mode

---
 src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java      |  3 ---
 .../org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java  | 13 +++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 6f0dd5057..651280050 100644
    a b public class OsmDataLayer extends AbstractOsmDataLayer implements Listener, Data  
    11021102    @Override
    11031103    public boolean checkSaveConditions() {
    11041104        if (isDataSetEmpty() && 1 != GuiHelper.runInEDTAndWaitAndReturn(() -> {
    1105             if (GraphicsEnvironment.isHeadless()) {
    1106                 return 2;
    1107             }
    11081105            return new ExtendedDialog(
    11091106                    MainApplication.getMainFrame(),
    11101107                    tr("Empty document"),

  • test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java 

    diff --git a/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
index 275d98173..9d8555dd3 100644
    a b import org.openstreetmap.josm.gui.MainApplication;  
    3434import org.openstreetmap.josm.io.IllegalDataException;
    3535import org.openstreetmap.josm.io.OsmReader;
    3636import org.openstreetmap.josm.testutils.JOSMTestRules;
     37import org.openstreetmap.josm.testutils.mockers.ExtendedDialogMocker;
    3738import org.openstreetmap.josm.tools.date.DateUtils;
    3839
     40import com.google.common.collect.ImmutableMap;
     41
    3942import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    4043
    4144/**
    … … public class OsmDataLayerTest {  
    279282     */
    280283    @Test
    281284    public void testCheckSaveConditions() {
     285        TestUtils.assumeWorkingJMockit();
     286        final ExtendedDialogMocker edMocker = new ExtendedDialogMocker(
     287            ImmutableMap.<String, Object>of("The document contains no data.", "Cancel")
     288        );
     289
    282290        assertFalse(layer.checkSaveConditions());
    283291        fillDataSet(ds);
    284292        assertTrue(layer.checkSaveConditions());
     293
     294        assertEquals(1, edMocker.getInvocationLog().size());
     295        Object[] invocationLogEntry = edMocker.getInvocationLog().get(0);
     296        assertEquals(2, (int) invocationLogEntry[0]);
     297        assertEquals("Empty document", invocationLogEntry[2]);
    285298    }
    286299
    287300    @Test