From f62bdf582679cececcf5c05469ceec73a635d59e Mon Sep 17 00:00:00 2001 From: Mark Punzalan Date: Mon, 31 Jan 2022 17:58:14 +0000 Subject: [PATCH] Analysis API: Move AbstractResolveCallTest from `fir` to `components` package. --- .../{fir => components}/Fe10ResolveCallTestGenerated.java | 4 ++-- .../fir/{fir => components}/FirResolveCallTestGenerated.java | 4 ++-- .../base/test/{fir => components}/AbstractResolveCallTest.kt | 2 +- .../kotlin/generators/tests/analysis/api/analysisApi.kt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/{fir => components}/Fe10ResolveCallTestGenerated.java (99%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/{fir => components}/FirResolveCallTestGenerated.java (99%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/{fir => components}/AbstractResolveCallTest.kt (99%) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/fir/Fe10ResolveCallTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java similarity index 99% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/fir/Fe10ResolveCallTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java index f78a48f1703..96d3e11d4a3 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/fir/Fe10ResolveCallTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java @@ -3,14 +3,14 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fe10.fir; +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.api.impl.barebone.test.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.impl.base.test.fir.AbstractResolveCallTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/fir/FirResolveCallTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java similarity index 99% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/fir/FirResolveCallTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java index ce38c92df80..477c8df3b5d 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/fir/FirResolveCallTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java @@ -3,14 +3,14 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.fir.fir; +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.api.impl.barebone.test.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; -import org.jetbrains.kotlin.analysis.api.impl.base.test.fir.AbstractResolveCallTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt similarity index 99% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt index 2da19f4f1e2..77869499baa 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.fir +package org.jetbrains.kotlin.analysis.api.impl.base.test.components import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.KtAnalysisSession diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt index 06bca73d14f..c3daad46d3c 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolve import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnFilesTest import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest @@ -28,7 +29,6 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.A import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractFunctionClassKindTest import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest -import org.jetbrains.kotlin.analysis.api.impl.base.test.fir.AbstractResolveCallTest import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractDelegateMemberScopeTest import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest