[Test] Properly delete temporary directories after test run

compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java

@@ -48,6 +48,11 @@ public class KtTestUtil {
         return normalizeFile(FileUtil.createTempDirectory(name, "", false));
     }
 
+    @NotNull
+    public static File tmpDir(@NotNull File parentDir, @NotNull String name) throws IOException {
+        return normalizeFile(FileUtil.createTempDirectory(parentDir, name, "", false));
+    }
+
     @NotNull
     public static File tmpDirForReusableFolder(String name) throws IOException {
         return normalizeFile(FileUtil.createTempDirectory(new File(System.getProperty("java.io.tmpdir")), name, "", true));

compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/TestRunner.kt

@@ -9,6 +9,7 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.testFramework.TestDataFile
 import org.jetbrains.kotlin.test.model.*
 import org.jetbrains.kotlin.test.services.*
+import java.io.IOException
 
 class TestRunner(private val testConfiguration: TestConfiguration) {
     private val failedAssertions = mutableListOf<AssertionError>()
@@ -17,6 +18,11 @@ class TestRunner(private val testConfiguration: TestConfiguration) {
         try {
             runTestImpl(testDataFileName)
         } finally {
+            try {
+                testConfiguration.testServices.temporaryDirectoryManager.cleanupTemporaryDirectories()
+            } catch (_: IOException) {
+                // ignored
+            }
             Disposer.dispose(testConfiguration.rootDisposable)
         }
     }

compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/SourceFileProvider.kt

@@ -25,9 +25,9 @@ abstract class SourceFileProvider : TestService {
 
 val TestServices.sourceFileProvider: SourceFileProvider by TestServices.testServiceAccessor()
 
-class SourceFileProviderImpl(val preprocessors: List<SourceFilePreprocessor>) : SourceFileProvider() {
+class SourceFileProviderImpl(val testServices: TestServices, val preprocessors: List<SourceFilePreprocessor>) : SourceFileProvider() {
-    override val kotlinSourceDirectory: File = KtTestUtil.tmpDir("kotlin-files")
+    override val kotlinSourceDirectory: File = testServices.createTempDirectory("kotlin-files")
-    override val javaSourceDirectory: File = KtTestUtil.tmpDir("java-files")
+    override val javaSourceDirectory: File = testServices.createTempDirectory("java-files")
 
     private val contentOfFiles = mutableMapOf<TestFile, String>()
     private val realFileMap = mutableMapOf<TestFile, File>()

compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/TemporaryDirectoryManager.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.services
+
+import java.io.File
+
+abstract class TemporaryDirectoryManager(protected val testServices: TestServices) : TestService {
+    abstract fun createTempDirectory(name: String): File
+    abstract fun cleanupTemporaryDirectories()
+}
+
+val TestServices.temporaryDirectoryManager: TemporaryDirectoryManager by TestServices.testServiceAccessor()
+
+fun TestServices.createTempDirectory(name: String): File {
+    return temporaryDirectoryManager.createTempDirectory(name)
+}

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/builders/TestConfigurationBuilder.kt

@@ -151,7 +151,8 @@ class TestConfigurationBuilder {
             afterAnalysisCheckers,
             metaInfoHandlerEnabled,
             directives,
-            defaultRegisteredDirectivesBuilder.build()
+            defaultRegisteredDirectivesBuilder.build(),
+            additionalServices
         )
     }
 }

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractKotlinCompilerTest.kt

@@ -12,6 +12,8 @@ import org.jetbrains.kotlin.test.builders.testRunner
 import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
 import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
 import org.jetbrains.kotlin.test.preprocessors.MetaInfosCleanupPreprocessor
+import org.jetbrains.kotlin.test.services.*
+import org.jetbrains.kotlin.test.services.impl.TemporaryDirectoryManagerImpl
 import org.jetbrains.kotlin.test.services.JUnit5Assertions
 import org.jetbrains.kotlin.test.services.SourceFilePreprocessor
 import org.jetbrains.kotlin.test.services.KotlinTestInfo
@@ -34,6 +36,7 @@ abstract class AbstractKotlinCompilerTest {
 
     private val configuration: TestConfigurationBuilder.() -> Unit = {
         assertions = JUnit5Assertions
+        useAdditionalService<TemporaryDirectoryManager>(::TemporaryDirectoryManagerImpl)
         useSourcePreprocessor(*defaultPreprocessors.toTypedArray())
         useDirectives(*defaultDirectiveContainers.toTypedArray())
         configureDebugFlags()

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt

@@ -103,7 +103,7 @@ open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : Envir
 class JvmForeignAnnotationsAgainstCompiledJavaConfigurator(testServices: TestServices) : JvmForeignAnnotationsConfigurator(testServices) {
     @OptIn(ExperimentalStdlibApi::class)
     override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {
-        val compiledJavaPath = KtTestUtil.tmpDir("java-compiled-files")
+        val compiledJavaPath = testServices.createTempDirectory("java-compiled-files")
 
         val foreignAnnotations = createJarWithForeignAnnotations(module)
         val testAnnotations = compileTestAnnotations(foreignAnnotations)

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/TemporaryDirectoryManagerImpl.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.services.impl
+
+import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.test.services.TemporaryDirectoryManager
+import org.jetbrains.kotlin.test.services.TestServices
+import org.jetbrains.kotlin.test.services.testInfo
+import org.jetbrains.kotlin.test.util.KtTestUtil
+import java.io.File
+
+class TemporaryDirectoryManagerImpl(testServices: TestServices) : TemporaryDirectoryManager(testServices) {
+    private val rootTempDir: File = run {
+        val testInfo = testServices.testInfo
+        KtTestUtil.tmpDirForTest(testInfo.className, testInfo.methodName)
+    }
+
+    override fun createTempDirectory(name: String): File {
+        return KtTestUtil.tmpDir(rootTempDir, name)
+    }
+
+    override fun cleanupTemporaryDirectories() {
+        FileUtil.delete(rootTempDir)
+    }
+}

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/jvm/CompiledJarManager.kt

@@ -10,19 +10,15 @@ import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.output.writeAll
 import org.jetbrains.kotlin.test.model.ArtifactKinds
 import org.jetbrains.kotlin.test.model.TestModule
-import org.jetbrains.kotlin.test.services.TestService
+import org.jetbrains.kotlin.test.services.*
-import org.jetbrains.kotlin.test.services.TestServices
-import org.jetbrains.kotlin.test.services.compilerConfigurationProvider
-import org.jetbrains.kotlin.test.services.dependencyProvider
 import java.io.File
-import java.nio.file.Files
 
 class CompiledJarManager(val testServices: TestServices) : TestService {
     private val jarCache = mutableMapOf<TestModule, File>()
 
     fun getCompiledJarForModule(module: TestModule): File {
         return jarCache.getOrPut(module) {
-            val outputDir = Files.createTempDirectory("module_${module.name}").toFile()
+            val outputDir = testServices.createTempDirectory("module_${module.name}")
             val classFileFactory = testServices.dependencyProvider.getArtifact(module, ArtifactKinds.Jvm).classFileFactory
             val outputFileCollection = SimpleOutputFileCollection(classFileFactory.currentOutput)
             val messageCollector = testServices.compilerConfigurationProvider.getCompilerConfiguration(module)