Ticket #16010: v2-0007-JOSMTestRules-add-EDTAssertionMocker-and-.asserti.patch

src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -201 +201 @@
         }
     }
 
+    private static void handleEDTException(Throwable t) {
+        Logging.logWithStackTrace(Logging.LEVEL_ERROR, t, "Exception raised in EDT");
+    }
+
     /**
      * Executes synchronously a runnable in
      * <a href="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/dispatch.html">Event Dispatch Thread</a>.
@@ -214 +218 @@
             try {
                 SwingUtilities.invokeAndWait(task);
             } catch (InterruptedException | InvocationTargetException e) {
-                Logging.error(e);
+                handleEDTException(e);
             }
         }
     }
@@ -255 +259 @@
             try {
                 return callable.call();
             } catch (Exception e) { // NOPMD
-                Logging.error(e);
+                handleEDTException(e);
                 return null;
             }
         } else {
@@ -264 +268 @@
             try {
                 return task.get();
             } catch (InterruptedException | ExecutionException e) {
-                Logging.error(e);
+                handleEDTException(e);
                 return null;
             }
         }

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

@@ -65 +65 @@
     private Version originalVersion;
     private Runnable mapViewStateMockingRunnable;
     private Runnable navigableComponentMockingRunnable;
+    private Runnable edtAssertionMockingRunnable;
     private boolean platform;
     private boolean useProjection;
     private boolean useProjectionNadGrids;
@@ -261 +262 @@
     }
 
     /**
+     * Re-raise AssertionErrors thrown in the EDT where they would have normally been swallowed.
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules assertionsInEDT() {
+        return this.assertionsInEDT(EDTAssertionMocker::new);
+    }
+
+    /**
+     * Re-raise AssertionErrors thrown in the EDT where they would have normally been swallowed.
+     * @param edtAssertionMockingRunnable Runnable for initializing this functionality
+     *
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules assertionsInEDT(final Runnable edtAssertionMockingRunnable) {
+        this.edtAssertionMockingRunnable = edtAssertionMockingRunnable;
+        return this;
+    }
+
+    /**
      * Replace imagery sources with a default set of mock tile sources
      *
      * @return this instance, for easy chaining
@@ -472 +492 @@
             RightAndLefthandTraffic.initialize();
         }
 
+        if (this.edtAssertionMockingRunnable != null) {
+            this.edtAssertionMockingRunnable.run();
+        }
+
         if (commands) {
             // TODO: Implement a more selective version of this once Main is restructured.
             JOSMFixture.createUnitTestFixture().init(true);

new file test/unit/org/openstreetmap/josm/testutils/mockers/EDTAssertionMocker.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.testutils;
+
+import org.openstreetmap.josm.gui.util.GuiHelper;
+
+import mockit.Invocation;
+import mockit.Mock;
+import mockit.MockUp;
+
+/**
+ * MockUp that, when applied, should cause calls to the EDT which would normally swallow generated
+ * AssertionErrors to instead re-raise them.
+ */
+public class EDTAssertionMocker extends MockUp<GuiHelper> {
+    @Mock
+    private static void handleEDTException(final Invocation invocation, final Throwable t) {
+        final Throwable cause = t.getCause();
+        if (cause instanceof AssertionError) {
+            throw (AssertionError) cause;
+        }
+
+        invocation.proceed(t);
+    }
+}