azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Test] Don't pass MockProject to environment configurators

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-02-09 16:29:50 +03:00
committed by TeamCityServer
parent bd37badf29
commit a932f69b8a
7 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
+3 -5
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.test.services
import com.intellij.mock.MockProject
import org.jetbrains.kotlin.config.AnalysisFlag
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.CompilerConfigurationKey
@@ -22,20 +21,19 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices)
protected val moduleStructure: TestModuleStructure
get() = testServices.moduleStructure
protected open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {}
protected open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {}
fun configureCompileConfigurationWithAdditionalConfigurationKeys(
configuration: CompilerConfiguration,
module: TestModule,
project: MockProject
) {
configureCompilerConfiguration(configuration, module, project)
configureCompilerConfiguration(configuration, module)
val extractor = DirectiveToConfigurationKeyExtractor()
extractor.provideConfigurationKeys()
extractor.configure(configuration, module.directives)
}
protected open fun DirectiveToConfigurationKeyExtractor.provideConfigurationKeys() {}
open fun DirectiveToConfigurationKeyExtractor.provideConfigurationKeys() {}
open fun provideAdditionalAnalysisFlags(directives: RegisteredDirectives): Map<AnalysisFlag<*>, Any?> {
return emptyMap()