From e1669ae8e01b9458fee7cd492df38cef24e0497b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 29 Oct 2018 21:59:28 +0000 Subject: [PATCH v1 2/2] GenericRelationEditorTest: fix for non-headless mode --- .../gui/dialogs/relation/GenericRelationEditor.java | 4 +--- .../dialogs/relation/GenericRelationEditorTest.java | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java index 37fb97a5d..9c2a90bce 100644 --- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java +++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java @@ -905,9 +905,7 @@ public class GenericRelationEditor extends RelationEditor { boolean modified = false; for (OsmPrimitive p : primitivesToAdd) { if (p instanceof Relation && orig.equals(p)) { - if (!GraphicsEnvironment.isHeadless()) { - warnOfCircularReferences(p); - } + warnOfCircularReferences(p); continue; } else if (MemberTableModel.hasMembersReferringTo(relation.getMembers(), Collections.singleton(p)) && !confirmAddingPrimitive(p)) { diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java index f52faf622..b2391cf31 100644 --- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java +++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java @@ -1,11 +1,13 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.gui.dialogs.relation; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import java.util.Collections; +import javax.swing.JOptionPane; import javax.swing.JPanel; import org.junit.Rule; @@ -20,6 +22,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.tagging.TagEditorPanel; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -82,13 +85,30 @@ public class GenericRelationEditorTest { */ @Test public void testAddPrimitivesToRelation() { + TestUtils.assumeWorkingJMockit(); + final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker(); + Relation r = TestUtils.addFakeDataSet(new Relation(1)); assertNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.emptyList())); + + jopsMocker.getMockResultMap().put( + "You are trying to add a relation to itself.

This creates circular references " + + "and is therefore discouraged.
Skipping relation 'incomplete'.", + JOptionPane.OK_OPTION + ); + assertNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.singleton(new Relation(1)))); + assertEquals(1, jopsMocker.getInvocationLog().size()); + Object[] invocationLogEntry = jopsMocker.getInvocationLog().get(0); + assertEquals(JOptionPane.OK_OPTION, (int) invocationLogEntry[0]); + assertEquals("Warning", invocationLogEntry[2]); + assertNotNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.singleton(new Node(1)))); assertNotNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.singleton(new Way(1)))); assertNotNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.singleton(new Relation(2)))); + + assertEquals(1, jopsMocker.getInvocationLog().size()); } /** -- 2.11.0