From 13c585b1c8773e84cd168549c405a6afd3aa5ca5 Mon Sep 17 00:00:00 2001 From: Jiaxiang Chen Date: Fri, 29 Apr 2022 11:57:57 -0700 Subject: UPDATE_KOTLIN_VERSION: 1.7.20-dev-474 --- .../com/google/devtools/ksp/testutils/AbstractKSPTest.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'test-utils/src/main/kotlin/com/google/devtools/ksp/testutils/AbstractKSPTest.kt') diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/testutils/AbstractKSPTest.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/testutils/AbstractKSPTest.kt index 55f62d40..1c455f74 100644 --- a/test-utils/src/main/kotlin/com/google/devtools/ksp/testutils/AbstractKSPTest.kt +++ b/test-utils/src/main/kotlin/com/google/devtools/ksp/testutils/AbstractKSPTest.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots import org.jetbrains.kotlin.codegen.GenerationUtils import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.ExecutionListenerBasedDisposableProvider import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.testConfiguration import org.jetbrains.kotlin.test.compileJavaFiles @@ -40,16 +41,10 @@ import org.jetbrains.kotlin.test.model.FrontendKind import org.jetbrains.kotlin.test.model.ResultingArtifact import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest -import org.jetbrains.kotlin.test.services.JUnit5Assertions -import org.jetbrains.kotlin.test.services.KotlinTestInfo -import org.jetbrains.kotlin.test.services.TemporaryDirectoryManager -import org.jetbrains.kotlin.test.services.TestServices -import org.jetbrains.kotlin.test.services.compilerConfigurationProvider +import org.jetbrains.kotlin.test.services.* import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator import org.jetbrains.kotlin.test.services.impl.TemporaryDirectoryManagerImpl -import org.jetbrains.kotlin.test.services.isKtFile -import org.jetbrains.kotlin.test.services.javaFiles import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions @@ -123,6 +118,8 @@ abstract class AbstractKSPTest(frontend: FrontendKind<*>) : DisposableTest() { ) assertions = JUnit5Assertions useAdditionalService(::TemporaryDirectoryManagerImpl) + useAdditionalService { ExecutionListenerBasedDisposableProvider() } + useAdditionalService { StandardLibrariesPathProviderForKotlinProject } useDirectives(*AbstractKotlinCompilerTest.defaultDirectiveContainers.toTypedArray()) useDirectives(JvmEnvironmentConfigurationDirectives) -- cgit v1.2.3