From 97fe81a034c6d94ef18cc8b6876406cda108687f Mon Sep 17 00:00:00 2001
From: Oleg Sukhodolsky <oleg.sukhodolsky@jetbrains.com>
Date: Tue, 7 Oct 2014 16:09:57 +0400
Subject: [PATCH] Do not push new event queue in test mode

---
 .../src/com/intellij/ide/IdeEventQueue.java              | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
index 5ff4d4e7fcfb..a6221007427f 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
@@ -147,9 +147,12 @@ public class IdeEventQueue extends EventQueue {
   }
 
   private IdeEventQueue() {
-    EventQueue systemEventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue();
-    assert !(systemEventQueue instanceof IdeEventQueue) : systemEventQueue;
-    systemEventQueue.push(this);
+    final Application application = ApplicationManager.getApplication();
+    if (application == null || !application.isUnitTestMode()) {
+      EventQueue systemEventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue();
+      assert !(systemEventQueue instanceof IdeEventQueue) : systemEventQueue;
+      systemEventQueue.push(this);
+    }
     addIdleTimeCounterRequest();
 
     final KeyboardFocusManager keyboardFocusManager = KeyboardFocusManager.getCurrentKeyboardFocusManager();