From 83abbd012da9a9001492e920dea09bd19cc7ae28 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 5 Jun 2014 10:47:52 +0400
Subject: [PATCH] fixing OOME in tests

---
 .../testSrc/com/intellij/compiler/BaseCompilerTestCase.java   | 2 +-
 .../src/com/intellij/compiler/CompilerTestUtil.java           | 4 +++-
 .../src/com/intellij/testFramework/CompilerTester.java        | 2 +-
 .../jetbrains/idea/maven/compiler/MavenCompilingTestCase.java | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java b/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java
index 5793832b8cd7..5ca8ff6e3478 100644
--- a/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java
+++ b/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java
@@ -81,7 +81,7 @@ public abstract class BaseCompilerTestCase extends ModuleTestCase {
         FileUtil.delete(new File(FileUtil.toSystemDependentName(outputPath)));
       }
     }
-    CompilerTestUtil.disableExternalCompiler();
+    CompilerTestUtil.disableExternalCompiler(getProject());
 
     super.tearDown();
   }
diff --git a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
index ecd7af710ca3..0f8f11ce6788 100644
--- a/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
+++ b/java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
@@ -1,6 +1,7 @@
 package com.intellij.compiler;
 
 import com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration;
+import com.intellij.compiler.server.BuildManager;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.application.WriteAction;
@@ -86,12 +87,13 @@ public class CompilerTestUtil {
     }.execute();
   }
 
-  public static void disableExternalCompiler() {
+  public static void disableExternalCompiler(final Project project) {
     new WriteAction() {
       protected void run(final Result result) {
         ApplicationManagerEx.getApplicationEx().doNotSave(true);
         JavaAwareProjectJdkTableImpl table = JavaAwareProjectJdkTableImpl.getInstanceEx();
         table.removeJdk(table.getInternalJdk());
+        BuildManager.getInstance().clearState(project);
       }
     }.execute();
   }
diff --git a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java
index 414541fa23bb..6af8389b8abe 100644
--- a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java
+++ b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java
@@ -74,7 +74,7 @@ public class CompilerTester {
   }
 
   public void tearDown() {
-    CompilerTestUtil.disableExternalCompiler();
+    CompilerTestUtil.disableExternalCompiler(getProject());
 
     try {
       myMainOutput.tearDown();
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/MavenCompilingTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/MavenCompilingTestCase.java
index 2ca35d40fca5..aa430ca15de7 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/MavenCompilingTestCase.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/MavenCompilingTestCase.java
@@ -48,7 +48,7 @@ public abstract class MavenCompilingTestCase extends MavenImportingTestCase {
 
   protected void tearDown() throws Exception {
     try {
-      CompilerTestUtil.disableExternalCompiler();
+      CompilerTestUtil.disableExternalCompiler(myProject);
     }
     finally {
       super.tearDown();