[Test] Make some functions of environment configurators public
This is needed for using those methods from android tests
This commit is contained in:
committed by
TeamCityServer
parent
24d6853ead
commit
7e59e083d3
+4
-1
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.platform.jvm.isJvm
|
||||
import org.jetbrains.kotlin.platform.konan.isNative
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.jetbrains.kotlin.test.ApplicationEnvironmentDisposer
|
||||
import org.jetbrains.kotlin.test.TestInfrastructureInternals
|
||||
import org.jetbrains.kotlin.test.model.TestFile
|
||||
import org.jetbrains.kotlin.test.model.TestModule
|
||||
import java.io.File
|
||||
@@ -67,6 +68,7 @@ open class CompilerConfigurationProviderImpl(
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(TestInfrastructureInternals::class)
|
||||
protected open fun createKotlinCoreEnvironment(module: TestModule): KotlinCoreEnvironment {
|
||||
val platform = module.targetPlatform
|
||||
val configFiles = when {
|
||||
@@ -84,11 +86,12 @@ open class CompilerConfigurationProviderImpl(
|
||||
val projectEnv = KotlinCoreEnvironment.ProjectEnvironment(testRootDisposable, applicationEnvironment)
|
||||
return KotlinCoreEnvironment.createForTests(
|
||||
projectEnv,
|
||||
createCompilerConfiguration(module, projectEnv.project),
|
||||
createCompilerConfiguration(module),
|
||||
configFiles
|
||||
)
|
||||
}
|
||||
|
||||
@TestInfrastructureInternals
|
||||
fun createCompilerConfiguration(module: TestModule): CompilerConfiguration {
|
||||
val configuration = CompilerConfiguration()
|
||||
configuration[CommonConfigurationKeys.MODULE_NAME] = module.name
|
||||
|
||||
+2
-2
@@ -163,7 +163,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
|
||||
}
|
||||
}
|
||||
|
||||
private fun extractJdkKind(registeredDirectives: RegisteredDirectives): TestJdkKind {
|
||||
fun extractJdkKind(registeredDirectives: RegisteredDirectives): TestJdkKind {
|
||||
val fullJdkEnabled = JvmEnvironmentConfigurationDirectives.FULL_JDK in registeredDirectives
|
||||
val jdkKinds = registeredDirectives[JvmEnvironmentConfigurationDirectives.JDK_KIND]
|
||||
|
||||
@@ -181,7 +181,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
|
||||
}
|
||||
}
|
||||
|
||||
private fun extractConfigurationKind(registeredDirectives: RegisteredDirectives): ConfigurationKind {
|
||||
fun extractConfigurationKind(registeredDirectives: RegisteredDirectives): ConfigurationKind {
|
||||
val withRuntime = JvmEnvironmentConfigurationDirectives.WITH_RUNTIME in registeredDirectives ||
|
||||
JvmEnvironmentConfigurationDirectives.WITH_STDLIB in registeredDirectives
|
||||
val withReflect = JvmEnvironmentConfigurationDirectives.WITH_REFLECT in registeredDirectives
|
||||
|
||||
Reference in New Issue
Block a user