diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java index b99ac180953c..60eee1ac04f1 100644 --- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java +++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java @@ -10,6 +10,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.ProjectJdkTable; import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.roots.ui.configuration.DefaultModulesProvider; import com.intellij.openapi.roots.ui.configuration.actions.NewModuleAction; import com.intellij.openapi.util.Condition; @@ -108,6 +109,22 @@ public abstract class ProjectWizardTestCase extends PlatformTestCase { myWizard.doOk(); } + @Override + protected void setUp() throws Exception { + super.setUp(); + Sdk projectSdk = ProjectRootManager.getInstance(getProject()).getProjectSdk(); + Sdk[] jdks = ProjectJdkTable.getInstance().getAllJdks(); + for (final Sdk jdk : jdks) { + if (projectSdk != jdk) { + ApplicationManager.getApplication().runWriteAction(new Runnable() { + public void run() { + ProjectJdkTable.getInstance().removeJdk(jdk); + } + }); + } + } + } + @Override public void tearDown() throws Exception { if (myWizard != null) {