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

[analysis api, refactoring] get rid of HL name in class names

Browse Source
This commit is contained in:
Ilya Kirillov
2022-03-16 18:23:26 +01:00
parent 3838552a75
commit 3206c0ce87
112 changed files with 352 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt → analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/AnalysisApiTestConfiguratorService.kt
+1 -1
View File
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
import java.nio.file.Path
interface FrontendApiTestConfiguratorService {
interface AnalysisApiTestConfiguratorService {
val testPrefix: String? get() = null
val allowDependedAnalysisSession: Boolean get() = true
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleModuleTest.kt → analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedSingleModuleTest.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestModuleStructure
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractHLApiSingleModuleTest : AnalysisApiBasedTest() {
abstract class AbstractAnalysisApiBasedSingleModuleTest : AbstractAnalysisApiBasedTest() {
final override fun doTestByFileStructure(ktFiles: List<KtFile>, moduleStructure: TestModuleStructure, testServices: TestServices) {
val singleModule = moduleStructure.modules.single()
doTestByFileStructure(ktFiles, singleModule, testServices)
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt → analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt
+4 -4
View File
@@ -11,7 +11,7 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.util.Disposer
import com.intellij.testFramework.TestDataFile
import junit.framework.ComparisonFailure
import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.test.framework.TestWithDisposable
import org.jetbrains.kotlin.analysis.test.framework.project.structure.KotlinProjectStructureProviderTestImpl
import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtModuleProvider
@@ -46,8 +46,8 @@ import java.util.concurrent.ExecutionException
import kotlin.io.path.exists
import kotlin.io.path.nameWithoutExtension
abstract class AnalysisApiBasedTest : TestWithDisposable() {
abstract val configurator: FrontendApiTestConfiguratorService
abstract class AbstractAnalysisApiBasedTest : TestWithDisposable() {
abstract val configurator: AnalysisApiTestConfiguratorService
protected open val enableTestInDependedMode: Boolean
get() = configurator.allowDependedAnalysisSession
@@ -127,7 +127,7 @@ abstract class AnalysisApiBasedTest : TestWithDisposable() {
configureTest(this)
startingArtifactFactory = { ResultingArtifact.Source() }
this.testInfo = this@AnalysisApiBasedTest.testInfo
this.testInfo = this@AbstractAnalysisApiBasedTest.testInfo
}
protected open fun handleInitializationError(exception: Throwable, moduleStructure: TestModuleStructure): InitializationErrorAction =
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleFileTest.kt → analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiSingleFileTest.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices
abstract class AbstractHLApiSingleFileTest : AbstractHLApiSingleModuleTest() {
abstract class AbstractAnalysisApiSingleFileTest : AbstractAnalysisApiBasedSingleModuleTest() {
final override fun doTestByFileStructure(ktFiles: List<KtFile>, module: TestModule, testServices: TestServices) {
val singleFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" }
doTestByFileStructure(singleFile, module, testServices)