Ticket #16914: v1-0001-RelationEditorActionsTest-add-forgotten-assumeWor.patch

File v1-0001-RelationEditorActionsTest-add-forgotten-assumeWor.patch, 2.2 KB (added by ris, 8 years ago)

  • test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java 

    From c73bd6ca851463b47facad70d9296215f410f660 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
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 b import javax.swing.Icon;  
    1010import javax.swing.JOptionPane;
    1111import javax.swing.text.JTextComponent;
    1212
    13 import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
     13import org.openstreetmap.josm.TestUtils;
    1414import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
     15import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
    1516
    1617import com.google.common.collect.ImmutableMap;
    1718
    … … public class RelationEditorActionsTest extends AbstractRelationEditorActionTest  
    7071     */
    7172    @Test
    7273    public void testDeleteCurrentRelationAction() {
     74        TestUtils.assumeWorkingJMockit();
    7375        final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker(
    7476            ImmutableMap.<String, Object>of(
    7577                "<html>\n  <head>\n    \n  </head>\n  <body>\n    You are about to delete 1 "
    … … public class RelationEditorActionsTest extends AbstractRelationEditorActionTest  
    106108     */
    107109    @Test
    108110    public void testSetRoleAction() {
     111        TestUtils.assumeWorkingJMockit();
    109112        final JOptionPaneSimpleMocker.MessagePanelMocker mpMocker = new JOptionPaneSimpleMocker.MessagePanelMocker();
    110113        // JOptionPaneSimpleMocker doesn't handle showOptionDialog calls because of their potential
    111114        // complexity, but this is quite a simple use of showOptionDialog which we can mock from scratch.