From 0d66478adb2b05579ae3244f2b16f72ee9af5244 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 27 May 2016 12:59:07 +0200
Subject: [PATCH] add diagnostics and interruption when
 PlatformTestUtil.waitForAlarm hangs

---
 .../testFramework/PlatformTestUtil.java       | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
index a880f6120b56..c62d13ff820f 100644
--- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
+++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
@@ -27,6 +27,7 @@ import com.intellij.ide.util.treeView.AbstractTreeStructure;
 import com.intellij.idea.Bombed;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.application.ex.ApplicationEx;
@@ -254,21 +255,38 @@ public class PlatformTestUtil {
 
   @TestOnly
   public static void waitForAlarm(final int delay) throws InterruptedException {
-    assert !ApplicationManager.getApplication().isWriteAccessAllowed(): "It's a bad idea to wait for an alarm under the write action. Somebody creates an alarm which requires read action and you are deadlocked.";
-    assert ApplicationManager.getApplication().isDispatchThread();
+    Application app = ApplicationManager.getApplication();
+    assert !app.isWriteAccessAllowed(): "It's a bad idea to wait for an alarm under the write action. Somebody creates an alarm which requires read action and you are deadlocked.";
+    assert app.isDispatchThread();
 
-    final AtomicBoolean invoked = new AtomicBoolean();
+    final AtomicBoolean runnableInvoked = new AtomicBoolean();
+    final AtomicBoolean alarmInvoked1 = new AtomicBoolean();
+    final AtomicBoolean alarmInvoked2 = new AtomicBoolean();
     final Alarm alarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
-    alarm.addRequest(() -> ApplicationManager.getApplication().invokeLater(() -> alarm.addRequest(() -> invoked.set(true), delay)), delay);
+
+    alarm.addRequest(() -> {
+      alarmInvoked1.set(true);
+      app.invokeLater(() -> {
+        runnableInvoked.set(true);
+        alarm.addRequest(() -> alarmInvoked2.set(true), delay);
+      });
+    }, delay);
 
     UIUtil.dispatchAllInvocationEvents();
 
+    long start = System.currentTimeMillis();
     boolean sleptAlready = false;
-    while (!invoked.get()) {
+    while (!alarmInvoked2.get()) {
       UIUtil.dispatchAllInvocationEvents();
       //noinspection BusyWait
       Thread.sleep(sleptAlready ? 10 : delay);
       sleptAlready = true;
+      if (System.currentTimeMillis() - start > 100 * 1000) {
+        throw new AssertionError("Couldn't await alarm" +
+                                 "; alarm1 passed=" + alarmInvoked1.get() +
+                                 "; invokeLater passed=" + runnableInvoked.get() +
+                                 "; app.disposed=" + app.isDisposed());
+      }
     }
     UIUtil.dispatchAllInvocationEvents();
   }