From 248fdb9837f5b7d688b1bda76a2a07d678d26a54 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Sat, 5 Mar 2005 21:09:45 +0300
Subject: [PATCH] Fixing tests.

---
 .../src/com/intellij/testFramework/IdeaTestCase.java      | 8 --------
 .../src/com/intellij/testFramework/LightIdeaTestCase.java | 8 --------
 source/com/intellij/idea/IdeaTestApplication.java         | 6 ++++++
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java b/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java
index a88926078bac..8ddff313bf8f 100644
--- a/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java
+++ b/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java
@@ -1,9 +1,7 @@
 package com.intellij.testFramework;
 
-import com.intellij.ExtensionPoints;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings;
 import com.intellij.codeInspection.ex.InspectionProfileImpl;
-import com.intellij.execution.JUnitPatcher;
 import com.intellij.ide.startup.impl.StartupManagerImpl;
 import com.intellij.idea.IdeaLogger;
 import com.intellij.idea.IdeaTestApplication;
@@ -13,7 +11,6 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.module.Module;
@@ -88,11 +85,6 @@ public abstract class IdeaTestCase extends TestCase implements DataProvider {
   protected void initApplication() throws Exception {
     ourApplication = IdeaTestApplication.getInstance();
     ourApplication.setDataProvider(this);
-    if (Extensions.getAllAreas().length < 2) {
-      Extensions.registerAreaClass("IDEA_PROJECT", null);
-      Extensions.registerAreaClass("IDEA_MODULE", "IDEA_PROJECT");
-      Extensions.getRootArea().registerExtensionPoint(ExtensionPoints.JUNIT_PATCHER, JUnitPatcher.class.getName());
-    }
   }
 
   protected void setUp() throws Exception {
diff --git a/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java b/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
index d21d3cd01f8c..5ebbe4416160 100644
--- a/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
+++ b/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
@@ -1,9 +1,7 @@
 package com.intellij.testFramework;
 
-import com.intellij.ExtensionPoints;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings;
 import com.intellij.codeInspection.ex.InspectionProfileImpl;
-import com.intellij.execution.JUnitPatcher;
 import com.intellij.ide.startup.impl.StartupManagerImpl;
 import com.intellij.idea.IdeaLogger;
 import com.intellij.idea.IdeaTestApplication;
@@ -12,7 +10,6 @@ import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.undo.UndoManager;
 import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.ModuleListener;
@@ -88,11 +85,6 @@ public class LightIdeaTestCase extends TestCase implements DataProvider {
   private void initApplication() throws Exception {
     ourApplication = IdeaTestApplication.getInstance();
     ourApplication.setDataProvider(this);
-    if (Extensions.getAllAreas().length < 2) {
-      Extensions.registerAreaClass("IDEA_PROJECT", null);
-      Extensions.registerAreaClass("IDEA_MODULE", "IDEA_PROJECT");
-      Extensions.getRootArea().registerExtensionPoint(ExtensionPoints.JUNIT_PATCHER, JUnitPatcher.class.getName());
-    }
     cleanupApplicationCaches();
   }
 
diff --git a/source/com/intellij/idea/IdeaTestApplication.java b/source/com/intellij/idea/IdeaTestApplication.java
index f3e2938f69e9..7dfa2135e2b5 100644
--- a/source/com/intellij/idea/IdeaTestApplication.java
+++ b/source/com/intellij/idea/IdeaTestApplication.java
@@ -1,7 +1,10 @@
 package com.intellij.idea;
 
+import com.intellij.ExtensionPoints;
+import com.intellij.execution.JUnitPatcher;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.openapi.application.ex.ApplicationManagerEx;
+import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.util.InvalidDataException;
 
 import java.io.IOException;
@@ -26,6 +29,9 @@ public class IdeaTestApplication extends CommandLineApplication {
       //Logger.setFactory(LoggerFactory.getInstance());
       new IdeaTestApplication();
       ApplicationManagerEx.getApplicationEx().load(null);
+      Extensions.registerAreaClass("IDEA_PROJECT", null);
+      Extensions.registerAreaClass("IDEA_MODULE", "IDEA_PROJECT");
+      Extensions.getRootArea().registerExtensionPoint(ExtensionPoints.JUNIT_PATCHER, JUnitPatcher.class.getName());
     }
     return (IdeaTestApplication)ourInstance;
   }