diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10AnalysisApiTestConfiguratorService.kt similarity index 97% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10AnalysisApiTestConfiguratorService.kt index ee480763344..039223d625c 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10AnalysisApiTestConfiguratorService.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisHandlerExtension import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSessionProvider import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10KotlinReferenceProviderContributor -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.config.CompilerConfiguration @@ -36,7 +36,7 @@ import java.nio.file.Path import kotlin.io.path.extension import kotlin.io.path.nameWithoutExtension -object KtFe10FrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { +object KtFe10AnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService { override val testPrefix: String get() = "descriptors" diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java index 8cf62fbd7f8..8879de726cf 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated extends AbstractAnalysisApiAnnotationsOnDeclarationsTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java index c922571d663..e74ea791aa1 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10AnalysisApiAnnotationsOnTypesTestGenerated extends AbstractAnalysisApiAnnotationsOnTypesTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java index be73db0e437..b6239b0357a 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class Fe10ResolveCallTestGenerated extends AbstractResolveCallTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java index c98cfb1b0c0..e083fab91e9 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class Fe10ResolveCandidatesTestGenerated extends AbstractResolveCandidatesTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java index 112ea712b3c..a1daf42864a 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.compileTimeConstantPro import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java index 423616d2a9e..ad13c86c984 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.diagnosticProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10CollectDiagnosticsTestGenerated extends AbstractCollectDiagnosticsTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java index 581b176ae1c..81853666b40 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionInfoProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10ReturnTargetSymbolTestGenerated extends AbstractReturnTargetSymbolTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java index cc36c2f22d0..7a61e1f9ab9 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionInfoProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10WhenMissingCasesTestGenerated extends AbstractWhenMissingCasesTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java index cdc6087bf32..6873ee5b017 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10DeclarationReturnTypeTestGenerated extends AbstractDeclarationReturnTypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java index 52024171e4d..35fda976ead 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10ExpectedExpressionTypeTestGenerated extends AbstractExpectedExpressionTypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java index 9c20aa3cf59..6b6b8159d56 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class Fe10HLExpressionTypeTestGenerated extends AbstractHLExpressionTypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java index c6dee54b86c..0dba1acb415 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.smartCastProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10HLSmartCastInfoTestGenerated extends AbstractHLSmartCastInfoTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java index 87d69507230..0e861b6157d 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationOverr import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10IsSubclassOfTestGenerated extends AbstractIsSubclassOfTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java index 85bc63ecd7f..9b25f8af07a 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationOverr import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10OverriddenDeclarationProviderTestGenerated extends AbstractOverriddenDeclarationProviderTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java index c410e28ef4d..5b27752f935 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationRende import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class Fe10RendererTestGenerated extends AbstractRendererTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java index d0076fb5c95..60ce9748b31 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeCreator; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10TypeParameterTypeTestGenerated extends AbstractTypeParameterTypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java index 41dab717a0a..4bbfc6f36a1 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10IsDenotableTestGenerated extends AbstractIsDenotableTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java index 28bf10ba0e8..3957b2189d5 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10HasCommonSubtypeTestGenerated extends AbstractHasCommonSubtypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java index 02fd0bd7f36..36c9f180db2 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class Fe10SymbolByFqNameTestGenerated extends AbstractSymbolByFqNameTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java index 72633f52e16..9bf4caceaca 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class Fe10SymbolByPsiTestGenerated extends AbstractSymbolByPsiTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java index ae06ed2dcfe..152b1f75b3c 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class Fe10SymbolByReferenceTestGenerated extends AbstractSymbolByReferenceTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return KtFe10FrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return KtFe10AnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirAnalysisApiTestConfiguratorService.kt similarity index 83% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirAnalysisApiTestConfiguratorService.kt index da5a1d8ac22..eab59948a41 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirAnalysisApiTestConfiguratorService.kt @@ -12,9 +12,9 @@ import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analysis.api.fir.utils.configureOptionalTestCompilerPlugin import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService -import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.FirLowLevelFrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.FirLowLevelAnalysisApiTestConfiguratorService import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor @@ -23,18 +23,18 @@ import org.jetbrains.kotlin.psi.KotlinReferenceProvidersService import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { +object FirAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService { override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { - with(FirLowLevelFrontendApiTestConfiguratorService) { configureTest(disposable) } + with(FirLowLevelAnalysisApiTestConfiguratorService) { configureTest(disposable) } configureOptionalTestCompilerPlugin() } override fun processTestFiles(files: List): List { - return FirLowLevelFrontendApiTestConfiguratorService.processTestFiles(files) + return FirLowLevelAnalysisApiTestConfiguratorService.processTestFiles(files) } override fun getOriginalFile(file: KtFile): KtFile { - return FirLowLevelFrontendApiTestConfiguratorService.getOriginalFile(file) + return FirLowLevelAnalysisApiTestConfiguratorService.getOriginalFile(file) } override fun registerProjectServices( @@ -45,7 +45,7 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic projectStructureProvider: ProjectStructureProvider, jarFileSystem: CoreJarFileSystem, ) { - FirLowLevelFrontendApiTestConfiguratorService.registerProjectServices( + FirLowLevelAnalysisApiTestConfiguratorService.registerProjectServices( project, compilerConfig, files, @@ -56,7 +56,7 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic } override fun registerApplicationServices(application: MockApplication) { - FirLowLevelFrontendApiTestConfiguratorService.registerApplicationServices(application) + FirLowLevelAnalysisApiTestConfiguratorService.registerApplicationServices(application) if (application.getServiceIfCreated(KotlinReferenceProvidersService::class.java) == null) { application.registerService(KotlinReferenceProvidersService::class.java, HLApiReferenceProviderService::class.java) application.registerService(KotlinReferenceProviderContributor::class.java, KotlinFirReferenceContributor::class.java) @@ -64,6 +64,6 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic } override fun doOutOfBlockModification(file: KtFile) { - FirLowLevelFrontendApiTestConfiguratorService.doOutOfBlockModification(file) + FirLowLevelAnalysisApiTestConfiguratorService.doOutOfBlockModification(file) } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java index 95ab9d2ac58..92e6707cce5 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source.LibrarySourceFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source.LibrarySourceAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractReferenceResolveTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return LibrarySourceFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return LibrarySourceAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java index 526ff9a02c6..cf60f2313c4 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java @@ -8,8 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceResolveTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java index f3a45d2cc3f..c5a6678453a 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirAnalysisApiAnnotationsOnDeclarationsTestGenerated extends AbstractAnalysisApiAnnotationsOnDeclarationsTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java index 5523b4e119d..172785bc1a0 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnFilesTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirAnalysisApiAnnotationsOnFilesTestGenerated extends AbstractAnalysisApiAnnotationsOnFilesTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java index 13d6bfb502e..94652da5a5e 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirAnalysisApiAnnotationsOnTypesTestGenerated extends AbstractAnalysisApiAnnotationsOnTypesTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java index 2181d03cf12..48289922fed 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirResolveCallTestGenerated extends AbstractResolveCallTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java index 7aa945f051c..dd4e07d5579 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirResolveCandidatesTestGenerated extends AbstractResolveCandidatesTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java index a55e027699a..d551da1c9a9 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.compileTimeConstantProv import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirCompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java index aca14442070..6be7919d08d 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.diagnosticProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirCollectDiagnosticsTestGenerated extends AbstractCollectDiagnosticsTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java index 0b778b00990..6ba03bbf5fe 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirReturnTargetSymbolTestGenerated extends AbstractReturnTargetSymbolTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java index fe5f9d3d54a..5d8d4f15d14 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirWhenMissingCasesTestGenerated extends AbstractWhenMissingCasesTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java index e0fc88a1b55..e756028c4d2 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirDeclarationReturnTypeTestGenerated extends AbstractDeclarationReturnTypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java index f9ef50582db..a39e794bdda 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirExpectedExpressionTypeTestGenerated extends AbstractExpectedExpressionTypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java index 99f8ecb4425..ca3e62160b6 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirHLExpressionTypeTestGenerated extends AbstractHLExpressionTypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt index ac07553628c..a1b51fe3a4b 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt @@ -5,14 +5,13 @@ package org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractHLImportOptimizerTest : AbstractHLApiSingleModuleTest(){ +abstract class AbstractHLImportOptimizerTest : AbstractAnalysisApiBasedSingleModuleTest(){ override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val mainKtFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" } val unusedImports = analyseForTest(mainKtFile) { analyseImports(mainKtFile).unusedImports } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt index 984af6cc0bd..2cb5d5be7c6 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt @@ -6,16 +6,15 @@ package org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider import org.jetbrains.kotlin.analysis.api.analyse -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractExpressionPsiTypeProviderTest : AbstractHLApiSingleFileTest(){ +abstract class AbstractExpressionPsiTypeProviderTest : AbstractAnalysisApiSingleFileTest(){ override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val declarationAtCaret = testServices.expressionMarkerProvider.getSelectedElement(ktFile) as KtExpression val actual = analyse(ktFile) { diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt index 383205ebf21..30fc85193df 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt @@ -10,9 +10,8 @@ import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementVisitor import org.jetbrains.kotlin.analysis.api.analyse -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.elements.KtLightElement @@ -27,7 +26,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull -abstract class AbstractPsiTypeProviderTest : AbstractHLApiSingleFileTest(){ +abstract class AbstractPsiTypeProviderTest : AbstractAnalysisApiSingleFileTest(){ override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val declaration = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) val containingClass = diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java index b7312254113..63844d58930 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.smartCastProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirHLSmartCastInfoTestGenerated extends AbstractHLSmartCastInfoTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java index 33ea5101f47..35dda09bc7c 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationOverri import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirIsSubclassOfTestGenerated extends AbstractIsSubclassOfTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java index 68f21d41d78..e77db7b2c62 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationOverri import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirOverriddenDeclarationProviderTestGenerated extends AbstractOverriddenDeclarationProviderTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java index 84dc3bfd971..84d307ed9ec 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationRender import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirRendererTestGenerated extends AbstractRendererTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java index 600c49b7524..7cf15a90a57 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeCreator; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirTypeParameterTypeTestGenerated extends AbstractTypeParameterTypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java index 3b5a8123a97..8844df1242c 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractFunctionClassKindTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirFunctionClassKindTestGenerated extends AbstractFunctionClassKindTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java index 78916140e5b..21e4afe23e5 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirIsDenotableTestGenerated extends AbstractIsDenotableTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt index 5729591225f..03cd068770e 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt @@ -7,16 +7,15 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeProvider import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractFirGetSuperTypesTest : AbstractHLApiSingleFileTest(){ +abstract class AbstractFirGetSuperTypesTest : AbstractAnalysisApiSingleFileTest(){ override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java index 8dff3a20d42..c6c41117128 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirHasCommonSubtypeTestGenerated extends AbstractHasCommonSubtypeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java index be444d169f4..7fb9f7b961a 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api. import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer.AbstractHLImportOptimizerTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirHLImportOptimizerTestGenerated extends AbstractHLImportOptimizerTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java index aaedbcb2320..4746576a415 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api. import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractExpressionPsiTypeProviderTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirExpressionPsiTypeProviderTestGenerated extends AbstractExpressionPsiTypeProviderTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java index 0c6df1e5e5d..bd389482a78 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api. import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractPsiTypeProviderTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirPsiTypeProviderTestGenerated extends AbstractPsiTypeProviderTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java index 5ad22fe9834..6ddf28581d9 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api. import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.components.typeProvider.AbstractFirGetSuperTypesTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirFirGetSuperTypesTestGenerated extends AbstractFirGetSuperTypesTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java index 2bff01ef3e2..7e891dedcf7 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractDelegateMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirDelegateMemberScopeTestGenerated extends AbstractDelegateMemberScopeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java index 00623242acd..f132ebed609 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirFileScopeTestGenerated extends AbstractFileScopeTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java index f76f98885be..3af2da94600 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirMemberScopeByFqNameTestGenerated extends AbstractMemberScopeByFqNameTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java index 2dc8e1e4bc6..205d132c7e9 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractSubstitutionOverridesUnwrappingTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirSubstitutionOverridesUnwrappingTestGenerated extends AbstractSubstitutionOverridesUnwrappingTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java index 317dea7deff..dfab1dfcf1b 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirSymbolByFqNameTestGenerated extends AbstractSymbolByFqNameTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java index 956bda08fdd..f588d4f6f1f 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java @@ -8,11 +8,10 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -25,8 +24,8 @@ import java.util.regex.Pattern; public class FirSymbolByPsiTestGenerated extends AbstractSymbolByPsiTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java index fe2379273b3..397aca54094 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public class FirSymbolByReferenceTestGenerated extends AbstractSymbolByReferenceTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { - return FirFrontendApiTestConfiguratorService.INSTANCE; + public AnalysisApiTestConfiguratorService getConfigurator() { + return FirAnalysisApiTestConfiguratorService.INSTANCE; } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryAnalysisApiTestConfiguratorService.kt similarity index 91% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryAnalysisApiTestConfiguratorService.kt index 0044580d4c6..33461ce3f03 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryAnalysisApiTestConfiguratorService.kt @@ -15,8 +15,8 @@ import com.intellij.psi.ClassFileViewProviderFactory import com.intellij.psi.FileTypeFileViewProviders import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { +object LibraryAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService { override val allowDependedAnalysisSession: Boolean get() = false override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { @@ -50,7 +50,7 @@ object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSe } override fun registerApplicationServices(application: MockApplication) { - FirFrontendApiTestConfiguratorService.registerApplicationServices(application) + FirAnalysisApiTestConfiguratorService.registerApplicationServices(application) if (application.getServiceIfCreated(ClsKotlinBinaryClassCache::class.java) != null) return application.registerService(ClsKotlinBinaryClassCache::class.java) application.registerService(FileAttributeService::class.java, DummyFileAttributeService) @@ -68,6 +68,6 @@ object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSe } override fun doOutOfBlockModification(file: KtFile) { - FirFrontendApiTestConfiguratorService.doOutOfBlockModification(file) + FirAnalysisApiTestConfiguratorService.doOutOfBlockModification(file) } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceAnalysisApiTestConfiguratorService.kt similarity index 86% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceAnalysisApiTestConfiguratorService.kt index 51fc5690f6c..39f91dc3558 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceAnalysisApiTestConfiguratorService.kt @@ -10,8 +10,8 @@ import com.intellij.mock.MockProject import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.registerTestServices import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledLibraryProvider @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.services.ServiceRegistrationData -object LibrarySourceFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { +object LibrarySourceAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService { override val allowDependedAnalysisSession: Boolean get() = false override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { @@ -43,10 +43,10 @@ object LibrarySourceFrontendApiTestConfiguratorService : FrontendApiTestConfigur } override fun registerApplicationServices(application: MockApplication) { - FirFrontendApiTestConfiguratorService.registerApplicationServices(application) + FirAnalysisApiTestConfiguratorService.registerApplicationServices(application) } override fun doOutOfBlockModification(file: KtFile) { - FirFrontendApiTestConfiguratorService.doOutOfBlockModification(file) + FirAnalysisApiTestConfiguratorService.doOutOfBlockModification(file) } } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt index 4e8d28e8c5a..1f103e31a28 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions import org.jetbrains.kotlin.analysis.api.components.RendererModifier import org.jetbrains.kotlin.analysis.api.impl.base.test.TestReferenceResolveResultRenderer.renderResolvedTo import org.jetbrains.kotlin.analysis.api.symbols.* -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.utils.unwrapMultiReferences import org.jetbrains.kotlin.idea.references.KtReference @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractReferenceResolveTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractReferenceResolveTest : AbstractAnalysisApiBasedSingleModuleTest() { override fun configureTest(builder: TestConfigurationBuilder) { super.configureTest(builder) with(builder) { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt index bdb684ace77..a2ba4a0b748 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractAnalysisApiAnnotationsOnDeclarationsTest : AbstractHLApiSingleFileTest() { +abstract class AbstractAnalysisApiAnnotationsOnDeclarationsTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val ktDeclaration = testServices.expressionMarkerProvider diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt index 9eb031db13c..3d2b9ff0563 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt @@ -5,13 +5,13 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractAnalysisApiAnnotationsOnFilesTest : AbstractHLApiSingleFileTest() { +abstract class AbstractAnalysisApiAnnotationsOnFilesTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val actual = analyseForTest(ktFile) { val fileSymbol = ktFile.getFileSymbol() diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt index 1dac4abf685..beeede731bd 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations import org.jetbrains.kotlin.analysis.api.annotations.annotations import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.test.framework.utils.indented import org.jetbrains.kotlin.psi.KtFile @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractAnalysisApiAnnotationsOnTypesTest : AbstractHLApiSingleFileTest() { +abstract class AbstractAnalysisApiAnnotationsOnTypesTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val ktTypeReference = testServices.expressionMarkerProvider diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt index 2515dcfd45e..ba7313b3243 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt @@ -8,14 +8,14 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.KtCallInfo -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractResolveCallTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractResolveCallTest : AbstractAnalysisApiBasedSingleModuleTest() { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val ktFile = ktFiles.first() val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt index 0693e6423c3..c5dbd814828 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt @@ -8,14 +8,14 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.KtCallCandidateInfo -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractResolveCandidatesTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractResolveCandidatesTest : AbstractAnalysisApiBasedSingleModuleTest() { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val ktFile = ktFiles.first() val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt index 48f45006f4d..13b13676e4b 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractHLApiSingleFileTest() { +abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val element = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val expression = when (element) { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt index 72e04960eba..a29e821d0bc 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.components.KtDiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.getLineAndColumnRangeInPsiFile import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils.offsetToLineAndColumn import org.jetbrains.kotlin.psi.KtElement @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions import kotlin.test.assertEquals -abstract class AbstractCollectDiagnosticsTest : AbstractHLApiSingleFileTest() { +abstract class AbstractCollectDiagnosticsTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { fun TextRange.asLineColumnRange(): String { return getLineAndColumnRangeInPsiFile(ktFile, this).toString() diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt index 924a2c3109e..f6ffac2df44 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionIn import com.intellij.psi.PsiComment import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.utils.getNameWithPositionString import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtReturnExpression @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractReturnTargetSymbolTest : AbstractHLApiSingleFileTest() { +abstract class AbstractReturnTargetSymbolTest : AbstractAnalysisApiSingleFileTest() { val commentRegex = Regex("""/\* (.+@\(.+\)|null) \*/""") override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val original = ktFile.text diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt index 0d9ce0d92a0..acfb0963e02 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt @@ -5,16 +5,15 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtWhenExpression import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractWhenMissingCasesTest : AbstractHLApiSingleFileTest() { +abstract class AbstractWhenMissingCasesTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val whenExpression = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt index a1afe73a7f6..2e7db79f728 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt @@ -5,15 +5,14 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.test.framework.utils.getNameWithPositionString import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractDeclarationReturnTypeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractDeclarationReturnTypeTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val actual = buildString { ktFile.accept(object : KtTreeVisitor() { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt index 1b84a4a4634..b0896c26967 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt @@ -5,9 +5,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile @@ -15,7 +14,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractExpectedExpressionTypeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractExpectedExpressionTypeTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtExpression diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt index ac9124baadf..782246d8ee5 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt @@ -6,9 +6,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtValueArgument @@ -16,7 +15,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractHLExpressionTypeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractHLExpressionTypeTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val selected = testServices.expressionMarkerProvider.getSelectedElement(ktFile) val expression = when (selected) { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt index 108feb4e380..033f0952a81 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt @@ -5,16 +5,15 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractHLSmartCastInfoTest : AbstractHLApiSingleFileTest() { +abstract class AbstractHLSmartCastInfoTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) as KtExpression val actual = executeOnPooledThreadInReadAction { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt index 88ddfac7621..5ff737e5d7f 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt @@ -6,14 +6,14 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractIsSubclassOfTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractIsSubclassOfTest : AbstractAnalysisApiBasedSingleModuleTest() { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val subClass = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFiles.first(), "sub") val superClass = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFiles.first(), "super") diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt index 71529336761..430e1cb4f9f 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt @@ -8,9 +8,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclar import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.impl.barebone.parentsOfType -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSyntheticJavaPropertySymbol @@ -20,7 +19,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractOverriddenDeclarationProviderTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractOverriddenDeclarationProviderTest : AbstractAnalysisApiBasedSingleModuleTest() { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val declaration = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFiles.first()) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt index 52c167b8b8c..384e1277249 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt @@ -8,13 +8,13 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclar import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractRendererTest : AbstractHLApiSingleFileTest() { +abstract class AbstractRendererTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val options = KtDeclarationRendererOptions.DEFAULT.copy( approximateTypes = true, diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt index d45885fa210..e64b0ffe29c 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt @@ -6,16 +6,15 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator import org.jetbrains.kotlin.analysis.api.components.buildTypeParameterType -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtTypeParameter import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractTypeParameterTypeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractTypeParameterTypeTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtTypeParameter diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt index 679d9ec3b00..136621f1f90 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt @@ -5,16 +5,15 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractFunctionClassKindTest : AbstractHLApiSingleFileTest() { +abstract class AbstractFunctionClassKindTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val expressionAtCaret = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) as KtExpression diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt index e85d4635ae1..78f50b739be 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt @@ -8,8 +8,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProv import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement import org.jetbrains.kotlin.analysis.api.impl.barebone.parentOfType -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtAnnotatedExpression import org.jetbrains.kotlin.psi.KtFile @@ -26,7 +25,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions import java.io.File -abstract class AbstractIsDenotableTest : AbstractHLApiSingleFileTest() { +abstract class AbstractIsDenotableTest : AbstractAnalysisApiSingleFileTest() { val denotableName = Name.identifier("Denotable") val undenotableName = Name.identifier("Nondenotable") override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt index a3a8db2bcc0..b20e577d5ad 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt @@ -7,8 +7,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtTreeVisitorVoid @@ -22,7 +21,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions import java.io.File -abstract class AbstractHasCommonSubtypeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractHasCommonSubtypeTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val errors = mutableListOf() val originalText = ktFile.text diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt index e919ab9fe82..5cb9dd4e66a 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt @@ -6,12 +6,10 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt index 1c63e694375..beb3baa78c6 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt @@ -5,15 +5,14 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractFileScopeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractFileScopeTest : AbstractAnalysisApiSingleFileTest() { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val actual = executeOnPooledThreadInReadAction { analyseForTest(ktFile) { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt index 7ac7936eecb..4bb62f74815 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt @@ -6,12 +6,10 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt index 90f9133d8c2..a6b844ff628 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolTest import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt index f6c429cbb90..bd9b76e8e96 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt @@ -6,9 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.ConfigurationDirectives diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt index 86b761205cf..fa49bc5b193 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt @@ -6,8 +6,6 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtParameter diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt index ce54a73e378..1f0a0c15d4d 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt @@ -6,9 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNameReferenceExpression diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt index 96d812ee489..577d2ae748a 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt @@ -7,13 +7,11 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtFileSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol -import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossibleMemberSymbol import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint import org.jetbrains.kotlin.psi.KtFile @@ -24,7 +22,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractSymbolTest : AbstractHLApiSingleFileTest() { +abstract class AbstractSymbolTest : AbstractAnalysisApiSingleFileTest() { private val renderingOptions = KtDeclarationRendererOptions.DEFAULT open val prettyRenderMode: PrettyRenderingMode = PrettyRenderingMode.RENDER_SYMBOLS_LINE_BY_LINE diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt index d9f34a908bc..bb3c1d86333 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.api.components.RendererModifier import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.TestReferenceResolveResultRenderer.renderResolvedTo import org.jetbrains.kotlin.analysis.api.impl.base.test.findReferencesAtCaret -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractStandaloneModeSingleModuleTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractStandaloneModeSingleModuleTest : AbstractAnalysisApiBasedSingleModuleTest() { override fun configureTest(builder: TestConfigurationBuilder) { super.configureTest(builder) with(builder) { diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt index 32b5f6f1a6d..dde2974df0e 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt @@ -10,20 +10,20 @@ import com.intellij.mock.MockProject import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -object StandaloneModeConfiguratorService : FrontendApiTestConfiguratorService { +object StandaloneModeConfiguratorService : AnalysisApiTestConfiguratorService { override val allowDependedAnalysisSession: Boolean get() = false override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { - with(FirFrontendApiTestConfiguratorService) { configureTest(disposable) } + with(FirAnalysisApiTestConfiguratorService) { configureTest(disposable) } } override fun registerProjectServices( @@ -48,6 +48,6 @@ object StandaloneModeConfiguratorService : FrontendApiTestConfiguratorService { } override fun doOutOfBlockModification(file: KtFile) { - FirFrontendApiTestConfiguratorService.doOutOfBlockModification(file) + FirAnalysisApiTestConfiguratorService.doOutOfBlockModification(file) } } diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java index e4600304c69..1c23e6d5f7c 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java @@ -8,10 +8,8 @@ package org.jetbrains.kotlin.analysis.api.standalone; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.standalone.StandaloneModeConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService; import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import java.io.File; @@ -24,7 +22,7 @@ import java.util.regex.Pattern; public class StandaloneModeSingleModuleTestGenerated extends AbstractStandaloneModeSingleModuleTest { @NotNull @Override - public FrontendApiTestConfiguratorService getConfigurator() { + public AnalysisApiTestConfiguratorService getConfigurator() { return StandaloneModeConfiguratorService.INSTANCE; } diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/AnalysisApiTestConfiguratorService.kt similarity index 97% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/AnalysisApiTestConfiguratorService.kt index 2a371cf1645..ac176624b13 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/AnalysisApiTestConfiguratorService.kt @@ -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 diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleModuleTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedSingleModuleTest.kt similarity index 94% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleModuleTest.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedSingleModuleTest.kt index 3e24f266b5b..4fbdbeefe1e 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleModuleTest.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedSingleModuleTest.kt @@ -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, moduleStructure: TestModuleStructure, testServices: TestServices) { val singleModule = moduleStructure.modules.single() doTestByFileStructure(ktFiles, singleModule, testServices) diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt similarity index 97% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt index e9515e647b6..c19faca14a8 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiBasedTest.kt @@ -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 = diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleFileTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiSingleFileTest.kt similarity index 89% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleFileTest.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiSingleFileTest.kt index 82e635d1182..e62aaf738a7 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleFileTest.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractAnalysisApiSingleFileTest.kt @@ -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, module: TestModule, testServices: TestServices) { val singleFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" } doTestByFileStructure(singleFile, module, testServices) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt index 0f9e7cc4918..1305103b515 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.test.base -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.base.AnalysisApiBasedTest +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest -abstract class AbstractLowLevelApiSingleModuleTest : AnalysisApiBasedTest() { - override val configurator: FrontendApiTestConfiguratorService get() = FirLowLevelFrontendApiTestConfiguratorService +abstract class AbstractLowLevelApiSingleModuleTest : AbstractAnalysisApiBasedTest() { + override val configurator: AnalysisApiTestConfiguratorService get() = FirLowLevelAnalysisApiTestConfiguratorService } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelFrontendApiTestConfiguratorService.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelAnalysisApiTestConfiguratorService.kt similarity index 95% rename from analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelFrontendApiTestConfiguratorService.kt rename to analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelAnalysisApiTestConfiguratorService.kt index 0a71a176e61..621ed0706ab 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelFrontendApiTestConfiguratorService.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelAnalysisApiTestConfiguratorService.kt @@ -16,14 +16,14 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.registerTe import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalKtFile import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.bind import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -object FirLowLevelFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { +object FirLowLevelAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService { override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { usePreAnalysisHandlers(::ModuleRegistrarPreAnalysisHandler.bind(disposable, false)) } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt index e1869b72acd..e5adc13e7d3 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.light.classes.symbol.base import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.renderClass @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.test.model.TestModule import java.nio.file.Path abstract class AbstractSymbolLightClassesFacadeTest( - configurator: FrontendApiTestConfiguratorService, + configurator: AnalysisApiTestConfiguratorService, override val currentExtension: String, override val stopIfCompilationErrorDirectivePresent: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt index f045d16432a..2366cbab500 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.light.classes.symbol.base import com.intellij.openapi.project.Project import com.intellij.psi.SyntaxTraverser -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.renderClass @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.test.model.TestModule import java.nio.file.Path abstract class AbstractSymbolLightClassesLoadingTest( - configurator: FrontendApiTestConfiguratorService, + configurator: AnalysisApiTestConfiguratorService, override val currentExtension: String, override val stopIfCompilationErrorDirectivePresent: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt index 0c78af4659d..ada2384892d 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.light.classes.symbol.base import com.intellij.openapi.project.Project import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.asJava.LightClassTestCommon import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.psi.KtFile @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.test.model.TestModule import java.nio.file.Path abstract class AbstractSymbolLightClassesTest( - configurator: FrontendApiTestConfiguratorService, + configurator: AnalysisApiTestConfiguratorService, override val currentExtension: String, override val stopIfCompilationErrorDirectivePresent: Boolean, ) : AbstractSymbolLightClassesTestBase(configurator) { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt index f2e6912a1bc..77841131bf8 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.light.classes.symbol.base import com.intellij.openapi.project.Project import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest -import org.jetbrains.kotlin.analysis.api.impl.base.test.utils.libraries.CompilerExecutor +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompilerExecutor import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.light.classes.symbol.base.service.NullabilityAnnotationSourceProvider import org.jetbrains.kotlin.psi.KtFile @@ -28,8 +28,8 @@ import kotlin.io.path.exists import kotlin.io.path.nameWithoutExtension abstract class AbstractSymbolLightClassesTestBase( - override val configurator: FrontendApiTestConfiguratorService -) : AbstractHLApiSingleModuleTest() { + override val configurator: AnalysisApiTestConfiguratorService +) : AbstractAnalysisApiBasedSingleModuleTest() { override val enableTestInDependedMode: Boolean get() = false diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesFacadeForLibraryTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesFacadeForLibraryTest.kt index 618ba5e1de3..da852fc5eec 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesFacadeForLibraryTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesFacadeForLibraryTest.kt @@ -6,13 +6,11 @@ package org.jetbrains.kotlin.light.classes.symbol.decompiled import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesFacadeTest -import org.jetbrains.kotlin.light.classes.symbol.decompiled.service.SymbolLightClassesForLibraryFrontendApiTestConfiguratorService -import org.junit.jupiter.api.parallel.Execution -import org.junit.jupiter.api.parallel.ExecutionMode +import org.jetbrains.kotlin.light.classes.symbol.decompiled.service.SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService abstract class AbstractSymbolLightClassesFacadeForLibraryTest : AbstractSymbolLightClassesFacadeTest( - SymbolLightClassesForLibraryFrontendApiTestConfiguratorService, + SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService, EXTENSIONS.LIB_JAVA, stopIfCompilationErrorDirectivePresent = true ) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesForLibraryTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesForLibraryTest.kt index 3ba20997b30..640e2e69e0d 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesForLibraryTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesForLibraryTest.kt @@ -6,13 +6,11 @@ package org.jetbrains.kotlin.light.classes.symbol.decompiled import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesTest -import org.jetbrains.kotlin.light.classes.symbol.decompiled.service.SymbolLightClassesForLibraryFrontendApiTestConfiguratorService -import org.junit.jupiter.api.parallel.Execution -import org.junit.jupiter.api.parallel.ExecutionMode +import org.jetbrains.kotlin.light.classes.symbol.decompiled.service.SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService abstract class AbstractSymbolLightClassesForLibraryTest : AbstractSymbolLightClassesTest( - SymbolLightClassesForLibraryFrontendApiTestConfiguratorService, + SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService, EXTENSIONS.LIB_JAVA, stopIfCompilationErrorDirectivePresent = true ) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesLoadingForLibraryTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesLoadingForLibraryTest.kt index 163f9b06969..3c6dd976025 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesLoadingForLibraryTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesLoadingForLibraryTest.kt @@ -6,13 +6,11 @@ package org.jetbrains.kotlin.light.classes.symbol.decompiled import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesLoadingTest -import org.jetbrains.kotlin.light.classes.symbol.decompiled.service.SymbolLightClassesForLibraryFrontendApiTestConfiguratorService -import org.junit.jupiter.api.parallel.Execution -import org.junit.jupiter.api.parallel.ExecutionMode +import org.jetbrains.kotlin.light.classes.symbol.decompiled.service.SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService abstract class AbstractSymbolLightClassesLoadingForLibraryTest : AbstractSymbolLightClassesLoadingTest( - SymbolLightClassesForLibraryFrontendApiTestConfiguratorService, + SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService, EXTENSIONS.LIB_JAVA, stopIfCompilationErrorDirectivePresent = true ) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryFrontendApiTestConfiguratorService.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService.kt similarity index 78% rename from analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryFrontendApiTestConfiguratorService.kt rename to analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService.kt index 4fdaf1265f2..32f270d8d53 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryFrontendApiTestConfiguratorService.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService.kt @@ -10,20 +10,20 @@ import com.intellij.mock.MockProject import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.binary.LibraryFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.base.test.utils.libraries.CompiledLibraryProvider +import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.binary.LibraryAnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestConfiguratorService import org.jetbrains.kotlin.analysis.decompiled.light.classes.ClsJavaStubByVirtualFileCache import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider +import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledLibraryProvider import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.services.ServiceRegistrationData -internal object SymbolLightClassesForLibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorService { +internal object SymbolLightClassesForLibraryAnalysisApiTestConfiguratorService : AnalysisApiTestConfiguratorService { override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { - with(LibraryFrontendApiTestConfiguratorService) { + with(LibraryAnalysisApiTestConfiguratorService) { configureTest(disposable) } useAdditionalServices(ServiceRegistrationData(CompiledLibraryProvider::class, ::CompiledLibraryProvider)) @@ -37,7 +37,7 @@ internal object SymbolLightClassesForLibraryFrontendApiTestConfiguratorService : projectStructureProvider: ProjectStructureProvider, jarFileSystem: CoreJarFileSystem, ) { - LibraryFrontendApiTestConfiguratorService.registerProjectServices( + LibraryAnalysisApiTestConfiguratorService.registerProjectServices( project, compilerConfig, files, @@ -49,10 +49,10 @@ internal object SymbolLightClassesForLibraryFrontendApiTestConfiguratorService : } override fun registerApplicationServices(application: MockApplication) { - LibraryFrontendApiTestConfiguratorService.registerApplicationServices(application) + LibraryAnalysisApiTestConfiguratorService.registerApplicationServices(application) } override fun doOutOfBlockModification(file: KtFile) { - LibraryFrontendApiTestConfiguratorService.doOutOfBlockModification(file) + LibraryAnalysisApiTestConfiguratorService.doOutOfBlockModification(file) } } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesFacadeForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesFacadeForSourceTest.kt index 8f76c3101cf..a1573233c14 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesFacadeForSourceTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesFacadeForSourceTest.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.light.classes.symbol.source -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesFacadeTest abstract class AbstractSymbolLightClassesFacadeForSourceTest : AbstractSymbolLightClassesFacadeTest( - FirFrontendApiTestConfiguratorService, + FirAnalysisApiTestConfiguratorService, EXTENSIONS.FIR_JAVA, stopIfCompilationErrorDirectivePresent = false ) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesForSourceTest.kt index 381235882dc..d328193c745 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesForSourceTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesForSourceTest.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.light.classes.symbol.source -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesTest abstract class AbstractSymbolLightClassesForSourceTest : AbstractSymbolLightClassesTest( - FirFrontendApiTestConfiguratorService, + FirAnalysisApiTestConfiguratorService, EXTENSIONS.FIR_JAVA, stopIfCompilationErrorDirectivePresent = false ) \ No newline at end of file diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesLoadingForSourceTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesLoadingForSourceTest.kt index 336a8aed47c..4401f78476e 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesLoadingForSourceTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesLoadingForSourceTest.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.light.classes.symbol.source -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesLoadingTest abstract class AbstractSymbolLightClassesLoadingForSourceTest : AbstractSymbolLightClassesLoadingTest( - FirFrontendApiTestConfiguratorService, + FirAnalysisApiTestConfiguratorService, EXTENSIONS.FIR_JAVA, stopIfCompilationErrorDirectivePresent = false ) \ No newline at end of file diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/dsl.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/dsl.kt index 108cad1c353..aff2bc4eec6 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/dsl.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/dsl.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.generators.tests.analysis.api.dsl -import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.binary.LibraryFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source.LibrarySourceFrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10AnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.FirAnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.binary.LibraryAnalysisApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source.LibrarySourceAnalysisApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.standalone.StandaloneModeConfiguratorService import org.jetbrains.kotlin.generators.TestGroup @@ -144,13 +144,13 @@ internal fun createConfigurator( moduleKind: TestModuleKind ): KClass = when (frontend) { Frontend.FIR -> when (moduleKind) { - TestModuleKind.SOURCE -> FirFrontendApiTestConfiguratorService::class - TestModuleKind.LIBRARY -> LibraryFrontendApiTestConfiguratorService::class - TestModuleKind.LIBRARY_SOURCE -> LibrarySourceFrontendApiTestConfiguratorService::class + TestModuleKind.SOURCE -> FirAnalysisApiTestConfiguratorService::class + TestModuleKind.LIBRARY -> LibraryAnalysisApiTestConfiguratorService::class + TestModuleKind.LIBRARY_SOURCE -> LibrarySourceAnalysisApiTestConfiguratorService::class TestModuleKind.STANDALONE_MODE -> StandaloneModeConfiguratorService::class } Frontend.FE10 -> when (moduleKind) { - TestModuleKind.SOURCE -> KtFe10FrontendApiTestConfiguratorService::class + TestModuleKind.SOURCE -> KtFe10AnalysisApiTestConfiguratorService::class TestModuleKind.LIBRARY -> TODO("TestModuleKind.LIBRARY is unsupported for fe10") TestModuleKind.LIBRARY_SOURCE -> TODO("TestModuleKind.LIBRARY_SOURCE is unsupported for fe10") TestModuleKind.STANDALONE_MODE -> TODO("TestModuleKind.STANDALONE_MODE is unsupported for fe10")