From 78685e93d128a4681d8305be41d468c94e95ac7f Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 4 Apr 2022 16:40:47 +0200 Subject: [PATCH] [analysis api, tests] move resolve call tests to separate package --- ...eNormalAnalysisSourceModuleResolveCallTestGenerated.java | 4 ++-- ...lAnalysisSourceModuleResolveCandidatesTestGenerated.java | 4 ++-- ...eNormalAnalysisSourceModuleResolveCallTestGenerated.java | 4 ++-- ...lAnalysisSourceModuleResolveCandidatesTestGenerated.java | 4 ++-- .../{ => callResolver}/AbstractResolveCallTest.kt | 5 +++-- .../{ => callResolver}/AbstractResolveCandidatesTest.kt | 6 ++++-- .../kotlin/generators/tests/analysis/api/analysisApi.kt | 4 ++-- 7 files changed, 17 insertions(+), 14 deletions(-) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/{ => callResolver}/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java (99%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/{ => callResolver}/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java (99%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/{ => callResolver}/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java (99%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/{ => callResolver}/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java (99%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/{ => callResolver}/AbstractResolveCallTest.kt (92%) rename analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/{ => callResolver}/AbstractResolveCandidatesTest.kt (91%) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/callResolver/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java similarity index 99% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/callResolver/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java index 51e25f5b313..7c6b4f148ae 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/callResolver/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java @@ -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.fe10.test.cases.generated.components; +package org.jetbrains.kotlin.analysis.api.fe10.test.cases.generated.components.callResolver; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.callResolver.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-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/callResolver/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java similarity index 99% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/callResolver/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java index 17386bb3540..205ccb932b6 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/components/callResolver/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java @@ -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.fe10.test.cases.generated.components; +package org.jetbrains.kotlin.analysis.api.fe10.test.cases.generated.components.callResolver; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.callResolver.AbstractResolveCandidatesTest; 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/test/cases/generated/components/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/callResolver/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java similarity index 99% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/callResolver/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java index 1be04f0accc..3dcd3e9ff12 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/callResolver/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java @@ -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.fir.test.cases.generated.components; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.components.callResolver; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.callResolver.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/test/cases/generated/components/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/callResolver/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java similarity index 99% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/callResolver/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java index 56098ecec4b..8fe85e28233 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/components/callResolver/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java @@ -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.fir.test.cases.generated.components; +package org.jetbrains.kotlin.analysis.api.fir.test.cases.generated.components.callResolver; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModul import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest; +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.callResolver.AbstractResolveCandidatesTest; 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/components/AbstractResolveCallTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/callResolver/AbstractResolveCallTest.kt similarity index 92% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/callResolver/AbstractResolveCallTest.kt index ba7313b3243..34dbb48bc01 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/callResolver/AbstractResolveCallTest.kt @@ -1,13 +1,14 @@ /* - * 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. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.components +package org.jetbrains.kotlin.analysis.api.impl.base.test.components.callResolver 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.api.impl.base.test.components.stringRepresentation import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.* 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/callResolver/AbstractResolveCandidatesTest.kt similarity index 91% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt rename to analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/callResolver/AbstractResolveCandidatesTest.kt index c5dbd814828..e29c595f9b2 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/callResolver/AbstractResolveCandidatesTest.kt @@ -1,13 +1,15 @@ /* - * 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. */ -package org.jetbrains.kotlin.analysis.api.impl.base.test.components +package org.jetbrains.kotlin.analysis.api.impl.base.test.components.callResolver 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.api.impl.base.test.components.compareCalls +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.stringRepresentation import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.* 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 abc28822d54..3faa6677c96 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,8 +13,8 @@ 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.AbstractResolveCandidatesTest +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.callResolver.AbstractResolveCallTest +import org.jetbrains.kotlin.analysis.api.impl.base.test.components.callResolver.AbstractResolveCandidatesTest 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