From cc6fd035381c9af5cc2a6a0d4b869370638685dd Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Sun, 22 Apr 2012 16:15:09 +0200
Subject: [PATCH] cleanup temp directories in tests

---
 .../compiler/CompileServerManager.java        |  6 +++-
 .../jetbrains/ether/IncrementalTestCase.java  | 17 +++++-----
 .../groovy/compiler/GppCompilerTest.groovy    | 18 +++++++++++
 .../groovy/compiler/GroovyCompilerTest.groovy | 32 +++++++++++++++----
 4 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java b/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
index c79d369873f4..b8e0b1463e49 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
@@ -184,6 +184,10 @@ public class CompileServerManager implements ApplicationComponent{
     return ApplicationManager.getApplication().getComponent(CompileServerManager.class);
   }
 
+  public final File getCompileServerSystemRoot() {
+    return new File(mySystemDirectory, COMPILE_SERVER_SYSTEM_ROOT);
+  }
+
   public void notifyFilesChanged(Collection<String> paths) {
     sendNotification(paths, false);
   }
@@ -644,7 +648,7 @@ public class CompileServerManager implements ApplicationComponent{
     cmdLine.addParameter(org.jetbrains.jps.server.Server.class.getName());
     cmdLine.addParameter(Integer.toString(port));
 
-    final File workDirectory = new File(mySystemDirectory, COMPILE_SERVER_SYSTEM_ROOT);
+    final File workDirectory = getCompileServerSystemRoot();
     workDirectory.mkdirs();
     ensureLogConfigExists(workDirectory);
 
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
index 65c8aaa0884a..3cc1a7f1dbc0 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
@@ -106,17 +106,16 @@ public abstract class IncrementalTestCase extends TestCase {
   }
 
   private static void delete(final File file) throws Exception {
-    if (file.isDirectory()) {
-      final File[] files = file.listFiles();
-
-      if (files != null) {
-        for (File f : files) {
-          delete(f);
-        }
+    final File[] files = file.listFiles();
+    if (files != null) {
+      // is directory
+      for (File f : files) {
+        delete(f);
       }
     }
-
-    if (!file.delete()) throw new IOException("could not delete file or directory " + file.getPath());
+    if (!file.delete()) {
+      throw new IOException("could not delete file or directory " + file.getPath());
+    }
   }
 
   private static void copy(final File input, final File output) throws Exception {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.groovy
index 9835e8c793c5..52a6a32da986 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.groovy
@@ -17,6 +17,8 @@
 package org.jetbrains.plugins.groovy.compiler;
 
 
+import com.intellij.compiler.CompileServerManager
+import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.testFramework.PsiTestUtil
 import org.jetbrains.plugins.groovy.util.TestUtils
@@ -133,6 +135,22 @@ class A {
     void testRecompileDependentGroovyClasses() {
       super.testRecompileDependentGroovyClasses()
     }
+
+    @Override
+    protected void tearDown() {
+      File systemRoot = CompileServerManager.getInstance().getCompileServerSystemRoot()
+      try {
+        super.tearDown()
+      }
+      finally {
+        File[] files = systemRoot.listFiles()
+        if (files != null) {
+          for (File file : files) {
+            FileUtil.delete(file);
+          }
+        }
+      }
+    }
   }
 
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
index 23da98301178..c1a99b1033aa 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
@@ -17,16 +17,17 @@
 package org.jetbrains.plugins.groovy.compiler;
 
 
+import com.intellij.compiler.CompileServerManager
 import com.intellij.compiler.CompilerConfiguration
-import com.intellij.openapi.module.Module
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.PsiFile
-import junit.framework.AssertionFailedError
-import com.intellij.testFramework.PsiTestUtil
-import com.intellij.openapi.compiler.options.ExcludedEntriesConfiguration
 import com.intellij.compiler.CompilerConfigurationImpl
 import com.intellij.openapi.compiler.options.ExcludeEntryDescription
-import com.intellij.compiler.CompileServerManager
+import com.intellij.openapi.compiler.options.ExcludedEntriesConfiguration
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.PsiFile
+import com.intellij.testFramework.PsiTestUtil
+import junit.framework.AssertionFailedError
 
 /**
  * @author peter
@@ -620,6 +621,23 @@ public class Main {
 
   public static class JpsModeTest extends GroovyCompilerTest {
     @Override protected boolean useJps() { true }
+
+    @Override
+    protected void tearDown() {
+      File systemRoot = CompileServerManager.getInstance().getCompileServerSystemRoot()
+      try {
+        super.tearDown()
+      }
+      finally {
+        File[] files = systemRoot.listFiles()
+        if (files != null) {
+          for (File file : files) {
+            FileUtil.delete(file);
+          }
+        }
+      }
+    }
+
   }
 
 }