Fixing tests.

This commit is contained in:
Maxim Shafirov
2005-03-05 21:09:45 +03:00
parent 062301bd81
commit 248fdb9837
3 changed files with 6 additions and 16 deletions
@@ -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 {
@@ -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();
}
@@ -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;
}