From c73bd6ca851463b47facad70d9296215f410f660 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 29 Oct 2018 23:03:50 +0000 Subject: [PATCH v1 1/2] RelationEditorActionsTest: add forgotten assumeWorkingJMockit() check to relevant tests --- .../josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java index 88e87d1ee..db4050909 100644 --- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java +++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java @@ -10,8 +10,9 @@ import javax.swing.Icon; import javax.swing.JOptionPane; import javax.swing.text.JTextComponent; -import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; +import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; +import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; import com.google.common.collect.ImmutableMap; @@ -70,6 +71,7 @@ public class RelationEditorActionsTest extends AbstractRelationEditorActionTest */ @Test public void testDeleteCurrentRelationAction() { + TestUtils.assumeWorkingJMockit(); final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker( ImmutableMap.of( "\n \n \n \n \n You are about to delete 1 " @@ -106,6 +108,7 @@ public class RelationEditorActionsTest extends AbstractRelationEditorActionTest */ @Test public void testSetRoleAction() { + TestUtils.assumeWorkingJMockit(); final JOptionPaneSimpleMocker.MessagePanelMocker mpMocker = new JOptionPaneSimpleMocker.MessagePanelMocker(); // JOptionPaneSimpleMocker doesn't handle showOptionDialog calls because of their potential // complexity, but this is quite a simple use of showOptionDialog which we can mock from scratch. -- 2.11.0