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

[FIR IDE] Move testPrefix to FrontendApiTestConfiguratorService

Browse Source
This commit is contained in:
Yan Zhulanow
2021-10-19 22:38:17 +09:00
committed by teamcityserver
parent e12c7d1292
commit a1280ed723
15 changed files with 7 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt
-3
View File
@@ -12,9 +12,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10ReferenceResolveTest : AbstractReferenceResolveTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt
-3
View File
@@ -12,9 +12,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10ResolveCallTest : AbstractResolveCallTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt
+3
View File
@@ -29,6 +29,9 @@ import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.compilerConfigurationProvider
object KtFe10FrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService {
override val testPrefix: String
get() = "descriptors"
override fun TestConfigurationBuilder.configureTest(disposable: Disposable) {
usePreAnalysisHandlers(::KtFe10ModuleRegistrarPreAnalysisHandler.bind(disposable))
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt
-3
View File
@@ -14,9 +14,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10ExpectedExpressionTypeTest : AbstractExpectedExpressionTypeTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt
-3
View File
@@ -14,9 +14,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10HLExpressionTypeTest : AbstractHLExpressionTypeTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt
-3
View File
@@ -14,9 +14,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10HasCommonSubtypeTest : AbstractHasCommonSubtypeTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt
-3
View File
@@ -14,9 +14,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10OverriddenDeclarationProviderTest : AbstractOverriddenDeclarationProviderTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt
-3
View File
@@ -14,9 +14,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10RendererTest : AbstractRendererTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt
-3
View File
@@ -14,9 +14,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10FileScopeTest : AbstractFileScopeTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt
-3
View File
@@ -15,9 +15,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10MemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt
-3
View File
@@ -14,9 +14,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10CompileTimeConstantEvaluatorTest : AbstractCompileTimeConstantEvaluatorTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt
-3
View File
@@ -15,9 +15,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10SymbolByFqNameTest : AbstractSymbolByFqNameTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt
-3
View File
@@ -15,9 +15,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10SymbolByPsiTest : AbstractSymbolByPsiTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt
-3
View File
@@ -15,9 +15,6 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10SymbolByReferenceTest : AbstractSymbolByReferenceTest() {
override val testPrefix: String?
get() = "descriptors"
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt
+4 -4
View File
@@ -36,6 +36,9 @@ import java.util.concurrent.ExecutionException
import kotlin.io.path.nameWithoutExtension
interface FrontendApiTestConfiguratorService {
val testPrefix: String?
get() = null
fun TestConfigurationBuilder.configureTest(disposable: Disposable)
fun processTestFiles(files: List<KtFile>): List<KtFile> = files
@@ -58,9 +61,6 @@ abstract class AbstractFrontendApiTest : TestWithDisposable() {
protected abstract val configurator: FrontendApiTestConfiguratorService
protected open val testPrefix: String?
get() = null
protected open fun configureTest(builder: TestConfigurationBuilder) {
with(configurator) {
builder.configureTest(disposable)
@@ -73,7 +73,7 @@ abstract class AbstractFrontendApiTest : TestWithDisposable() {
val extensionWithDot = "." + extension.removePrefix(".")
val baseName = testDataPath.nameWithoutExtension
val testPrefix = this.testPrefix
val testPrefix = configurator.testPrefix
if (testPrefix != null) {
val prefixedFile = testDataPath.resolveSibling("$baseName.$testPrefix$extensionWithDot")
if (prefixedFile.exists()) {