1 files changed, 17 insertions, 18 deletions
diff --git a/platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java b/platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java
index 02a39f148e24..098d76599f5b 100644
--- a/platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java
@@ -1,36 +1,35 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellij.testFramework;
 
-import com.intellij.mock.MockApplicationEx;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.Application;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.TestCase;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.concurrent.Future;
 
 public abstract class FlyIdeaTestCase extends TestCase {
-
-  private Disposable myRootDisposable;
+  private final Disposable myRootDisposable = Disposer.newDisposable();
   private File myTempDir;
 
   @Override
   protected void setUp() throws Exception {
-    final Application old = ApplicationManagerEx.getApplication();
-    myRootDisposable = Disposer.newDisposable();
-    MockApplicationEx app = new MockApplicationEx(getRootDisposable()) {
-      @NotNull
-      @Override
-      public Future<?> executeOnPooledThread(@NotNull Runnable action) {
-        return old != null ? old.executeOnPooledThread(action) : super.executeOnPooledThread(action);
-      }
-    };
-    ApplicationManager.setApplication(app, myRootDisposable);
+    LightPlatformTestCase.initApplication();
   }
 
   public File getTempDir() throws IOException {