Changeset 14380 in josm

Timestamp:

2018-10-28T20:30:47+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #16906 - RelationEditorActionsTest: fix for non-headless mode (patch by ris)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (modified) (5 diffs)
• src/org/openstreetmap/josm/tools/bugreport/ReportedException.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

@@ -5 +5 @@
 
 import java.awt.Component;
-import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 import java.util.HashMap;
@@ -116 +115 @@
      * @return the option selected by user.
      *         {@link JOptionPane#CLOSED_OPTION} if the dialog was closed.
-     *         {@link JOptionPane#YES_OPTION} if <code>GraphicsEnvironment.isHeadless</code> returns <code>true</code>
      */
     public static int showOptionDialog(String preferenceKey, Component parent, Object message, String title, int optionType,
@@ -124 +122 @@
             return ret;
         MessagePanel pnl = new MessagePanel(message, isInBulkOperation(preferenceKey));
-        if (GraphicsEnvironment.isHeadless()) {
-            // for unit tests
-            ret = JOptionPane.YES_OPTION;
-        } else {
-            ret = JOptionPane.showOptionDialog(parent, pnl, title, optionType, messageType, null, options, defaultOption);
-        }
+        ret = JOptionPane.showOptionDialog(parent, pnl, title, optionType, messageType, null, options, defaultOption);
         if (isYesOrNo(ret)) {
             pnl.getNotShowAgain().store(preferenceKey, ret);
@@ -162 +155 @@
      *
      * @return true, if the selected option is equal to <code>trueOption</code>, otherwise false.
-     *         {@code trueOption} if <code>GraphicsEnvironment.isHeadless</code> returns <code>true</code>
      *
      * @see JOptionPane#INFORMATION_MESSAGE
@@ -174 +166 @@
             return ret == trueOption;
         MessagePanel pnl = new MessagePanel(message, isInBulkOperation(preferenceKey));
-        if (GraphicsEnvironment.isHeadless()) {
-            // for unit tests
-            ret = trueOption;
-        } else {
-            ret = JOptionPane.showConfirmDialog(parent, pnl, title, optionType, messageType);
-        }
+        ret = JOptionPane.showConfirmDialog(parent, pnl, title, optionType, messageType);
         if (isYesOrNo(ret)) {
             pnl.getNotShowAgain().store(preferenceKey, ret);

trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java

@@ -49 +49 @@
     private String methodWarningFrom;
 
-    ReportedException(Throwable exception) {
+    /**
+     * Constructs a new {@code ReportedException}.
+     * @param exception the cause (which is saved for later retrieval by the {@link #getCause()} method)
+     * @since 14380
+     */
+    public ReportedException(Throwable exception) {
         this(exception, Thread.currentThread());
     }
 
-    ReportedException(Throwable exception, Thread caughtOnThread) {
+    /**
+     * Constructs a new {@code ReportedException}.
+     * @param exception the cause (which is saved for later retrieval by the {@link #getCause()} method)
+     * @param caughtOnThread thread where the exception was caugth
+     * @since 14380
+     */
+    public ReportedException(Throwable exception, Thread caughtOnThread) {
         super(exception);
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.relation.actions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.awt.Component;
+import java.awt.Container;
+import javax.swing.Icon;
+import javax.swing.JOptionPane;
+import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
+import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+
+import com.google.common.collect.ImmutableMap;
+
+import mockit.Mock;
+import mockit.MockUp;
 
 import org.junit.Test;
@@ -10 +27 @@
 
     /**
-     * Check that all actions do not crash.
+     * Check that all dialog-less actions do not crash.
      */
     @Test
-    public void testAllActions() {
+    public void testNoDialogActions() {
         new AddSelectedAfterSelection(relationEditorAccess).actionPerformed(null);
         new AddSelectedBeforeSelection(relationEditorAccess).actionPerformed(null);
@@ -28 +45 @@
 
         new SelectAction(relationEditorAccess).actionPerformed(null);
-        new DeleteCurrentRelationAction(relationEditorAccess).actionPerformed(null);
 
         new DownloadIncompleteMembersAction(relationEditorAccess, "downloadincomplete").actionPerformed(null);
@@ -48 +64 @@
         new SortBelowAction(relationEditorAccess).actionPerformed(null);
         new ReverseAction(relationEditorAccess).actionPerformed(null);
+    }
+
+    /**
+     * Test DeleteCurrentRelationAction
+     */
+    @Test
+    public void testDeleteCurrentRelationAction() {
+        final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker(
+            ImmutableMap.<String, Object>of(
+                "<html>\n  <head>\n    \n  </head>\n  <body>\n    You are about to delete 1 "
+                + "relation:\n\n    "
+                + "<ul>\n      <li>\n        incomplete\n      </li>\n    </ul>\n    <br>\n    "
+                + "This step is rarely necessary and cannot be undone easily after being \n    "
+                + "uploaded to the server.<br>Do you really want to delete?\n  </body>\n</html>\n", JOptionPane.YES_OPTION,
+                "<html>\n  <head>\n    \n  </head>\n  <body>\n    You are about to delete incomplete "
+                + "objects.<br>This will cause problems \n    because you don\'t see the real object.<br>"
+                + "Do you really want to delete?\n  </body>\n</html>\n",
+                JOptionPane.YES_OPTION
+            )
+        ) {
+            public String getStringFromOriginalMessage(Object originalMessage) {
+                return ((JTextComponent) ((Container) originalMessage).getComponent(0)).getText();
+            }
+        };
+
+        new DeleteCurrentRelationAction(relationEditorAccess).actionPerformed(null);
+
+        assertEquals(2, jopsMocker.getInvocationLog().size());
+
+        Object[] invocationLogEntry = jopsMocker.getInvocationLog().get(0);
+        assertEquals(JOptionPane.YES_OPTION, (int) invocationLogEntry[0]);
+        assertEquals("Delete relation?", invocationLogEntry[2]);
+
+        invocationLogEntry = jopsMocker.getInvocationLog().get(1);
+        assertEquals(JOptionPane.YES_OPTION, (int) invocationLogEntry[0]);
+        assertEquals("Delete confirmation", invocationLogEntry[2]);
+    }
+
+    /**
+     * Test SetRoleAction
+     */
+    @Test
+    public void testSetRoleAction() {
+        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.
+        final boolean[] jopMockerCalled = new boolean[] {false};
+        final MockUp<JOptionPane> jopMocker = new MockUp<JOptionPane>() {
+            @Mock
+            public int showOptionDialog(
+                Component parentComponent,
+                Object message,
+                String title,
+                int optionType,
+                int messageType,
+                Icon icon,
+                Object[] options,
+                Object initialValue
+            ) {
+                assertEquals(
+                    "<html>You are setting an empty role on 0 objects.<br>This is equal to deleting the "
+                    + "roles of these objects.<br>Do you really want to apply the new role?</html>",
+                    mpMocker.getOriginalMessage((ConditionalOptionPaneUtil.MessagePanel) message).toString()
+                );
+                assertEquals(
+                    "Confirm empty role",
+                    title
+                );
+                jopMockerCalled[0] = true;
+                return JOptionPane.YES_OPTION;
+            }
+        };
 
         new SetRoleAction(relationEditorAccess).actionPerformed(null);
+
+        assertTrue(jopMockerCalled[0]);
     }
 }

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -8 +8 @@
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -61 +63 @@
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Territories;
+import org.openstreetmap.josm.tools.bugreport.ReportedException;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -674 +677 @@
                     throw exception;
                 } else {
-                    Logging.debug("Thread state at timeout: {0}", Thread.getAllStackTraces());
+                    if (Logging.isLoggingEnabled(Logging.LEVEL_DEBUG)) {
+                        // i.e. skip expensive formatting of stack trace if it won't be shown
+                        final StringWriter sw = new StringWriter();
+                        new ReportedException(exception).printReportThreadsTo(new PrintWriter(sw));
+                        Logging.debug("Thread state at timeout: {0}", sw);
+                    }
                     throw new Exception(MessageFormat.format("Test timed out after {0}ms", timeout));
                 }