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

[FIR IDE] Move test file analysis in FE10 Analysis API implementation to FrontendApiTestConfiguratorService

Browse Source
This commit is contained in:
Yan Zhulanow
2021-10-19 22:49:27 +09:00
committed by teamcityserver
parent a1280ed723
commit 8f39640237
27 changed files with 36 additions and 129 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
-8
View File
@@ -7,16 +7,8 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10ReferenceResolveTest : AbstractReferenceResolveTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
analyzeTestFiles(ktFiles, module, testServices)
super.doTestByFileStructure(ktFiles, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt
-8
View File
@@ -7,16 +7,8 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.fir.AbstractResolveCallTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10ResolveCallTest : AbstractResolveCallTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
analyzeTestFiles(ktFiles, module, testServices)
super.doTestByFileStructure(ktFiles, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt
+7 -7
View File
@@ -49,12 +49,12 @@ object KtFe10FrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSer
application.registerService(KotlinReferenceProviderContributor::class.java, KtFe10KotlinReferenceProviderContributor::class.java)
}
}
}
fun analyzeTestFiles(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val compilerConfigurationProvider = testServices.compilerConfigurationProvider
val project = compilerConfigurationProvider.getProject(module)
val compilerConfiguration = compilerConfigurationProvider.getCompilerConfiguration(module)
val packageProviderFactory = compilerConfigurationProvider.getPackagePartProviderFactory(module)
JvmResolveUtil.analyze(project, ktFiles, compilerConfiguration, packageProviderFactory)
override fun prepareTestFiles(files: List<KtFile>, module: TestModule, testServices: TestServices) {
val compilerConfigurationProvider = testServices.compilerConfigurationProvider
val project = compilerConfigurationProvider.getProject(module)
val compilerConfiguration = compilerConfigurationProvider.getCompilerConfiguration(module)
val packageProviderFactory = compilerConfigurationProvider.getPackagePartProviderFactory(module)
JvmResolveUtil.analyze(project, files, compilerConfiguration, packageProviderFactory)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt
-9
View File
@@ -6,19 +6,10 @@
package org.jetbrains.kotlin.analysis.api.descriptors.test.components
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractExpectedExpressionTypeTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10ExpectedExpressionTypeTest : AbstractExpectedExpressionTypeTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt
-9
View File
@@ -6,19 +6,10 @@
package org.jetbrains.kotlin.analysis.api.descriptors.test.components
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractHLExpressionTypeTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10HLExpressionTypeTest : AbstractHLExpressionTypeTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt
-9
View File
@@ -6,19 +6,10 @@
package org.jetbrains.kotlin.analysis.api.descriptors.test.components
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractHasCommonSubtypeTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10HasCommonSubtypeTest : AbstractHasCommonSubtypeTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt
-9
View File
@@ -6,19 +6,10 @@
package org.jetbrains.kotlin.analysis.api.descriptors.test.components
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractOverriddenDeclarationProviderTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10OverriddenDeclarationProviderTest : AbstractOverriddenDeclarationProviderTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
analyzeTestFiles(ktFiles, module, testServices)
super.doTestByFileStructure(ktFiles, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt
-9
View File
@@ -6,19 +6,10 @@
package org.jetbrains.kotlin.analysis.api.descriptors.test.components
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractRendererTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10RendererTest : AbstractRendererTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt
-9
View File
@@ -6,19 +6,10 @@
package org.jetbrains.kotlin.analysis.api.descriptors.test.scopes
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10FileScopeTest : AbstractFileScopeTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt
-8
View File
@@ -7,22 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.scopes
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10MemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
override fun doOutOfBlockModification(ktFile: KtFile) {
KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile)
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt
-6
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractCompileTimeConstantEvaluatorTest
import org.jetbrains.kotlin.psi.KtFile
@@ -16,9 +15,4 @@ import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10CompileTimeConstantEvaluatorTest : AbstractCompileTimeConstantEvaluatorTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt
-8
View File
@@ -7,22 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10SymbolByFqNameTest : AbstractSymbolByFqNameTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
override fun doOutOfBlockModification(ktFile: KtFile) {
KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile)
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt
-8
View File
@@ -7,22 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10SymbolByPsiTest : AbstractSymbolByPsiTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
override fun doOutOfBlockModification(ktFile: KtFile) {
KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile)
}
analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt
-8
View File
@@ -7,22 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification
import org.jetbrains.kotlin.analysis.api.descriptors.test.analyzeTestFiles
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractKtFe10SymbolByReferenceTest : AbstractSymbolByReferenceTest() {
override val configurator: FrontendApiTestConfiguratorService
get() = KtFe10FrontendApiTestConfiguratorService
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
analyzeTestFiles(listOf(ktFile), module, testServices)
super.doTestByFileStructure(ktFile, module, testServices)
}
override fun doOutOfBlockModification(ktFile: KtFile) {
KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile)
}