From 7f6afcabf1d480e30b406113c5aa0adcc514e491 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 17 Nov 2021 19:32:02 +0100 Subject: [PATCH] Analysis API: regenerate tests --- .../KtFe10ResolveCallTestGenerated.java | 156 +++++++++--------- ...ileTimeConstantEvaluatorTestGenerated.java | 40 ++--- .../KtFe10WhenMissingCasesTestGenerated.java | 34 ++-- ...10ExpectedExpressionTypeTestGenerated.java | 80 ++++----- .../KtFe10HLExpressionTypeTestGenerated.java | 54 +++--- .../KtFe10HLSmartCastInfoTestGenerated.java | 22 +-- ...iddenDeclarationProviderTestGenerated.java | 28 ++-- .../KtFe10RendererTestGenerated.java | 62 +++---- .../KtFe10HasCommonSubtypeTestGenerated.java | 16 +- .../FirResolveCallTestGenerated.java | 156 +++++++++--------- ...ileTimeConstantEvaluatorTestGenerated.java | 40 ++--- .../FirWhenMissingCasesTestGenerated.java | 34 ++-- ...irExpectedExpressionTypeTestGenerated.java | 80 ++++----- .../FirHLExpressionTypeTestGenerated.java | 54 +++--- .../HLImportOptimizerTestGenerated.java | 42 ++--- ...xpressionPsiTypeProviderTestGenerated.java | 10 +- .../PsiTypeProviderTestGenerated.java | 22 +-- .../FirHLSmartCastInfoTestGenerated.java | 22 +-- ...iddenDeclarationProviderTestGenerated.java | 28 ++-- .../FirRendererTestGenerated.java | 62 +++---- .../FirFunctionClassKindTestGenerated.java | 14 +- .../FirGetSuperTypesTestGenerated.java | 36 ++-- .../FirHasCommonSubtypeTestGenerated.java | 16 +- 23 files changed, 554 insertions(+), 554 deletions(-) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/{ => components/callResolver}/KtFe10ResolveCallTestGenerated.java (55%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/{symbols => components/compileTimeConstantProvider}/KtFe10CompileTimeConstantEvaluatorTestGenerated.java (75%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/{ => expressionInfoProvider}/KtFe10WhenMissingCasesTestGenerated.java (57%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/{ => expressionTypeProvider}/KtFe10ExpectedExpressionTypeTestGenerated.java (53%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/{ => expressionTypeProvider}/KtFe10HLExpressionTypeTestGenerated.java (78%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/{ => smartCastProvider}/KtFe10HLSmartCastInfoTestGenerated.java (81%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/{ => symbolDeclarationOverridesProvider}/KtFe10OverriddenDeclarationProviderTestGenerated.java (55%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/{ => symbolDeclarationRenderer}/KtFe10RendererTestGenerated.java (51%) rename analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/{ => typeProvider}/KtFe10HasCommonSubtypeTestGenerated.java (65%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => callResolver}/FirResolveCallTestGenerated.java (55%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => compileTimeConstantProvider}/FirCompileTimeConstantEvaluatorTestGenerated.java (75%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => expressionInfoProvider}/FirWhenMissingCasesTestGenerated.java (56%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => expressionTypeProvider}/FirExpectedExpressionTypeTestGenerated.java (52%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => expressionTypeProvider}/FirHLExpressionTypeTestGenerated.java (77%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => importOptimizer}/HLImportOptimizerTestGenerated.java (75%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => psiTypeProvider}/ExpressionPsiTypeProviderTestGenerated.java (68%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => psiTypeProvider}/PsiTypeProviderTestGenerated.java (75%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => smartCastProvider}/FirHLSmartCastInfoTestGenerated.java (79%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => symbolDeclarationOverridesProvider}/FirOverriddenDeclarationProviderTestGenerated.java (54%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => symbolDeclarationRenderer}/FirRendererTestGenerated.java (50%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => typeInfoProvider}/FirFunctionClassKindTestGenerated.java (66%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => typeProvider}/FirGetSuperTypesTestGenerated.java (56%) rename analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/{ => typeProvider}/FirHasCommonSubtypeTestGenerated.java (63%) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10ResolveCallTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/callResolver/KtFe10ResolveCallTestGenerated.java similarity index 55% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10ResolveCallTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/callResolver/KtFe10ResolveCallTestGenerated.java index 312b950ea1a..891d4355905 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10ResolveCallTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/callResolver/KtFe10ResolveCallTestGenerated.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.descriptors.test; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.callResolver; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,461 +16,461 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/analysisSession/resolveCall") +@TestMetadata("analysis/analysis-api/testData/components/callResolver/resolveCall") @TestDataPath("$PROJECT_ROOT") public class KtFe10ResolveCallTestGenerated extends AbstractKtFe10ResolveCallTest { @Test public void testAllFilesPresentInResolveCall() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/analysisSession/resolveCall"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/callResolver/resolveCall"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("annotationEntry.kt") public void testAnnotationEntry() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationEntry.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.kt"); } @Test @TestMetadata("annotationInAnnotation_arrayOf.kt") public void testAnnotationInAnnotation_arrayOf() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_arrayOf.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.kt"); } @Test @TestMetadata("annotationInAnnotation_collectionLiteral.kt") public void testAnnotationInAnnotation_collectionLiteral() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_collectionLiteral.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.kt"); } @Test @TestMetadata("annotationInAnnotation_multipleAnnotations_arrayOf.kt") public void testAnnotationInAnnotation_multipleAnnotations_arrayOf() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.kt"); } @Test @TestMetadata("annotationInAnnotation_multipleAnnotations_collectionLiteral.kt") public void testAnnotationInAnnotation_multipleAnnotations_collectionLiteral() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.kt"); } @Test @TestMetadata("annotationInAnnotation_noarg.kt") public void testAnnotationInAnnotation_noarg() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_noarg.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.kt"); } @Test @TestMetadata("annotationInAnnotation_vararg.kt") public void testAnnotationInAnnotation_vararg() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_vararg.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.kt"); } @Test @TestMetadata("annotationOnDelegate.kt") public void testAnnotationOnDelegate() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnDelegate.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.kt"); } @Test @TestMetadata("annotationOnExpression_asT.kt") public void testAnnotationOnExpression_asT() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnExpression_asT.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.kt"); } @Test @TestMetadata("annotationOnExpression_destructuring.kt") public void testAnnotationOnExpression_destructuring() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnExpression_destructuring.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.kt"); } @Test @TestMetadata("annotationOnExpression_if.kt") public void testAnnotationOnExpression_if() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnExpression_if.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.kt"); } @Test @TestMetadata("annotationOnExpression_whenBranch.kt") public void testAnnotationOnExpression_whenBranch() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnExpression_whenBranch.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.kt"); } @Test @TestMetadata("annotationOnFile.kt") public void testAnnotationOnFile() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnFile.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.kt"); } @Test @TestMetadata("annotationOnParameter_param.kt") public void testAnnotationOnParameter_param() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnParameter_param.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.kt"); } @Test @TestMetadata("annotationOnParameter_parameterProperty.kt") public void testAnnotationOnParameter_parameterProperty() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnParameter_parameterProperty.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.kt"); } @Test @TestMetadata("annotationOnParameter_reified.kt") public void testAnnotationOnParameter_reified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnParameter_reified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.kt"); } @Test @TestMetadata("annotationOnParameter_setparam.kt") public void testAnnotationOnParameter_setparam() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnParameter_setparam.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.kt"); } @Test @TestMetadata("annotationOnProperty_field.kt") public void testAnnotationOnProperty_field() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnProperty_field.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.kt"); } @Test @TestMetadata("annotationOnProperty_get.kt") public void testAnnotationOnProperty_get() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnProperty_get.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.kt"); } @Test @TestMetadata("annotationOnProperty_property.kt") public void testAnnotationOnProperty_property() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnProperty_property.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.kt"); } @Test @TestMetadata("annotationOnProperty_set.kt") public void testAnnotationOnProperty_set() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnProperty_set.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.kt"); } @Test @TestMetadata("annotationOnReceiver.kt") public void testAnnotationOnReceiver() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnReceiver.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.kt"); } @Test @TestMetadata("arrayOfInAnnotation.kt") public void testArrayOfInAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/arrayOfInAnnotation.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.kt"); } @Test @TestMetadata("delegatedConstructorCall_super.kt") public void testDelegatedConstructorCall_super() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/delegatedConstructorCall_super.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.kt"); } @Test @TestMetadata("delegatedConstructorCall_super_unresolved.kt") public void testDelegatedConstructorCall_super_unresolved() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/delegatedConstructorCall_super_unresolved.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.kt"); } @Test @TestMetadata("delegatedConstructorCall_this.kt") public void testDelegatedConstructorCall_this() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/delegatedConstructorCall_this.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.kt"); } @Test @TestMetadata("delegatedConstructorCall_this_unresolved.kt") public void testDelegatedConstructorCall_this_unresolved() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/delegatedConstructorCall_this_unresolved.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.kt"); } @Test @TestMetadata("enumAsAnnotationValue.kt") public void testEnumAsAnnotationValue() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/enumAsAnnotationValue.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.kt"); } @Test @TestMetadata("functionCallInTheSameFile.kt") public void testFunctionCallInTheSameFile() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallInTheSameFile.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.kt"); } @Test @TestMetadata("functionCallWithExtensionReceiverAndTypeArgument.kt") public void testFunctionCallWithExtensionReceiverAndTypeArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.kt"); } @Test @TestMetadata("functionCallWithLambdaArgument.kt") public void testFunctionCallWithLambdaArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithLambdaArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.kt"); } @Test @TestMetadata("functionCallWithNamedArgument.kt") public void testFunctionCallWithNamedArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithNamedArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.kt"); } @Test @TestMetadata("functionCallWithNonTrailingLambdaArgument.kt") public void testFunctionCallWithNonTrailingLambdaArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithNonTrailingLambdaArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.kt"); } @Test @TestMetadata("functionCallWithSpreadArgument.kt") public void testFunctionCallWithSpreadArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithSpreadArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.kt"); } @Test @TestMetadata("functionCallWithTypeArgument.kt") public void testFunctionCallWithTypeArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithTypeArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.kt"); } @Test @TestMetadata("functionCallWithVarargArgument.kt") public void testFunctionCallWithVarargArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithVarargArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.kt"); } @Test @TestMetadata("functionWithReceiverCall.kt") public void testFunctionWithReceiverCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionWithReceiverCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.kt"); } @Test @TestMetadata("functionWithReceiverSafeCall.kt") public void testFunctionWithReceiverSafeCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionWithReceiverSafeCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.kt"); } @Test @TestMetadata("implicitConstructorDelegationCall.kt") public void testImplicitConstructorDelegationCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/implicitConstructorDelegationCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.kt"); } @Test @TestMetadata("implicitConstuctorCall.kt") public void testImplicitConstuctorCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/implicitConstuctorCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.kt"); } @Test @TestMetadata("implicitJavaConstuctorCall.kt") public void testImplicitJavaConstuctorCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/implicitJavaConstuctorCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.kt"); } @Test @TestMetadata("indexedGet.kt") public void testIndexedGet() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedGet.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.kt"); } @Test @TestMetadata("indexedGetWithNotEnoughArgs.kt") public void testIndexedGetWithNotEnoughArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedGetWithNotEnoughArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.kt"); } @Test @TestMetadata("indexedGetWithTooManyArgs.kt") public void testIndexedGetWithTooManyArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedGetWithTooManyArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.kt"); } @Test @TestMetadata("indexedSet.kt") public void testIndexedSet() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedSet.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.kt"); } @Test @TestMetadata("indexedSetWithNotEnoughArgs.kt") public void testIndexedSetWithNotEnoughArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedSetWithNotEnoughArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.kt"); } @Test @TestMetadata("indexedSetWithTooManyArgs.kt") public void testIndexedSetWithTooManyArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedSetWithTooManyArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.kt"); } @Test @TestMetadata("intArrayOfInAnnotation.kt") public void testIntArrayOfInAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/intArrayOfInAnnotation.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.kt"); } @Test @TestMetadata("javaFunctionCall.kt") public void testJavaFunctionCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaFunctionCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.kt"); } @Test @TestMetadata("javaPropertyGetter.kt") public void testJavaPropertyGetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertyGetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.kt"); } @Test @TestMetadata("javaPropertyGetter_unqualified.kt") public void testJavaPropertyGetter_unqualified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertyGetter_unqualified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.kt"); } @Test @TestMetadata("javaPropertyNestedGetter.kt") public void testJavaPropertyNestedGetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertyNestedGetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.kt"); } @Test @TestMetadata("javaPropertySetter.kt") public void testJavaPropertySetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertySetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.kt"); } @Test @TestMetadata("javaPropertySetterIncomplete.kt") public void testJavaPropertySetterIncomplete() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertySetterIncomplete.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.kt"); } @Test @TestMetadata("javaPropertySetter_unqualified.kt") public void testJavaPropertySetter_unqualified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertySetter_unqualified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.kt"); } @Test @TestMetadata("kotlinPropertyGetter.kt") public void testKotlinPropertyGetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertyGetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.kt"); } @Test @TestMetadata("kotlinPropertyGetter_unqualified.kt") public void testKotlinPropertyGetter_unqualified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertyGetter_unqualified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.kt"); } @Test @TestMetadata("kotlinPropertyNestedGetter.kt") public void testKotlinPropertyNestedGetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertyNestedGetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.kt"); } @Test @TestMetadata("kotlinPropertySetter.kt") public void testKotlinPropertySetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertySetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.kt"); } @Test @TestMetadata("kotlinPropertySetter_unqualified.kt") public void testKotlinPropertySetter_unqualified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertySetter_unqualified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.kt"); } @Test @TestMetadata("memberFunctionCallWithTypeArgument.kt") public void testMemberFunctionCallWithTypeArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/memberFunctionCallWithTypeArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.kt"); } @Test @TestMetadata("resolveCallInSuperConstructorParam.kt") public void testResolveCallInSuperConstructorParam() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.kt"); } @Test @TestMetadata("samConstructorCall.kt") public void testSamConstructorCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.kt"); } @Test @TestMetadata("simpleCallWithNonMatchingArgs.kt") public void testSimpleCallWithNonMatchingArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/simpleCallWithNonMatchingArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.kt"); } @Test @TestMetadata("unresolvedSuperReference.kt") public void testUnresolvedSuperReference() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/unresolvedSuperReference.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/unresolvedSuperReference.kt"); } @Test @TestMetadata("variableAsFunction.kt") public void testVariableAsFunction() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunction.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.kt"); } @Test @TestMetadata("variableAsFunctionLikeCall.kt") public void testVariableAsFunctionLikeCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionLikeCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterName.kt") public void testVariableAsFunctionWithParameterName() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterName.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameAnnotation.kt") public void testVariableAsFunctionWithParameterNameAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameAnnotation.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameAnnotationConflict.kt") public void testVariableAsFunctionWithParameterNameAnnotationConflict() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameGeneric.kt") public void testVariableAsFunctionWithParameterNameGeneric() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameGeneric.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameInNonFunctionType.kt") public void testVariableAsFunctionWithParameterNameInNonFunctionType() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameMixed.kt") public void testVariableAsFunctionWithParameterNameMixed() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameMixed.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.kt"); } @Test @TestMetadata("variableWithExtensionInvoke.kt") public void testVariableWithExtensionInvoke() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableWithExtensionInvoke.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.kt"); } @Test @TestMetadata("variableWithMemberInvoke.kt") public void testVariableWithMemberInvoke() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableWithMemberInvoke.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.kt"); } } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/KtFe10CompileTimeConstantEvaluatorTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/compileTimeConstantProvider/KtFe10CompileTimeConstantEvaluatorTestGenerated.java similarity index 75% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/KtFe10CompileTimeConstantEvaluatorTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/compileTimeConstantProvider/KtFe10CompileTimeConstantEvaluatorTestGenerated.java index 8d58b5bcf7d..3b559524157 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/KtFe10CompileTimeConstantEvaluatorTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/compileTimeConstantProvider/KtFe10CompileTimeConstantEvaluatorTestGenerated.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.descriptors.test.symbols; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.compileTimeConstantProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,107 +16,107 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantEvaluator") +@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate") @TestDataPath("$PROJECT_ROOT") public class KtFe10CompileTimeConstantEvaluatorTestGenerated extends AbstractKtFe10CompileTimeConstantEvaluatorTest { @Test - public void testAllFilesPresentInCompileTimeConstantEvaluator() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantEvaluator"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInEvaluate() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("annotationInAnnotation_arrayOf.kt") public void testAnnotationInAnnotation_arrayOf() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_arrayOf.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_arrayOf.kt"); } @Test @TestMetadata("annotationInAnnotation_collectionLiteral.kt") public void testAnnotationInAnnotation_collectionLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_collectionLiteral.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_collectionLiteral.kt"); } @Test @TestMetadata("annotationInAnnotation_collectionLiteral_spread.kt") public void testAnnotationInAnnotation_collectionLiteral_spread() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_collectionLiteral_spread.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_collectionLiteral_spread.kt"); } @Test @TestMetadata("annotationInAnnotation_multipleAnnotations_arrayOf.kt") public void testAnnotationInAnnotation_multipleAnnotations_arrayOf() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_multipleAnnotations_arrayOf.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_multipleAnnotations_arrayOf.kt"); } @Test @TestMetadata("annotationInAnnotation_multipleAnnotations_collectionLiteral.kt") public void testAnnotationInAnnotation_multipleAnnotations_collectionLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_multipleAnnotations_collectionLiteral.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_multipleAnnotations_collectionLiteral.kt"); } @Test @TestMetadata("annotationInAnnotation_single.kt") public void testAnnotationInAnnotation_single() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_single.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_single.kt"); } @Test @TestMetadata("annotationInAnnotation_vararg.kt") public void testAnnotationInAnnotation_vararg() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_vararg.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_vararg.kt"); } @Test @TestMetadata("enumAsAnnotationValue.kt") public void testEnumAsAnnotationValue() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/enumAsAnnotationValue.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/enumAsAnnotationValue.kt"); } @Test @TestMetadata("propertyInit_Byte.kt") public void testPropertyInit_Byte() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Byte.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.kt"); } @Test @TestMetadata("propertyInit_DivByZero.kt") public void testPropertyInit_DivByZero() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_DivByZero.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.kt"); } @Test @TestMetadata("propertyInit_Double.kt") public void testPropertyInit_Double() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Double.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.kt"); } @Test @TestMetadata("propertyInit_Float.kt") public void testPropertyInit_Float() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Float.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.kt"); } @Test @TestMetadata("propertyInit_Int.kt") public void testPropertyInit_Int() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Int.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.kt"); } @Test @TestMetadata("propertyInit_Long.kt") public void testPropertyInit_Long() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Long.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.kt"); } @Test @TestMetadata("propertyInit_UInt.kt") public void testPropertyInit_UInt() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_UInt.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.kt"); } @Test @TestMetadata("stringLiteral.kt") public void testStringLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/stringLiteral.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.kt"); } } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10WhenMissingCasesTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionInfoProvider/KtFe10WhenMissingCasesTestGenerated.java similarity index 57% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10WhenMissingCasesTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionInfoProvider/KtFe10WhenMissingCasesTestGenerated.java index 4c891e48378..002293d77a2 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10WhenMissingCasesTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionInfoProvider/KtFe10WhenMissingCasesTestGenerated.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.descriptors.test.components; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.expressionInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,95 +16,95 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/whenMissingCases") +@TestMetadata("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases") @TestDataPath("$PROJECT_ROOT") public class KtFe10WhenMissingCasesTestGenerated extends AbstractKtFe10WhenMissingCasesTest { @Test public void testAllFilesPresentInWhenMissingCases() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/whenMissingCases"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("boolean_else.kt") public void testBoolean_else() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/boolean_else.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/boolean_else.kt"); } @Test @TestMetadata("boolean_empty.kt") public void testBoolean_empty() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/boolean_empty.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/boolean_empty.kt"); } @Test @TestMetadata("boolean_partial.kt") public void testBoolean_partial() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/boolean_partial.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/boolean_partial.kt"); } @Test @TestMetadata("enum_else.kt") public void testEnum_else() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/enum_else.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/enum_else.kt"); } @Test @TestMetadata("enum_empty.kt") public void testEnum_empty() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/enum_empty.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/enum_empty.kt"); } @Test @TestMetadata("enum_partial.kt") public void testEnum_partial() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/enum_partial.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/enum_partial.kt"); } @Test @TestMetadata("nothing.kt") public void testNothing() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nothing.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nothing.kt"); } @Test @TestMetadata("nullableBoolean.kt") public void testNullableBoolean() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nullableBoolean.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nullableBoolean.kt"); } @Test @TestMetadata("nullableEnum.kt") public void testNullableEnum() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nullableEnum.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nullableEnum.kt"); } @Test @TestMetadata("nullableNothing.kt") public void testNullableNothing() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nullableNothing.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nullableNothing.kt"); } @Test @TestMetadata("nullableSealedClass_empty.kt") public void testNullableSealedClass_empty() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nullableSealedClass_empty.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nullableSealedClass_empty.kt"); } @Test @TestMetadata("sealedClass_else.kt") public void testSealedClass_else() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/sealedClass_else.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/sealedClass_else.kt"); } @Test @TestMetadata("sealedClass_empty.kt") public void testSealedClass_empty() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/sealedClass_empty.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/sealedClass_empty.kt"); } @Test @TestMetadata("sealedClass_partial.kt") public void testSealedClass_partial() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/sealedClass_partial.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/sealedClass_partial.kt"); } } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10ExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionTypeProvider/KtFe10ExpectedExpressionTypeTestGenerated.java similarity index 53% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10ExpectedExpressionTypeTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionTypeProvider/KtFe10ExpectedExpressionTypeTestGenerated.java index cd04f6075b7..24a2c21e197 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10ExpectedExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionTypeProvider/KtFe10ExpectedExpressionTypeTestGenerated.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.descriptors.test.components; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,233 +16,233 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/expectedExpressionType") +@TestMetadata("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType") @TestDataPath("$PROJECT_ROOT") public class KtFe10ExpectedExpressionTypeTestGenerated extends AbstractKtFe10ExpectedExpressionTypeTest { @Test public void testAllFilesPresentInExpectedExpressionType() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expectedExpressionType"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("functionExpressionBody.kt") public void testFunctionExpressionBody() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBody.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBody.kt"); } @Test @TestMetadata("functionExpressionBodyBlockExpression.kt") public void testFunctionExpressionBodyBlockExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyBlockExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyBlockExpression.kt"); } @Test @TestMetadata("functionExpressionBodyQualified.kt") public void testFunctionExpressionBodyQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyQualified.kt"); } @Test @TestMetadata("functionExpressionBodyWithTypeFromRHS.kt") public void testFunctionExpressionBodyWithTypeFromRHS() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyWithTypeFromRHS.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyWithTypeFromRHS.kt"); } @Test @TestMetadata("functionExpressionBodyWithoutExplicitType.kt") public void testFunctionExpressionBodyWithoutExplicitType() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyWithoutExplicitType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyWithoutExplicitType.kt"); } @Test @TestMetadata("functionLambdaParam.kt") public void testFunctionLambdaParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionLambdaParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionLambdaParam.kt"); } @Test @TestMetadata("functionNamedlParam.kt") public void testFunctionNamedlParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionNamedlParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionNamedlParam.kt"); } @Test @TestMetadata("functionParamWithTypeParam.kt") public void testFunctionParamWithTypeParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionParamWithTypeParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionParamWithTypeParam.kt"); } @Test @TestMetadata("functionPositionalParam.kt") public void testFunctionPositionalParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionPositionalParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParam.kt"); } @Test @TestMetadata("functionPositionalParamQualified.kt") public void testFunctionPositionalParamQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionPositionalParamQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.kt"); } @Test @TestMetadata("ifCondition.kt") public void testIfCondition() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/ifCondition.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/ifCondition.kt"); } @Test @TestMetadata("ifConditionQualified.kt") public void testIfConditionQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/ifConditionQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/ifConditionQualified.kt"); } @Test @TestMetadata("infixFunctionAsRegularCallParam.kt") public void testInfixFunctionAsRegularCallParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/infixFunctionAsRegularCallParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionAsRegularCallParam.kt"); } @Test @TestMetadata("infixFunctionParam.kt") public void testInfixFunctionParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/infixFunctionParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionParam.kt"); } @Test @TestMetadata("infixFunctionParamQualified.kt") public void testInfixFunctionParamQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/infixFunctionParamQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionParamQualified.kt"); } @Test @TestMetadata("lambdaWithExplicitTypeFromVariable.kt") public void testLambdaWithExplicitTypeFromVariable() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/lambdaWithExplicitTypeFromVariable.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/lambdaWithExplicitTypeFromVariable.kt"); } @Test @TestMetadata("lambdaWithoutReturnNorExplicitType.kt") public void testLambdaWithoutReturnNorExplicitType() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/lambdaWithoutReturnNorExplicitType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/lambdaWithoutReturnNorExplicitType.kt"); } @Test @TestMetadata("propertyDeclaration.kt") public void testPropertyDeclaration() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclaration.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclaration.kt"); } @Test @TestMetadata("propertyDeclarationQualified.kt") public void testPropertyDeclarationQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationQualified.kt"); } @Test @TestMetadata("propertyDeclarationWithSafeCast.kt") public void testPropertyDeclarationWithSafeCast() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithSafeCast.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithSafeCast.kt"); } @Test @TestMetadata("propertyDeclarationWithTypeCast.kt") public void testPropertyDeclarationWithTypeCast() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithTypeCast.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithTypeCast.kt"); } @Test @TestMetadata("propertyDeclarationWithTypeFromRHS.kt") public void testPropertyDeclarationWithTypeFromRHS() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithTypeFromRHS.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithTypeFromRHS.kt"); } @Test @TestMetadata("propertyDeclarationWithoutExplicitType.kt") public void testPropertyDeclarationWithoutExplicitType() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithoutExplicitType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithoutExplicitType.kt"); } @Test @TestMetadata("returnFromFunction.kt") public void testReturnFromFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/returnFromFunction.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromFunction.kt"); } @Test @TestMetadata("returnFromFunctionQualifiedReceiver.kt") public void testReturnFromFunctionQualifiedReceiver() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/returnFromFunctionQualifiedReceiver.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromFunctionQualifiedReceiver.kt"); } @Test @TestMetadata("returnFromFunctionQualifiedSelector.kt") public void testReturnFromFunctionQualifiedSelector() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/returnFromFunctionQualifiedSelector.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromFunctionQualifiedSelector.kt"); } @Test @TestMetadata("returnFromLambda.kt") public void testReturnFromLambda() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/returnFromLambda.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromLambda.kt"); } @Test @TestMetadata("sam.kt") public void testSam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/sam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/sam.kt"); } @Test @TestMetadata("samAsArgument.kt") public void testSamAsArgument() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samAsArgument.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsArgument.kt"); } @Test @TestMetadata("samAsConstructorArgument.kt") public void testSamAsConstructorArgument() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samAsConstructorArgument.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.kt"); } @Test @TestMetadata("samAsReturn.kt") public void testSamAsReturn() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samAsReturn.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsReturn.kt"); } @Test @TestMetadata("samWithExplicitTypeFromProperty.kt") public void testSamWithExplicitTypeFromProperty() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samWithExplicitTypeFromProperty.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samWithExplicitTypeFromProperty.kt"); } @Test @TestMetadata("samWithTypeCast.kt") public void testSamWithTypeCast() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samWithTypeCast.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samWithTypeCast.kt"); } @Test @TestMetadata("variableAssignment.kt") public void testVariableAssignment() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/variableAssignment.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/variableAssignment.kt"); } @Test @TestMetadata("variableAssignmentQualified.kt") public void testVariableAssignmentQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/variableAssignmentQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/variableAssignmentQualified.kt"); } @Test @TestMetadata("whileCondition.kt") public void testWhileCondition() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/whileCondition.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/whileCondition.kt"); } @Test @TestMetadata("whileConditionQualified.kt") public void testWhileConditionQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/whileConditionQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/whileConditionQualified.kt"); } } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HLExpressionTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionTypeProvider/KtFe10HLExpressionTypeTestGenerated.java similarity index 78% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HLExpressionTypeTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionTypeProvider/KtFe10HLExpressionTypeTestGenerated.java index 8e3de5e674a..106397d5bee 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HLExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/expressionTypeProvider/KtFe10HLExpressionTypeTestGenerated.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.descriptors.test.components; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,155 +16,155 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/expressionType") +@TestMetadata("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType") @TestDataPath("$PROJECT_ROOT") public class KtFe10HLExpressionTypeTestGenerated extends AbstractKtFe10HLExpressionTypeTest { @Test public void testAllFilesPresentInExpressionType() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionType"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("arrayElement_arrayOfNulls.kt") public void testArrayElement_arrayOfNulls() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/arrayElement_arrayOfNulls.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/arrayElement_arrayOfNulls.kt"); } @Test @TestMetadata("array_arrayOfNulls.kt") public void testArray_arrayOfNulls() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/array_arrayOfNulls.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/array_arrayOfNulls.kt"); } @Test @TestMetadata("assignmentExpressionTarget.kt") public void testAssignmentExpressionTarget() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/assignmentExpressionTarget.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/assignmentExpressionTarget.kt"); } @Test @TestMetadata("binaryExpression.kt") public void testBinaryExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/binaryExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/binaryExpression.kt"); } @Test @TestMetadata("breakExpression.kt") public void testBreakExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/breakExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/breakExpression.kt"); } @Test @TestMetadata("forExpression.kt") public void testForExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/forExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/forExpression.kt"); } @Test @TestMetadata("functionCall.kt") public void testFunctionCall() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/functionCall.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/functionCall.kt"); } @Test @TestMetadata("inParens.kt") public void testInParens() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/inParens.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/inParens.kt"); } @Test @TestMetadata("insideStringTemplate.kt") public void testInsideStringTemplate() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/insideStringTemplate.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/insideStringTemplate.kt"); } @Test @TestMetadata("insideStringTemplateWithBinrary.kt") public void testInsideStringTemplateWithBinrary() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/insideStringTemplateWithBinrary.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/insideStringTemplateWithBinrary.kt"); } @Test @TestMetadata("intLiteral.kt") public void testIntLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/intLiteral.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/intLiteral.kt"); } @Test @TestMetadata("listElement_listOf.kt") public void testListElement_listOf() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/listElement_listOf.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/listElement_listOf.kt"); } @Test @TestMetadata("listElement_mutableListOf.kt") public void testListElement_mutableListOf() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/listElement_mutableListOf.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/listElement_mutableListOf.kt"); } @Test @TestMetadata("list_listOf.kt") public void testList_listOf() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/list_listOf.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/list_listOf.kt"); } @Test @TestMetadata("list_mutableListOf.kt") public void testList_mutableListOf() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/list_mutableListOf.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/list_mutableListOf.kt"); } @Test @TestMetadata("nonExpression.kt") public void testNonExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/nonExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/nonExpression.kt"); } @Test @TestMetadata("property.kt") public void testProperty() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/property.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/property.kt"); } @Test @TestMetadata("resolvedSuper.kt") public void testResolvedSuper() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/resolvedSuper.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/resolvedSuper.kt"); } @Test @TestMetadata("returnExpression.kt") public void testReturnExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/returnExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/returnExpression.kt"); } @Test @TestMetadata("stringLiteral.kt") public void testStringLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/stringLiteral.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/stringLiteral.kt"); } @Test @TestMetadata("unresolvedSuper_multipleSuperTypes.kt") public void testUnresolvedSuper_multipleSuperTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/unresolvedSuper_multipleSuperTypes.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_multipleSuperTypes.kt"); } @Test @TestMetadata("unresolvedSuper_noSuperType.kt") public void testUnresolvedSuper_noSuperType() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/unresolvedSuper_noSuperType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_noSuperType.kt"); } @Test @TestMetadata("unresolvedSuper_singleSuperType.kt") public void testUnresolvedSuper_singleSuperType() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/unresolvedSuper_singleSuperType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_singleSuperType.kt"); } @Test @TestMetadata("whileExpression.kt") public void testWhileExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/whileExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/whileExpression.kt"); } } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HLSmartCastInfoTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/smartCastProvider/KtFe10HLSmartCastInfoTestGenerated.java similarity index 81% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HLSmartCastInfoTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/smartCastProvider/KtFe10HLSmartCastInfoTestGenerated.java index ed386bf1950..8cc9306ccf9 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HLSmartCastInfoTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/smartCastProvider/KtFe10HLSmartCastInfoTestGenerated.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.descriptors.test.components; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.smartCastProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,59 +16,59 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/smartCastInfo") +@TestMetadata("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo") @TestDataPath("$PROJECT_ROOT") public class KtFe10HLSmartCastInfoTestGenerated extends AbstractKtFe10HLSmartCastInfoTest { @Test public void testAllFilesPresentInSmartCastInfo() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/smartCastInfo"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("multiSmartcastAsReceiver_stable.kt") public void testMultiSmartcastAsReceiver_stable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/multiSmartcastAsReceiver_stable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_stable.kt"); } @Test @TestMetadata("multiSmartcastAsReceiver_unstable.kt") public void testMultiSmartcastAsReceiver_unstable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/multiSmartcastAsReceiver_unstable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.kt"); } @Test @TestMetadata("multiSmartcast_stable.kt") public void testMultiSmartcast_stable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/multiSmartcast_stable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_stable.kt"); } @Test @TestMetadata("multiSmartcast_unstable.kt") public void testMultiSmartcast_unstable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/multiSmartcast_unstable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_unstable.kt"); } @Test @TestMetadata("smartcastAsReceiver_stable.kt") public void testSmartcastAsReceiver_stable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/smartcastAsReceiver_stable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/smartcastAsReceiver_stable.kt"); } @Test @TestMetadata("smartcastAsReceiver_unstable.kt") public void testSmartcastAsReceiver_unstable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/smartcastAsReceiver_unstable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/smartcastAsReceiver_unstable.kt"); } @Test @TestMetadata("smartcast_stable.kt") public void testSmartcast_stable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/smartcast_stable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/smartcast_stable.kt"); } @Test @TestMetadata("smartcast_unstable.kt") public void testSmartcast_unstable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/smartcast_unstable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/smartcast_unstable.kt"); } } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10OverriddenDeclarationProviderTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/symbolDeclarationOverridesProvider/KtFe10OverriddenDeclarationProviderTestGenerated.java similarity index 55% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10OverriddenDeclarationProviderTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/symbolDeclarationOverridesProvider/KtFe10OverriddenDeclarationProviderTestGenerated.java index bf43d54ec8c..19de6c56ade 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10OverriddenDeclarationProviderTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/symbolDeclarationOverridesProvider/KtFe10OverriddenDeclarationProviderTestGenerated.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.descriptors.test.components; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.symbolDeclarationOverridesProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,71 +16,71 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/overriddenDeclarations") +@TestMetadata("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols") @TestDataPath("$PROJECT_ROOT") public class KtFe10OverriddenDeclarationProviderTestGenerated extends AbstractKtFe10OverriddenDeclarationProviderTest { @Test - public void testAllFilesPresentInOverriddenDeclarations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/overriddenDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInOverriddenSymbols() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("backingField.kt") public void testBackingField() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/backingField.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/backingField.kt"); } @Test @TestMetadata("inAnonymousClass.kt") public void testInAnonymousClass() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inAnonymousClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/inAnonymousClass.kt"); } @Test @TestMetadata("inLocalClass.kt") public void testInLocalClass() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inLocalClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/inLocalClass.kt"); } @Test @TestMetadata("inOtherFile.kt") public void testInOtherFile() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inOtherFile.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/inOtherFile.kt"); } @Test @TestMetadata("intersectionOverride.kt") public void testIntersectionOverride() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/intersectionOverride.kt"); } @Test @TestMetadata("intersectionOverride2.kt") public void testIntersectionOverride2() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride2.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/intersectionOverride2.kt"); } @Test @TestMetadata("javaAccessors.kt") public void testJavaAccessors() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/javaAccessors.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/javaAccessors.kt"); } @Test @TestMetadata("multipleInterfaces.kt") public void testMultipleInterfaces() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/multipleInterfaces.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/multipleInterfaces.kt"); } @Test @TestMetadata("onEnumEntry.kt") public void testOnEnumEntry() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/onEnumEntry.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/onEnumEntry.kt"); } @Test @TestMetadata("sequenceOfOverrides.kt") public void testSequenceOfOverrides() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/sequenceOfOverrides.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/sequenceOfOverrides.kt"); } } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10RendererTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/symbolDeclarationRenderer/KtFe10RendererTestGenerated.java similarity index 51% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10RendererTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/symbolDeclarationRenderer/KtFe10RendererTestGenerated.java index a899f41549b..cde8d178256 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10RendererTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/symbolDeclarationRenderer/KtFe10RendererTestGenerated.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.descriptors.test.components; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.symbolDeclarationRenderer; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,173 +16,173 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/declarationRenderer") +@TestMetadata("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration") @TestDataPath("$PROJECT_ROOT") public class KtFe10RendererTestGenerated extends AbstractKtFe10RendererTest { @Test - public void testAllFilesPresentInDeclarationRenderer() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/declarationRenderer"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInRenderDeclaration() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/annotation.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.kt"); } @Test @TestMetadata("complexTypes.kt") public void testComplexTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/complexTypes.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/complexTypes.kt"); } @Test @TestMetadata("constructorInObject.kt") public void testConstructorInObject() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/constructorInObject.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.kt"); } @Test @TestMetadata("constructorOfAnonymousObject.kt") public void testConstructorOfAnonymousObject() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/constructorOfAnonymousObject.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorOfAnonymousObject.kt"); } @Test @TestMetadata("delegates.kt") public void testDelegates() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/delegates.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.kt"); } @Test @TestMetadata("derivedClass.kt") public void testDerivedClass() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/derivedClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.kt"); } @Test @TestMetadata("emptyAnonymousObject.kt") public void testEmptyAnonymousObject() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/emptyAnonymousObject.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/emptyAnonymousObject.kt"); } @Test @TestMetadata("enums.kt") public void testEnums() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/enums.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.kt"); } @Test @TestMetadata("enums2.kt") public void testEnums2() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/enums2.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.kt"); } @Test @TestMetadata("expectActual.kt") public void testExpectActual() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/expectActual.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/expectActual.kt"); } @Test @TestMetadata("F.kt") public void testF() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/F.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.kt"); } @Test @TestMetadata("functionTypes.kt") public void testFunctionTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/functionTypes.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/functionTypes.kt"); } @Test @TestMetadata("genericFunctions.kt") public void testGenericFunctions() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/genericFunctions.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericFunctions.kt"); } @Test @TestMetadata("genericProperty.kt") public void testGenericProperty() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/genericProperty.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.kt"); } @Test @TestMetadata("intersectionType.kt") public void testIntersectionType() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/intersectionType.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/intersectionType.kt"); } @Test @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/nestedClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.kt"); } @Test @TestMetadata("NestedOfAliasedType.kt") public void testNestedOfAliasedType() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/NestedOfAliasedType.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.kt"); } @Test @TestMetadata("NestedSuperType.kt") public void testNestedSuperType() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/NestedSuperType.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.kt"); } @Test @TestMetadata("noPrimaryConstructor.kt") public void testNoPrimaryConstructor() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/noPrimaryConstructor.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/noPrimaryConstructor.kt"); } @Test @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/simpleClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.kt"); } @Test @TestMetadata("simpleFun.kt") public void testSimpleFun() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/simpleFun.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleFun.kt"); } @Test @TestMetadata("simpleTypeAlias.kt") public void testSimpleTypeAlias() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/simpleTypeAlias.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.kt"); } @Test @TestMetadata("typeAliasWithGeneric.kt") public void testTypeAliasWithGeneric() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/typeAliasWithGeneric.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.kt"); } @Test @TestMetadata("typeParameterVsNested.kt") public void testTypeParameterVsNested() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/typeParameterVsNested.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.kt"); } @Test @TestMetadata("typeParameters.kt") public void testTypeParameters() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/typeParameters.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.kt"); } @Test @TestMetadata("vararg.kt") public void testVararg() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/vararg.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.kt"); } @Test @TestMetadata("where.kt") public void testWhere() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/where.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.kt"); } } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HasCommonSubtypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/typeProvider/KtFe10HasCommonSubtypeTestGenerated.java similarity index 65% rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HasCommonSubtypeTestGenerated.java rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/typeProvider/KtFe10HasCommonSubtypeTestGenerated.java index e106f7297f3..1e7b32dfb11 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/KtFe10HasCommonSubtypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/typeProvider/KtFe10HasCommonSubtypeTestGenerated.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.descriptors.test.components; +package org.jetbrains.kotlin.analysis.api.descriptors.test.components.typeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,35 +16,35 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/hasCommonSubtype") +@TestMetadata("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype") @TestDataPath("$PROJECT_ROOT") public class KtFe10HasCommonSubtypeTestGenerated extends AbstractKtFe10HasCommonSubtypeTest { @Test - public void testAllFilesPresentInHasCommonSubtype() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/hasCommonSubtype"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInHaveCommonSubtype() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("collections.kt") public void testCollections() throws Exception { - runTest("analysis/analysis-api/testData/components/hasCommonSubtype/collections.kt"); + runTest("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype/collections.kt"); } @Test @TestMetadata("dataClasses.kt") public void testDataClasses() throws Exception { - runTest("analysis/analysis-api/testData/components/hasCommonSubtype/dataClasses.kt"); + runTest("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype/dataClasses.kt"); } @Test @TestMetadata("enums.kt") public void testEnums() throws Exception { - runTest("analysis/analysis-api/testData/components/hasCommonSubtype/enums.kt"); + runTest("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype/enums.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("analysis/analysis-api/testData/components/hasCommonSubtype/simple.kt"); + runTest("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype/simple.kt"); } } 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/callResolver/FirResolveCallTestGenerated.java similarity index 55% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/callResolver/FirResolveCallTestGenerated.java index 40490d1c9b3..74adedd3290 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/callResolver/FirResolveCallTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.callResolver; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,461 +16,461 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/analysisSession/resolveCall") +@TestMetadata("analysis/analysis-api/testData/components/callResolver/resolveCall") @TestDataPath("$PROJECT_ROOT") public class FirResolveCallTestGenerated extends AbstractFirResolveCallTest { @Test public void testAllFilesPresentInResolveCall() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/analysisSession/resolveCall"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/callResolver/resolveCall"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("annotationEntry.kt") public void testAnnotationEntry() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationEntry.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.kt"); } @Test @TestMetadata("annotationInAnnotation_arrayOf.kt") public void testAnnotationInAnnotation_arrayOf() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_arrayOf.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.kt"); } @Test @TestMetadata("annotationInAnnotation_collectionLiteral.kt") public void testAnnotationInAnnotation_collectionLiteral() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_collectionLiteral.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.kt"); } @Test @TestMetadata("annotationInAnnotation_multipleAnnotations_arrayOf.kt") public void testAnnotationInAnnotation_multipleAnnotations_arrayOf() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.kt"); } @Test @TestMetadata("annotationInAnnotation_multipleAnnotations_collectionLiteral.kt") public void testAnnotationInAnnotation_multipleAnnotations_collectionLiteral() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.kt"); } @Test @TestMetadata("annotationInAnnotation_noarg.kt") public void testAnnotationInAnnotation_noarg() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_noarg.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.kt"); } @Test @TestMetadata("annotationInAnnotation_vararg.kt") public void testAnnotationInAnnotation_vararg() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationInAnnotation_vararg.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.kt"); } @Test @TestMetadata("annotationOnDelegate.kt") public void testAnnotationOnDelegate() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnDelegate.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.kt"); } @Test @TestMetadata("annotationOnExpression_asT.kt") public void testAnnotationOnExpression_asT() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnExpression_asT.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.kt"); } @Test @TestMetadata("annotationOnExpression_destructuring.kt") public void testAnnotationOnExpression_destructuring() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnExpression_destructuring.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.kt"); } @Test @TestMetadata("annotationOnExpression_if.kt") public void testAnnotationOnExpression_if() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnExpression_if.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.kt"); } @Test @TestMetadata("annotationOnExpression_whenBranch.kt") public void testAnnotationOnExpression_whenBranch() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnExpression_whenBranch.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.kt"); } @Test @TestMetadata("annotationOnFile.kt") public void testAnnotationOnFile() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnFile.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.kt"); } @Test @TestMetadata("annotationOnParameter_param.kt") public void testAnnotationOnParameter_param() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnParameter_param.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.kt"); } @Test @TestMetadata("annotationOnParameter_parameterProperty.kt") public void testAnnotationOnParameter_parameterProperty() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnParameter_parameterProperty.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.kt"); } @Test @TestMetadata("annotationOnParameter_reified.kt") public void testAnnotationOnParameter_reified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnParameter_reified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.kt"); } @Test @TestMetadata("annotationOnParameter_setparam.kt") public void testAnnotationOnParameter_setparam() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnParameter_setparam.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.kt"); } @Test @TestMetadata("annotationOnProperty_field.kt") public void testAnnotationOnProperty_field() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnProperty_field.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.kt"); } @Test @TestMetadata("annotationOnProperty_get.kt") public void testAnnotationOnProperty_get() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnProperty_get.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.kt"); } @Test @TestMetadata("annotationOnProperty_property.kt") public void testAnnotationOnProperty_property() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnProperty_property.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.kt"); } @Test @TestMetadata("annotationOnProperty_set.kt") public void testAnnotationOnProperty_set() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnProperty_set.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.kt"); } @Test @TestMetadata("annotationOnReceiver.kt") public void testAnnotationOnReceiver() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/annotationOnReceiver.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.kt"); } @Test @TestMetadata("arrayOfInAnnotation.kt") public void testArrayOfInAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/arrayOfInAnnotation.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.kt"); } @Test @TestMetadata("delegatedConstructorCall_super.kt") public void testDelegatedConstructorCall_super() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/delegatedConstructorCall_super.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.kt"); } @Test @TestMetadata("delegatedConstructorCall_super_unresolved.kt") public void testDelegatedConstructorCall_super_unresolved() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/delegatedConstructorCall_super_unresolved.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.kt"); } @Test @TestMetadata("delegatedConstructorCall_this.kt") public void testDelegatedConstructorCall_this() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/delegatedConstructorCall_this.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.kt"); } @Test @TestMetadata("delegatedConstructorCall_this_unresolved.kt") public void testDelegatedConstructorCall_this_unresolved() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/delegatedConstructorCall_this_unresolved.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.kt"); } @Test @TestMetadata("enumAsAnnotationValue.kt") public void testEnumAsAnnotationValue() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/enumAsAnnotationValue.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.kt"); } @Test @TestMetadata("functionCallInTheSameFile.kt") public void testFunctionCallInTheSameFile() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallInTheSameFile.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.kt"); } @Test @TestMetadata("functionCallWithExtensionReceiverAndTypeArgument.kt") public void testFunctionCallWithExtensionReceiverAndTypeArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.kt"); } @Test @TestMetadata("functionCallWithLambdaArgument.kt") public void testFunctionCallWithLambdaArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithLambdaArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.kt"); } @Test @TestMetadata("functionCallWithNamedArgument.kt") public void testFunctionCallWithNamedArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithNamedArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.kt"); } @Test @TestMetadata("functionCallWithNonTrailingLambdaArgument.kt") public void testFunctionCallWithNonTrailingLambdaArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithNonTrailingLambdaArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.kt"); } @Test @TestMetadata("functionCallWithSpreadArgument.kt") public void testFunctionCallWithSpreadArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithSpreadArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.kt"); } @Test @TestMetadata("functionCallWithTypeArgument.kt") public void testFunctionCallWithTypeArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithTypeArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.kt"); } @Test @TestMetadata("functionCallWithVarargArgument.kt") public void testFunctionCallWithVarargArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionCallWithVarargArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.kt"); } @Test @TestMetadata("functionWithReceiverCall.kt") public void testFunctionWithReceiverCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionWithReceiverCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.kt"); } @Test @TestMetadata("functionWithReceiverSafeCall.kt") public void testFunctionWithReceiverSafeCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/functionWithReceiverSafeCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.kt"); } @Test @TestMetadata("implicitConstructorDelegationCall.kt") public void testImplicitConstructorDelegationCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/implicitConstructorDelegationCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.kt"); } @Test @TestMetadata("implicitConstuctorCall.kt") public void testImplicitConstuctorCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/implicitConstuctorCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.kt"); } @Test @TestMetadata("implicitJavaConstuctorCall.kt") public void testImplicitJavaConstuctorCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/implicitJavaConstuctorCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.kt"); } @Test @TestMetadata("indexedGet.kt") public void testIndexedGet() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedGet.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.kt"); } @Test @TestMetadata("indexedGetWithNotEnoughArgs.kt") public void testIndexedGetWithNotEnoughArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedGetWithNotEnoughArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.kt"); } @Test @TestMetadata("indexedGetWithTooManyArgs.kt") public void testIndexedGetWithTooManyArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedGetWithTooManyArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.kt"); } @Test @TestMetadata("indexedSet.kt") public void testIndexedSet() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedSet.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.kt"); } @Test @TestMetadata("indexedSetWithNotEnoughArgs.kt") public void testIndexedSetWithNotEnoughArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedSetWithNotEnoughArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.kt"); } @Test @TestMetadata("indexedSetWithTooManyArgs.kt") public void testIndexedSetWithTooManyArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/indexedSetWithTooManyArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.kt"); } @Test @TestMetadata("intArrayOfInAnnotation.kt") public void testIntArrayOfInAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/intArrayOfInAnnotation.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.kt"); } @Test @TestMetadata("javaFunctionCall.kt") public void testJavaFunctionCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaFunctionCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.kt"); } @Test @TestMetadata("javaPropertyGetter.kt") public void testJavaPropertyGetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertyGetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.kt"); } @Test @TestMetadata("javaPropertyGetter_unqualified.kt") public void testJavaPropertyGetter_unqualified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertyGetter_unqualified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.kt"); } @Test @TestMetadata("javaPropertyNestedGetter.kt") public void testJavaPropertyNestedGetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertyNestedGetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.kt"); } @Test @TestMetadata("javaPropertySetter.kt") public void testJavaPropertySetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertySetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.kt"); } @Test @TestMetadata("javaPropertySetterIncomplete.kt") public void testJavaPropertySetterIncomplete() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertySetterIncomplete.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.kt"); } @Test @TestMetadata("javaPropertySetter_unqualified.kt") public void testJavaPropertySetter_unqualified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/javaPropertySetter_unqualified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.kt"); } @Test @TestMetadata("kotlinPropertyGetter.kt") public void testKotlinPropertyGetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertyGetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.kt"); } @Test @TestMetadata("kotlinPropertyGetter_unqualified.kt") public void testKotlinPropertyGetter_unqualified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertyGetter_unqualified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.kt"); } @Test @TestMetadata("kotlinPropertyNestedGetter.kt") public void testKotlinPropertyNestedGetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertyNestedGetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.kt"); } @Test @TestMetadata("kotlinPropertySetter.kt") public void testKotlinPropertySetter() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertySetter.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.kt"); } @Test @TestMetadata("kotlinPropertySetter_unqualified.kt") public void testKotlinPropertySetter_unqualified() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/kotlinPropertySetter_unqualified.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.kt"); } @Test @TestMetadata("memberFunctionCallWithTypeArgument.kt") public void testMemberFunctionCallWithTypeArgument() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/memberFunctionCallWithTypeArgument.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.kt"); } @Test @TestMetadata("resolveCallInSuperConstructorParam.kt") public void testResolveCallInSuperConstructorParam() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.kt"); } @Test @TestMetadata("samConstructorCall.kt") public void testSamConstructorCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.kt"); } @Test @TestMetadata("simpleCallWithNonMatchingArgs.kt") public void testSimpleCallWithNonMatchingArgs() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/simpleCallWithNonMatchingArgs.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.kt"); } @Test @TestMetadata("unresolvedSuperReference.kt") public void testUnresolvedSuperReference() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/unresolvedSuperReference.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/unresolvedSuperReference.kt"); } @Test @TestMetadata("variableAsFunction.kt") public void testVariableAsFunction() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunction.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.kt"); } @Test @TestMetadata("variableAsFunctionLikeCall.kt") public void testVariableAsFunctionLikeCall() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionLikeCall.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterName.kt") public void testVariableAsFunctionWithParameterName() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterName.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameAnnotation.kt") public void testVariableAsFunctionWithParameterNameAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameAnnotation.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameAnnotationConflict.kt") public void testVariableAsFunctionWithParameterNameAnnotationConflict() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameGeneric.kt") public void testVariableAsFunctionWithParameterNameGeneric() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameGeneric.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameInNonFunctionType.kt") public void testVariableAsFunctionWithParameterNameInNonFunctionType() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.kt"); } @Test @TestMetadata("variableAsFunctionWithParameterNameMixed.kt") public void testVariableAsFunctionWithParameterNameMixed() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableAsFunctionWithParameterNameMixed.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.kt"); } @Test @TestMetadata("variableWithExtensionInvoke.kt") public void testVariableWithExtensionInvoke() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableWithExtensionInvoke.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.kt"); } @Test @TestMetadata("variableWithMemberInvoke.kt") public void testVariableWithMemberInvoke() throws Exception { - runTest("analysis/analysis-api/testData/analysisSession/resolveCall/variableWithMemberInvoke.kt"); + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirCompileTimeConstantEvaluatorTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java similarity index 75% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirCompileTimeConstantEvaluatorTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java index 00db8a36074..ee93b23e758 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirCompileTimeConstantEvaluatorTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.compileTimeConstantProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,107 +16,107 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantEvaluator") +@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate") @TestDataPath("$PROJECT_ROOT") public class FirCompileTimeConstantEvaluatorTestGenerated extends AbstractFirCompileTimeConstantEvaluatorTest { @Test - public void testAllFilesPresentInCompileTimeConstantEvaluator() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantEvaluator"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInEvaluate() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("annotationInAnnotation_arrayOf.kt") public void testAnnotationInAnnotation_arrayOf() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_arrayOf.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_arrayOf.kt"); } @Test @TestMetadata("annotationInAnnotation_collectionLiteral.kt") public void testAnnotationInAnnotation_collectionLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_collectionLiteral.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_collectionLiteral.kt"); } @Test @TestMetadata("annotationInAnnotation_collectionLiteral_spread.kt") public void testAnnotationInAnnotation_collectionLiteral_spread() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_collectionLiteral_spread.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_collectionLiteral_spread.kt"); } @Test @TestMetadata("annotationInAnnotation_multipleAnnotations_arrayOf.kt") public void testAnnotationInAnnotation_multipleAnnotations_arrayOf() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_multipleAnnotations_arrayOf.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_multipleAnnotations_arrayOf.kt"); } @Test @TestMetadata("annotationInAnnotation_multipleAnnotations_collectionLiteral.kt") public void testAnnotationInAnnotation_multipleAnnotations_collectionLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_multipleAnnotations_collectionLiteral.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_multipleAnnotations_collectionLiteral.kt"); } @Test @TestMetadata("annotationInAnnotation_single.kt") public void testAnnotationInAnnotation_single() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_single.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_single.kt"); } @Test @TestMetadata("annotationInAnnotation_vararg.kt") public void testAnnotationInAnnotation_vararg() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/annotationInAnnotation_vararg.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/annotationInAnnotation_vararg.kt"); } @Test @TestMetadata("enumAsAnnotationValue.kt") public void testEnumAsAnnotationValue() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/enumAsAnnotationValue.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/enumAsAnnotationValue.kt"); } @Test @TestMetadata("propertyInit_Byte.kt") public void testPropertyInit_Byte() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Byte.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.kt"); } @Test @TestMetadata("propertyInit_DivByZero.kt") public void testPropertyInit_DivByZero() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_DivByZero.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.kt"); } @Test @TestMetadata("propertyInit_Double.kt") public void testPropertyInit_Double() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Double.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.kt"); } @Test @TestMetadata("propertyInit_Float.kt") public void testPropertyInit_Float() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Float.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.kt"); } @Test @TestMetadata("propertyInit_Int.kt") public void testPropertyInit_Int() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Int.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.kt"); } @Test @TestMetadata("propertyInit_Long.kt") public void testPropertyInit_Long() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_Long.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.kt"); } @Test @TestMetadata("propertyInit_UInt.kt") public void testPropertyInit_UInt() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/propertyInit_UInt.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.kt"); } @Test @TestMetadata("stringLiteral.kt") public void testStringLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/compileTimeConstantEvaluator/stringLiteral.kt"); + runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirWhenMissingCasesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java similarity index 56% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirWhenMissingCasesTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java index 5ddd865864f..ec2eeaa4445 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirWhenMissingCasesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.expressionInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,95 +16,95 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/whenMissingCases") +@TestMetadata("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases") @TestDataPath("$PROJECT_ROOT") public class FirWhenMissingCasesTestGenerated extends AbstractFirWhenMissingCasesTest { @Test public void testAllFilesPresentInWhenMissingCases() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/whenMissingCases"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("boolean_else.kt") public void testBoolean_else() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/boolean_else.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/boolean_else.kt"); } @Test @TestMetadata("boolean_empty.kt") public void testBoolean_empty() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/boolean_empty.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/boolean_empty.kt"); } @Test @TestMetadata("boolean_partial.kt") public void testBoolean_partial() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/boolean_partial.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/boolean_partial.kt"); } @Test @TestMetadata("enum_else.kt") public void testEnum_else() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/enum_else.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/enum_else.kt"); } @Test @TestMetadata("enum_empty.kt") public void testEnum_empty() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/enum_empty.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/enum_empty.kt"); } @Test @TestMetadata("enum_partial.kt") public void testEnum_partial() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/enum_partial.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/enum_partial.kt"); } @Test @TestMetadata("nothing.kt") public void testNothing() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nothing.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nothing.kt"); } @Test @TestMetadata("nullableBoolean.kt") public void testNullableBoolean() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nullableBoolean.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nullableBoolean.kt"); } @Test @TestMetadata("nullableEnum.kt") public void testNullableEnum() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nullableEnum.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nullableEnum.kt"); } @Test @TestMetadata("nullableNothing.kt") public void testNullableNothing() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nullableNothing.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nullableNothing.kt"); } @Test @TestMetadata("nullableSealedClass_empty.kt") public void testNullableSealedClass_empty() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/nullableSealedClass_empty.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/nullableSealedClass_empty.kt"); } @Test @TestMetadata("sealedClass_else.kt") public void testSealedClass_else() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/sealedClass_else.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/sealedClass_else.kt"); } @Test @TestMetadata("sealedClass_empty.kt") public void testSealedClass_empty() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/sealedClass_empty.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/sealedClass_empty.kt"); } @Test @TestMetadata("sealedClass_partial.kt") public void testSealedClass_partial() throws Exception { - runTest("analysis/analysis-api/testData/components/whenMissingCases/sealedClass_partial.kt"); + runTest("analysis/analysis-api/testData/components/expressionInfoProvider/whenMissingCases/sealedClass_partial.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java similarity index 52% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirExpectedExpressionTypeTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java index 77415a94e37..e4cde5dd246 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirExpectedExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,233 +16,233 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/expectedExpressionType") +@TestMetadata("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType") @TestDataPath("$PROJECT_ROOT") public class FirExpectedExpressionTypeTestGenerated extends AbstractFirExpectedExpressionTypeTest { @Test public void testAllFilesPresentInExpectedExpressionType() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expectedExpressionType"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("functionExpressionBody.kt") public void testFunctionExpressionBody() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBody.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBody.kt"); } @Test @TestMetadata("functionExpressionBodyBlockExpression.kt") public void testFunctionExpressionBodyBlockExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyBlockExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyBlockExpression.kt"); } @Test @TestMetadata("functionExpressionBodyQualified.kt") public void testFunctionExpressionBodyQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyQualified.kt"); } @Test @TestMetadata("functionExpressionBodyWithTypeFromRHS.kt") public void testFunctionExpressionBodyWithTypeFromRHS() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyWithTypeFromRHS.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyWithTypeFromRHS.kt"); } @Test @TestMetadata("functionExpressionBodyWithoutExplicitType.kt") public void testFunctionExpressionBodyWithoutExplicitType() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionExpressionBodyWithoutExplicitType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionExpressionBodyWithoutExplicitType.kt"); } @Test @TestMetadata("functionLambdaParam.kt") public void testFunctionLambdaParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionLambdaParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionLambdaParam.kt"); } @Test @TestMetadata("functionNamedlParam.kt") public void testFunctionNamedlParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionNamedlParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionNamedlParam.kt"); } @Test @TestMetadata("functionParamWithTypeParam.kt") public void testFunctionParamWithTypeParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionParamWithTypeParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionParamWithTypeParam.kt"); } @Test @TestMetadata("functionPositionalParam.kt") public void testFunctionPositionalParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionPositionalParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParam.kt"); } @Test @TestMetadata("functionPositionalParamQualified.kt") public void testFunctionPositionalParamQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/functionPositionalParamQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/functionPositionalParamQualified.kt"); } @Test @TestMetadata("ifCondition.kt") public void testIfCondition() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/ifCondition.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/ifCondition.kt"); } @Test @TestMetadata("ifConditionQualified.kt") public void testIfConditionQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/ifConditionQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/ifConditionQualified.kt"); } @Test @TestMetadata("infixFunctionAsRegularCallParam.kt") public void testInfixFunctionAsRegularCallParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/infixFunctionAsRegularCallParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionAsRegularCallParam.kt"); } @Test @TestMetadata("infixFunctionParam.kt") public void testInfixFunctionParam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/infixFunctionParam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionParam.kt"); } @Test @TestMetadata("infixFunctionParamQualified.kt") public void testInfixFunctionParamQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/infixFunctionParamQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/infixFunctionParamQualified.kt"); } @Test @TestMetadata("lambdaWithExplicitTypeFromVariable.kt") public void testLambdaWithExplicitTypeFromVariable() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/lambdaWithExplicitTypeFromVariable.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/lambdaWithExplicitTypeFromVariable.kt"); } @Test @TestMetadata("lambdaWithoutReturnNorExplicitType.kt") public void testLambdaWithoutReturnNorExplicitType() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/lambdaWithoutReturnNorExplicitType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/lambdaWithoutReturnNorExplicitType.kt"); } @Test @TestMetadata("propertyDeclaration.kt") public void testPropertyDeclaration() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclaration.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclaration.kt"); } @Test @TestMetadata("propertyDeclarationQualified.kt") public void testPropertyDeclarationQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationQualified.kt"); } @Test @TestMetadata("propertyDeclarationWithSafeCast.kt") public void testPropertyDeclarationWithSafeCast() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithSafeCast.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithSafeCast.kt"); } @Test @TestMetadata("propertyDeclarationWithTypeCast.kt") public void testPropertyDeclarationWithTypeCast() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithTypeCast.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithTypeCast.kt"); } @Test @TestMetadata("propertyDeclarationWithTypeFromRHS.kt") public void testPropertyDeclarationWithTypeFromRHS() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithTypeFromRHS.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithTypeFromRHS.kt"); } @Test @TestMetadata("propertyDeclarationWithoutExplicitType.kt") public void testPropertyDeclarationWithoutExplicitType() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/propertyDeclarationWithoutExplicitType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/propertyDeclarationWithoutExplicitType.kt"); } @Test @TestMetadata("returnFromFunction.kt") public void testReturnFromFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/returnFromFunction.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromFunction.kt"); } @Test @TestMetadata("returnFromFunctionQualifiedReceiver.kt") public void testReturnFromFunctionQualifiedReceiver() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/returnFromFunctionQualifiedReceiver.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromFunctionQualifiedReceiver.kt"); } @Test @TestMetadata("returnFromFunctionQualifiedSelector.kt") public void testReturnFromFunctionQualifiedSelector() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/returnFromFunctionQualifiedSelector.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromFunctionQualifiedSelector.kt"); } @Test @TestMetadata("returnFromLambda.kt") public void testReturnFromLambda() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/returnFromLambda.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromLambda.kt"); } @Test @TestMetadata("sam.kt") public void testSam() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/sam.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/sam.kt"); } @Test @TestMetadata("samAsArgument.kt") public void testSamAsArgument() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samAsArgument.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsArgument.kt"); } @Test @TestMetadata("samAsConstructorArgument.kt") public void testSamAsConstructorArgument() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samAsConstructorArgument.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.kt"); } @Test @TestMetadata("samAsReturn.kt") public void testSamAsReturn() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samAsReturn.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsReturn.kt"); } @Test @TestMetadata("samWithExplicitTypeFromProperty.kt") public void testSamWithExplicitTypeFromProperty() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samWithExplicitTypeFromProperty.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samWithExplicitTypeFromProperty.kt"); } @Test @TestMetadata("samWithTypeCast.kt") public void testSamWithTypeCast() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/samWithTypeCast.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samWithTypeCast.kt"); } @Test @TestMetadata("variableAssignment.kt") public void testVariableAssignment() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/variableAssignment.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/variableAssignment.kt"); } @Test @TestMetadata("variableAssignmentQualified.kt") public void testVariableAssignmentQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/variableAssignmentQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/variableAssignmentQualified.kt"); } @Test @TestMetadata("whileCondition.kt") public void testWhileCondition() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/whileCondition.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/whileCondition.kt"); } @Test @TestMetadata("whileConditionQualified.kt") public void testWhileConditionQualified() throws Exception { - runTest("analysis/analysis-api/testData/components/expectedExpressionType/whileConditionQualified.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/whileConditionQualified.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHLExpressionTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java similarity index 77% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHLExpressionTypeTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java index 1437cd8120a..a0441b57d83 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHLExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,155 +16,155 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/expressionType") +@TestMetadata("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType") @TestDataPath("$PROJECT_ROOT") public class FirHLExpressionTypeTestGenerated extends AbstractFirHLExpressionTypeTest { @Test public void testAllFilesPresentInExpressionType() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionType"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("arrayElement_arrayOfNulls.kt") public void testArrayElement_arrayOfNulls() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/arrayElement_arrayOfNulls.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/arrayElement_arrayOfNulls.kt"); } @Test @TestMetadata("array_arrayOfNulls.kt") public void testArray_arrayOfNulls() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/array_arrayOfNulls.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/array_arrayOfNulls.kt"); } @Test @TestMetadata("assignmentExpressionTarget.kt") public void testAssignmentExpressionTarget() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/assignmentExpressionTarget.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/assignmentExpressionTarget.kt"); } @Test @TestMetadata("binaryExpression.kt") public void testBinaryExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/binaryExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/binaryExpression.kt"); } @Test @TestMetadata("breakExpression.kt") public void testBreakExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/breakExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/breakExpression.kt"); } @Test @TestMetadata("forExpression.kt") public void testForExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/forExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/forExpression.kt"); } @Test @TestMetadata("functionCall.kt") public void testFunctionCall() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/functionCall.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/functionCall.kt"); } @Test @TestMetadata("inParens.kt") public void testInParens() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/inParens.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/inParens.kt"); } @Test @TestMetadata("insideStringTemplate.kt") public void testInsideStringTemplate() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/insideStringTemplate.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/insideStringTemplate.kt"); } @Test @TestMetadata("insideStringTemplateWithBinrary.kt") public void testInsideStringTemplateWithBinrary() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/insideStringTemplateWithBinrary.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/insideStringTemplateWithBinrary.kt"); } @Test @TestMetadata("intLiteral.kt") public void testIntLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/intLiteral.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/intLiteral.kt"); } @Test @TestMetadata("listElement_listOf.kt") public void testListElement_listOf() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/listElement_listOf.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/listElement_listOf.kt"); } @Test @TestMetadata("listElement_mutableListOf.kt") public void testListElement_mutableListOf() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/listElement_mutableListOf.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/listElement_mutableListOf.kt"); } @Test @TestMetadata("list_listOf.kt") public void testList_listOf() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/list_listOf.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/list_listOf.kt"); } @Test @TestMetadata("list_mutableListOf.kt") public void testList_mutableListOf() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/list_mutableListOf.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/list_mutableListOf.kt"); } @Test @TestMetadata("nonExpression.kt") public void testNonExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/nonExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/nonExpression.kt"); } @Test @TestMetadata("property.kt") public void testProperty() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/property.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/property.kt"); } @Test @TestMetadata("resolvedSuper.kt") public void testResolvedSuper() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/resolvedSuper.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/resolvedSuper.kt"); } @Test @TestMetadata("returnExpression.kt") public void testReturnExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/returnExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/returnExpression.kt"); } @Test @TestMetadata("stringLiteral.kt") public void testStringLiteral() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/stringLiteral.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/stringLiteral.kt"); } @Test @TestMetadata("unresolvedSuper_multipleSuperTypes.kt") public void testUnresolvedSuper_multipleSuperTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/unresolvedSuper_multipleSuperTypes.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_multipleSuperTypes.kt"); } @Test @TestMetadata("unresolvedSuper_noSuperType.kt") public void testUnresolvedSuper_noSuperType() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/unresolvedSuper_noSuperType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_noSuperType.kt"); } @Test @TestMetadata("unresolvedSuper_singleSuperType.kt") public void testUnresolvedSuper_singleSuperType() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/unresolvedSuper_singleSuperType.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_singleSuperType.kt"); } @Test @TestMetadata("whileExpression.kt") public void testWhileExpression() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionType/whileExpression.kt"); + runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/whileExpression.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/HLImportOptimizerTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/HLImportOptimizerTestGenerated.java similarity index 75% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/HLImportOptimizerTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/HLImportOptimizerTestGenerated.java index e8968e6b1ff..774a0b0e25b 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/HLImportOptimizerTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/HLImportOptimizerTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,111 +16,111 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/importOptimizer") +@TestMetadata("analysis/analysis-api/testData/components/importOptimizer/analyseImports") @TestDataPath("$PROJECT_ROOT") public class HLImportOptimizerTestGenerated extends AbstractHLImportOptimizerTest { @Test - public void testAllFilesPresentInImportOptimizer() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/importOptimizer"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + public void testAllFilesPresentInAnalyseImports() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/importOptimizer/analyseImports"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } @Test @TestMetadata("unusedAliasedTypeImport.kt") public void testUnusedAliasedTypeImport() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/unusedAliasedTypeImport.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/unusedAliasedTypeImport.kt"); } @Test @TestMetadata("unusedFunctionImports.kt") public void testUnusedFunctionImports() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/unusedFunctionImports.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/unusedFunctionImports.kt"); } @Test @TestMetadata("unusedInvokeOperatorImport.kt") public void testUnusedInvokeOperatorImport() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/unusedInvokeOperatorImport.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/unusedInvokeOperatorImport.kt"); } @Test @TestMetadata("usedAliasedFunctionReference.kt") public void testUsedAliasedFunctionReference() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/usedAliasedFunctionReference.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/usedAliasedFunctionReference.kt"); } @Test @TestMetadata("usedAliasedTypeImport.kt") public void testUsedAliasedTypeImport() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/usedAliasedTypeImport.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/usedAliasedTypeImport.kt"); } @Test @TestMetadata("usedFunctionImport.kt") public void testUsedFunctionImport() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/usedFunctionImport.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/usedFunctionImport.kt"); } @Test @TestMetadata("usedInvokeOperatorAliasedImport.kt") public void testUsedInvokeOperatorAliasedImport() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/usedInvokeOperatorAliasedImport.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/usedInvokeOperatorAliasedImport.kt"); } @Test @TestMetadata("usedInvokeOperatorExplicitImport.kt") public void testUsedInvokeOperatorExplicitImport() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/usedInvokeOperatorExplicitImport.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/usedInvokeOperatorExplicitImport.kt"); } @Test @TestMetadata("usedInvokeOperatorImport.kt") public void testUsedInvokeOperatorImport() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/usedInvokeOperatorImport.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/usedInvokeOperatorImport.kt"); } @Nested - @TestMetadata("analysis/analysis-api/testData/components/importOptimizer/referencesWithErrors") + @TestMetadata("analysis/analysis-api/testData/components/importOptimizer/analyseImports/referencesWithErrors") @TestDataPath("$PROJECT_ROOT") public class ReferencesWithErrors { @Test public void testAllFilesPresentInReferencesWithErrors() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/importOptimizer/referencesWithErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/importOptimizer/analyseImports/referencesWithErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } @Test @TestMetadata("usedConstructor_invalidArguments.kt") public void testUsedConstructor_invalidArguments() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/referencesWithErrors/usedConstructor_invalidArguments.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/referencesWithErrors/usedConstructor_invalidArguments.kt"); } @Test @TestMetadata("usedConstructor_missingCall.kt") public void testUsedConstructor_missingCall() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/referencesWithErrors/usedConstructor_missingCall.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/referencesWithErrors/usedConstructor_missingCall.kt"); } @Test @TestMetadata("usedExtensionFunction_invalidArguments.kt") public void testUsedExtensionFunction_invalidArguments() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/referencesWithErrors/usedExtensionFunction_invalidArguments.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/referencesWithErrors/usedExtensionFunction_invalidArguments.kt"); } @Test @TestMetadata("usedExtensionProperty_invalidReceiver.kt") public void testUsedExtensionProperty_invalidReceiver() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/referencesWithErrors/usedExtensionProperty_invalidReceiver.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/referencesWithErrors/usedExtensionProperty_invalidReceiver.kt"); } @Test @TestMetadata("usedInvokeOperator_invalidArguments.kt") public void testUsedInvokeOperator_invalidArguments() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/referencesWithErrors/usedInvokeOperator_invalidArguments.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/referencesWithErrors/usedInvokeOperator_invalidArguments.kt"); } @Test @TestMetadata("usedTypeImport_missingGeneric.kt") public void testUsedTypeImport_missingGeneric() throws Exception { - runTest("analysis/analysis-api/testData/components/importOptimizer/referencesWithErrors/usedTypeImport_missingGeneric.kt"); + runTest("analysis/analysis-api/testData/components/importOptimizer/analyseImports/referencesWithErrors/usedTypeImport_missingGeneric.kt"); } } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/ExpressionPsiTypeProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/ExpressionPsiTypeProviderTestGenerated.java similarity index 68% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/ExpressionPsiTypeProviderTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/ExpressionPsiTypeProviderTestGenerated.java index 26e637f1cbd..7b651a2f428 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/ExpressionPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/ExpressionPsiTypeProviderTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,17 +16,17 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/expressionPsiType") +@TestMetadata("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression") @TestDataPath("$PROJECT_ROOT") public class ExpressionPsiTypeProviderTestGenerated extends AbstractExpressionPsiTypeProviderTest { @Test - public void testAllFilesPresentInExpressionPsiType() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/expressionPsiType"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInForExpression() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("typeParamFlexibleUpperBound.kt") public void testTypeParamFlexibleUpperBound() throws Exception { - runTest("analysis/analysis-api/testData/components/expressionPsiType/typeParamFlexibleUpperBound.kt"); + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/typeParamFlexibleUpperBound.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/PsiTypeProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/PsiTypeProviderTestGenerated.java similarity index 75% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/PsiTypeProviderTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/PsiTypeProviderTestGenerated.java index 32b752421c5..2497702b09f 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/PsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/PsiTypeProviderTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,53 +16,53 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/psiTypeProvider") +@TestMetadata("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration") @TestDataPath("$PROJECT_ROOT") public class PsiTypeProviderTestGenerated extends AbstractPsiTypeProviderTest { @Test - public void testAllFilesPresentInPsiTypeProvider() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInForDeclaration() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("anonymousObject_exposedAsReturnValue.kt") public void testAnonymousObject_exposedAsReturnValue() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/anonymousObject_exposedAsReturnValue.kt"); + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/anonymousObject_exposedAsReturnValue.kt"); } @Test @TestMetadata("localClass_exposedAsReturnValue.kt") public void testLocalClass_exposedAsReturnValue() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/localClass_exposedAsReturnValue.kt"); + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue.kt"); } @Test @TestMetadata("localClass_exposedAsReturnValue_privateFunction.kt") public void testLocalClass_exposedAsReturnValue_privateFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/localClass_exposedAsReturnValue_privateFunction.kt"); + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_exposedAsReturnValue_privateFunction.kt"); } @Test @TestMetadata("localClass_localFunctionInSameScope.kt") public void testLocalClass_localFunctionInSameScope() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/localClass_localFunctionInSameScope.kt"); + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localFunctionInSameScope.kt"); } @Test @TestMetadata("localClass_localPropertyInSameScope.kt") public void testLocalClass_localPropertyInSameScope() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/localClass_localPropertyInSameScope.kt"); + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSameScope.kt"); } @Test @TestMetadata("localClass_localPropertyInSampeScope_functionalType.kt") public void testLocalClass_localPropertyInSampeScope_functionalType() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/localClass_localPropertyInSampeScope_functionalType.kt"); + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_localPropertyInSampeScope_functionalType.kt"); } @Test @TestMetadata("localClass_memberFunction.kt") public void testLocalClass_memberFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/psiTypeProvider/localClass_memberFunction.kt"); + runTest("analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/localClass_memberFunction.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHLSmartCastInfoTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java similarity index 79% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHLSmartCastInfoTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java index 6a5b604ba27..ea8d9602340 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHLSmartCastInfoTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.smartCastProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,59 +16,59 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/smartCastInfo") +@TestMetadata("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo") @TestDataPath("$PROJECT_ROOT") public class FirHLSmartCastInfoTestGenerated extends AbstractFirHLSmartCastInfoTest { @Test public void testAllFilesPresentInSmartCastInfo() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/smartCastInfo"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("multiSmartcastAsReceiver_stable.kt") public void testMultiSmartcastAsReceiver_stable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/multiSmartcastAsReceiver_stable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_stable.kt"); } @Test @TestMetadata("multiSmartcastAsReceiver_unstable.kt") public void testMultiSmartcastAsReceiver_unstable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/multiSmartcastAsReceiver_unstable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.kt"); } @Test @TestMetadata("multiSmartcast_stable.kt") public void testMultiSmartcast_stable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/multiSmartcast_stable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_stable.kt"); } @Test @TestMetadata("multiSmartcast_unstable.kt") public void testMultiSmartcast_unstable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/multiSmartcast_unstable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_unstable.kt"); } @Test @TestMetadata("smartcastAsReceiver_stable.kt") public void testSmartcastAsReceiver_stable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/smartcastAsReceiver_stable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/smartcastAsReceiver_stable.kt"); } @Test @TestMetadata("smartcastAsReceiver_unstable.kt") public void testSmartcastAsReceiver_unstable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/smartcastAsReceiver_unstable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/smartcastAsReceiver_unstable.kt"); } @Test @TestMetadata("smartcast_stable.kt") public void testSmartcast_stable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/smartcast_stable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/smartcast_stable.kt"); } @Test @TestMetadata("smartcast_unstable.kt") public void testSmartcast_unstable() throws Exception { - runTest("analysis/analysis-api/testData/components/smartCastInfo/smartcast_unstable.kt"); + runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/smartcast_unstable.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirOverriddenDeclarationProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java similarity index 54% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirOverriddenDeclarationProviderTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java index c41b90fdd61..aad8514a72c 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirOverriddenDeclarationProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationOverridesProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,71 +16,71 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/overriddenDeclarations") +@TestMetadata("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols") @TestDataPath("$PROJECT_ROOT") public class FirOverriddenDeclarationProviderTestGenerated extends AbstractFirOverriddenDeclarationProviderTest { @Test - public void testAllFilesPresentInOverriddenDeclarations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/overriddenDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInOverriddenSymbols() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("backingField.kt") public void testBackingField() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/backingField.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/backingField.kt"); } @Test @TestMetadata("inAnonymousClass.kt") public void testInAnonymousClass() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inAnonymousClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/inAnonymousClass.kt"); } @Test @TestMetadata("inLocalClass.kt") public void testInLocalClass() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inLocalClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/inLocalClass.kt"); } @Test @TestMetadata("inOtherFile.kt") public void testInOtherFile() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/inOtherFile.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/inOtherFile.kt"); } @Test @TestMetadata("intersectionOverride.kt") public void testIntersectionOverride() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/intersectionOverride.kt"); } @Test @TestMetadata("intersectionOverride2.kt") public void testIntersectionOverride2() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/intersectionOverride2.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/intersectionOverride2.kt"); } @Test @TestMetadata("javaAccessors.kt") public void testJavaAccessors() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/javaAccessors.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/javaAccessors.kt"); } @Test @TestMetadata("multipleInterfaces.kt") public void testMultipleInterfaces() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/multipleInterfaces.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/multipleInterfaces.kt"); } @Test @TestMetadata("onEnumEntry.kt") public void testOnEnumEntry() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/onEnumEntry.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/onEnumEntry.kt"); } @Test @TestMetadata("sequenceOfOverrides.kt") public void testSequenceOfOverrides() throws Exception { - runTest("analysis/analysis-api/testData/components/overriddenDeclarations/sequenceOfOverrides.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationOverridesProvider/overriddenSymbols/sequenceOfOverrides.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirRendererTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java similarity index 50% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirRendererTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java index 50fed9e67d6..99c2f589a24 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirRendererTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationRenderer; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,173 +16,173 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/declarationRenderer") +@TestMetadata("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration") @TestDataPath("$PROJECT_ROOT") public class FirRendererTestGenerated extends AbstractFirRendererTest { @Test - public void testAllFilesPresentInDeclarationRenderer() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/declarationRenderer"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInRenderDeclaration() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/annotation.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.kt"); } @Test @TestMetadata("complexTypes.kt") public void testComplexTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/complexTypes.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/complexTypes.kt"); } @Test @TestMetadata("constructorInObject.kt") public void testConstructorInObject() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/constructorInObject.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.kt"); } @Test @TestMetadata("constructorOfAnonymousObject.kt") public void testConstructorOfAnonymousObject() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/constructorOfAnonymousObject.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorOfAnonymousObject.kt"); } @Test @TestMetadata("delegates.kt") public void testDelegates() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/delegates.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.kt"); } @Test @TestMetadata("derivedClass.kt") public void testDerivedClass() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/derivedClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.kt"); } @Test @TestMetadata("emptyAnonymousObject.kt") public void testEmptyAnonymousObject() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/emptyAnonymousObject.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/emptyAnonymousObject.kt"); } @Test @TestMetadata("enums.kt") public void testEnums() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/enums.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.kt"); } @Test @TestMetadata("enums2.kt") public void testEnums2() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/enums2.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.kt"); } @Test @TestMetadata("expectActual.kt") public void testExpectActual() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/expectActual.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/expectActual.kt"); } @Test @TestMetadata("F.kt") public void testF() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/F.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.kt"); } @Test @TestMetadata("functionTypes.kt") public void testFunctionTypes() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/functionTypes.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/functionTypes.kt"); } @Test @TestMetadata("genericFunctions.kt") public void testGenericFunctions() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/genericFunctions.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericFunctions.kt"); } @Test @TestMetadata("genericProperty.kt") public void testGenericProperty() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/genericProperty.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.kt"); } @Test @TestMetadata("intersectionType.kt") public void testIntersectionType() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/intersectionType.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/intersectionType.kt"); } @Test @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/nestedClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.kt"); } @Test @TestMetadata("NestedOfAliasedType.kt") public void testNestedOfAliasedType() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/NestedOfAliasedType.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.kt"); } @Test @TestMetadata("NestedSuperType.kt") public void testNestedSuperType() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/NestedSuperType.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.kt"); } @Test @TestMetadata("noPrimaryConstructor.kt") public void testNoPrimaryConstructor() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/noPrimaryConstructor.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/noPrimaryConstructor.kt"); } @Test @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/simpleClass.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.kt"); } @Test @TestMetadata("simpleFun.kt") public void testSimpleFun() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/simpleFun.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleFun.kt"); } @Test @TestMetadata("simpleTypeAlias.kt") public void testSimpleTypeAlias() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/simpleTypeAlias.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.kt"); } @Test @TestMetadata("typeAliasWithGeneric.kt") public void testTypeAliasWithGeneric() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/typeAliasWithGeneric.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.kt"); } @Test @TestMetadata("typeParameterVsNested.kt") public void testTypeParameterVsNested() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/typeParameterVsNested.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.kt"); } @Test @TestMetadata("typeParameters.kt") public void testTypeParameters() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/typeParameters.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.kt"); } @Test @TestMetadata("vararg.kt") public void testVararg() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/vararg.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.kt"); } @Test @TestMetadata("where.kt") public void testWhere() throws Exception { - runTest("analysis/analysis-api/testData/components/declarationRenderer/where.kt"); + runTest("analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirFunctionClassKindTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java similarity index 66% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirFunctionClassKindTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java index 7600c8d9aac..129ea6894ab 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirFunctionClassKindTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.typeInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,35 +16,35 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/functionClassKind") +@TestMetadata("analysis/analysis-api/testData/components/typeInfoProvider/functionClassKind") @TestDataPath("$PROJECT_ROOT") public class FirFunctionClassKindTestGenerated extends AbstractFirFunctionClassKindTest { @Test public void testAllFilesPresentInFunctionClassKind() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/functionClassKind"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/typeInfoProvider/functionClassKind"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("function.kt") public void testFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/functionClassKind/function.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/functionClassKind/function.kt"); } @Test @TestMetadata("kFunction.kt") public void testKFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/functionClassKind/kFunction.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/functionClassKind/kFunction.kt"); } @Test @TestMetadata("kSuspendFunction.kt") public void testKSuspendFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/functionClassKind/kSuspendFunction.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/functionClassKind/kSuspendFunction.kt"); } @Test @TestMetadata("suspendFunction.kt") public void testSuspendFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/functionClassKind/suspendFunction.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/functionClassKind/suspendFunction.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirGetSuperTypesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirGetSuperTypesTestGenerated.java similarity index 56% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirGetSuperTypesTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirGetSuperTypesTestGenerated.java index 4c4e432ad5e..65009430142 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirGetSuperTypesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirGetSuperTypesTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.typeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,95 +16,95 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/getSuperTypes") +@TestMetadata("analysis/analysis-api/testData/components/typeInfoProvider/superTypes") @TestDataPath("$PROJECT_ROOT") public class FirGetSuperTypesTestGenerated extends AbstractFirGetSuperTypesTest { @Test - public void testAllFilesPresentInGetSuperTypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/getSuperTypes"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInSuperTypes() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/typeInfoProvider/superTypes"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/anonymousObject.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/anonymousObject.kt"); } @Test @TestMetadata("any.kt") public void testAny() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/any.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/any.kt"); } @Test @TestMetadata("contravariant.kt") public void testContravariant() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/contravariant.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/contravariant.kt"); } @Test @TestMetadata("covariant.kt") public void testCovariant() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/covariant.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/covariant.kt"); } @Test @TestMetadata("errorType.kt") public void testErrorType() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/errorType.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/errorType.kt"); } @Test @TestMetadata("flexibleType.kt") public void testFlexibleType() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/flexibleType.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/flexibleType.kt"); } @Test @TestMetadata("int.kt") public void testInt() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/int.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/int.kt"); } @Test @TestMetadata("invariant.kt") public void testInvariant() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/invariant.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/invariant.kt"); } @Test @TestMetadata("recursiveTypeParameter.kt") public void testRecursiveTypeParameter() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/recursiveTypeParameter.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/recursiveTypeParameter.kt"); } @Test @TestMetadata("regularClass.kt") public void testRegularClass() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/regularClass.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/regularClass.kt"); } @Test @TestMetadata("regularClassWithBounds.kt") public void testRegularClassWithBounds() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/regularClassWithBounds.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/regularClassWithBounds.kt"); } @Test @TestMetadata("star.kt") public void testStar() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/star.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/star.kt"); } @Test @TestMetadata("string.kt") public void testString() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/string.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/string.kt"); } @Test @TestMetadata("typeParameter.kt") public void testTypeParameter() throws Exception { - runTest("analysis/analysis-api/testData/components/getSuperTypes/typeParameter.kt"); + runTest("analysis/analysis-api/testData/components/typeInfoProvider/superTypes/typeParameter.kt"); } } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHasCommonSubtypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java similarity index 63% rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHasCommonSubtypeTestGenerated.java rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java index a58aeca9b6f..ffdaa80682f 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirHasCommonSubtypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.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.components; +package org.jetbrains.kotlin.analysis.api.fir.components.typeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -16,35 +16,35 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/hasCommonSubtype") +@TestMetadata("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype") @TestDataPath("$PROJECT_ROOT") public class FirHasCommonSubtypeTestGenerated extends AbstractFirHasCommonSubtypeTest { @Test - public void testAllFilesPresentInHasCommonSubtype() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/hasCommonSubtype"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInHaveCommonSubtype() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype"), Pattern.compile("^(.+)\\.kt$"), null, true); } @Test @TestMetadata("collections.kt") public void testCollections() throws Exception { - runTest("analysis/analysis-api/testData/components/hasCommonSubtype/collections.kt"); + runTest("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype/collections.kt"); } @Test @TestMetadata("dataClasses.kt") public void testDataClasses() throws Exception { - runTest("analysis/analysis-api/testData/components/hasCommonSubtype/dataClasses.kt"); + runTest("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype/dataClasses.kt"); } @Test @TestMetadata("enums.kt") public void testEnums() throws Exception { - runTest("analysis/analysis-api/testData/components/hasCommonSubtype/enums.kt"); + runTest("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype/enums.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("analysis/analysis-api/testData/components/hasCommonSubtype/simple.kt"); + runTest("analysis/analysis-api/testData/components/typeProvider/haveCommonSubtype/simple.kt"); } }