diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfigurator.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfigurator.kt index 64d6503277a..053a2f542aa 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfigurator.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfigurator.kt @@ -72,7 +72,7 @@ object AnalysisApiFe10TestConfigurator : AnalysisApiTestConfigurator() { JvmResolveUtil.analyze(project, files.filterIsInstance(), compilerConfiguration, packageProviderFactory) } - override fun preprocessTestDataPath(path: Path): Path { + override fun computeTestDataPath(path: Path): Path { val newPath = path.resolveSibling(path.nameWithoutExtension + "." + testPrefix + "." + path.extension) if (newPath.toFile().exists()) return newPath return path diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt index c662bda0b4f..3eecae975c5 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt @@ -293,7 +293,7 @@ abstract class AbstractAnalysisApiBasedTest : TestWithDisposable() { } protected fun runTest(@TestDataFile path: String) { - testDataPath = configurator.preprocessTestDataPath(Paths.get(path)) + testDataPath = configurator.computeTestDataPath(Paths.get(path)) val testConfiguration = createTestConfiguration() testServices = testConfiguration.testServices val moduleStructure = createModuleStructure(testConfiguration) diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfigurator.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfigurator.kt index 95a8960610a..a725b3cb18e 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfigurator.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfigurator.kt @@ -42,7 +42,7 @@ abstract class AnalysisApiTestConfigurator { KotlinGlobalModificationService.getInstance(project).publishGlobalModuleStateModification() } - open fun preprocessTestDataPath(path: Path): Path = path + open fun computeTestDataPath(path: Path): Path = path abstract fun createModules(moduleStructure: TestModuleStructure, testServices: TestServices, project: Project): KtModuleProjectStructure