From 4530041cbb4ffb56b3278e6cd287c1768ac5317b Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 26 Jan 2022 10:56:43 +0100 Subject: [PATCH] Analysis API: move reference resolve testsdata with errors to dedicated folders --- ...rySourceReferenceResolveTestGenerated.java | 242 +-------- ...irSourceReferenceResolveTestGenerated.java | 474 ++++++++++-------- .../AnnotationTypeParameter.kt | 4 +- .../{ => withErrors}/getFunction.kt | 0 .../{ => withErrors}/getFunction.txt | 0 .../{ => withErrors}/setFunction.kt | 0 .../{ => withErrors}/setFunction.txt | 0 .../{ => withErrors}/unresolved.kt | 0 .../forLoopIn/inSource/allExtensions.kt | 6 +- .../forLoopIn/inSource/allExtensions.txt | 6 +- .../inSource/{ => withErrors}/nextMissing.kt | 0 .../inSource/{ => withErrors}/nextMissing.txt | 0 .../{ => withErrors}/unresolvedIterator.kt | 0 .../lambdaAndParensIncorrectVararg.kt | 0 .../lambdaAndParensIncorrectVararg.txt | 0 .../lambdaNoParIncorrectVararg.kt | 0 .../lambdaNoParIncorrectVararg.txt | 0 .../lambdaNoParLabelIncorrectVararg.kt | 0 .../lambdaNoParLabelIncorrectVararg.txt | 0 .../lambdaNoParRCurlyIncorrectVararg.kt | 0 .../lambdaNoParRCurlyIncorrectVararg.txt | 0 .../nonemptyLambdaRParIncorrectVararg.kt | 0 .../nonemptyLambdaRParIncorrectVararg.txt | 0 .../typeParameter/multipleBounds.kt | 4 +- .../typeParameter/multipleBounds.txt | 2 +- .../{ => withErrors}/AnnotationParameter.kt | 0 .../{ => withErrors}/AnnotationParameter.txt | 0 .../{ => withErrors}/ClassNameBeforeDot.kt | 0 .../{ => withErrors}/ClassNameBeforeDot.txt | 0 .../{ => withErrors}/CollectionLiteralLeft.kt | 0 .../CollectionLiteralLeft.txt | 0 .../CollectionLiteralRight.kt | 0 .../CollectionLiteralRight.txt | 0 .../CoroutineSuspensionPoint.kt | 0 .../CoroutineSuspensionPoint.txt | 0 .../{ => withErrors}/DeprecatedHidden.kt | 0 .../{ => withErrors}/FakeJavaLang1.kt | 0 .../{ => withErrors}/FakeJavaLang2.kt | 0 .../{ => withErrors}/FakeJavaLang3.kt | 0 .../{ => withErrors}/FakeJavaLang4.kt | 0 .../{ => withErrors}/InObjectClassObject.kt | 0 .../{ => withErrors}/InObjectClassObject.txt | 0 .../{ => withErrors}/InSecondClassObject.kt | 0 .../{ => withErrors}/InSecondClassObject.txt | 0 .../{ => withErrors}/InvisibleMember.kt | 0 .../{ => withErrors}/InvisibleMember.txt | 0 .../PropertyPlaceInClassObjectInObject.kt | 0 .../ResolveClassNameInCallExpression.kt | 0 .../ResolveClassNameInCallExpression.txt | 0 .../TopLevelClassVsLocalClassQualifier.kt | 0 .../TopLevelClassVsLocalClassQualifier.txt | 0 .../TypeArgumentBeforeDot2.kt | 0 .../TypeArgumentBeforeDot2.txt | 0 .../TypeArgumentUnresolvedClass.kt | 0 .../TypeArgumentUnresolvedClass.txt | 0 .../TypeArgumentUnresolvedConstructor.kt | 0 .../TypeArgumentUnresolvedConstructor.txt | 0 .../TypeArgumentWrongNumber.kt | 0 .../TypeArgumentWrongNumber.txt | 0 .../WrongNumberOfTypeArguments.kt | 0 .../WrongNumberOfTypeArguments.txt | 0 .../WrongNumberOfTypeArguments2.kt | 0 .../WrongNumberOfTypeArguments2.txt | 0 .../WrongNumberOfTypeArguments3.kt | 0 .../WrongNumberOfTypeArguments3.txt | 0 .../WrongNumberOfTypeArguments4.kt | 0 .../WrongNumberOfTypeArguments4.txt | 0 .../WrongNumberOfTypeArgumentsInSupertype.kt | 0 .../WrongNumberOfTypeArgumentsInSupertype.txt | 0 .../tests/analysis/api/analysisApi.kt | 15 +- .../generators/tests/analysis/api/dsl/dsl.kt | 35 +- .../kotlin/generators/TestGenerationDSL.kt | 5 +- ...ModelTestAllFilesPresentMethodGenerator.kt | 2 +- .../generators/model/SimpleTestClassModel.kt | 5 +- 74 files changed, 335 insertions(+), 465 deletions(-) rename analysis/analysis-api/testData/referenceResolve/arrayAccess/{ => withErrors}/getFunction.kt (100%) rename analysis/analysis-api/testData/referenceResolve/arrayAccess/{ => withErrors}/getFunction.txt (100%) rename analysis/analysis-api/testData/referenceResolve/arrayAccess/{ => withErrors}/setFunction.kt (100%) rename analysis/analysis-api/testData/referenceResolve/arrayAccess/{ => withErrors}/setFunction.txt (100%) rename analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/{ => withErrors}/unresolved.kt (100%) rename analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/{ => withErrors}/nextMissing.kt (100%) rename analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/{ => withErrors}/nextMissing.txt (100%) rename analysis/analysis-api/testData/referenceResolve/forLoopIn/{ => withErrors}/unresolvedIterator.kt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/lambdaAndParensIncorrectVararg.kt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/lambdaAndParensIncorrectVararg.txt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/lambdaNoParIncorrectVararg.kt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/lambdaNoParIncorrectVararg.txt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/lambdaNoParLabelIncorrectVararg.kt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/lambdaNoParLabelIncorrectVararg.txt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/lambdaNoParRCurlyIncorrectVararg.kt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/lambdaNoParRCurlyIncorrectVararg.txt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/nonemptyLambdaRParIncorrectVararg.kt (100%) rename analysis/analysis-api/testData/referenceResolve/invoke/{ => withErrors}/nonemptyLambdaRParIncorrectVararg.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/AnnotationParameter.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/AnnotationParameter.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/ClassNameBeforeDot.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/ClassNameBeforeDot.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/CollectionLiteralLeft.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/CollectionLiteralLeft.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/CollectionLiteralRight.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/CollectionLiteralRight.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/CoroutineSuspensionPoint.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/CoroutineSuspensionPoint.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/DeprecatedHidden.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/FakeJavaLang1.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/FakeJavaLang2.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/FakeJavaLang3.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/FakeJavaLang4.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/InObjectClassObject.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/InObjectClassObject.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/InSecondClassObject.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/InSecondClassObject.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/InvisibleMember.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/InvisibleMember.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/PropertyPlaceInClassObjectInObject.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/ResolveClassNameInCallExpression.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/ResolveClassNameInCallExpression.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TopLevelClassVsLocalClassQualifier.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TopLevelClassVsLocalClassQualifier.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TypeArgumentBeforeDot2.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TypeArgumentBeforeDot2.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TypeArgumentUnresolvedClass.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TypeArgumentUnresolvedClass.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TypeArgumentUnresolvedConstructor.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TypeArgumentUnresolvedConstructor.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TypeArgumentWrongNumber.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/TypeArgumentWrongNumber.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArguments.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArguments.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArguments2.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArguments2.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArguments3.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArguments3.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArguments4.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArguments4.txt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArgumentsInSupertype.kt (100%) rename analysis/analysis-api/testData/referenceResolve/{ => withErrors}/WrongNumberOfTypeArgumentsInSupertype.txt (100%) diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java index a5c094faccd..25e29dca702 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java @@ -31,7 +31,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer @Test public void testAllFilesPresentInReferenceResolve() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -58,12 +58,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.kt"); } - @Test - @TestMetadata("AnnotationParameter.kt") - public void testAnnotationParameter() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/AnnotationParameter.kt"); - } - @Test @TestMetadata("AnnotationTypeParameter.kt") public void testAnnotationTypeParameter() throws Exception { @@ -76,12 +70,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/ClassInTypeConstraint.kt"); } - @Test - @TestMetadata("ClassNameBeforeDot.kt") - public void testClassNameBeforeDot() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/ClassNameBeforeDot.kt"); - } - @Test @TestMetadata("ClassObjectClassLiteralReference.kt") public void testClassObjectClassLiteralReference() throws Exception { @@ -106,24 +94,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/ClassReferenceInImport.kt"); } - @Test - @TestMetadata("CollectionLiteralLeft.kt") - public void testCollectionLiteralLeft() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/CollectionLiteralLeft.kt"); - } - - @Test - @TestMetadata("CollectionLiteralRight.kt") - public void testCollectionLiteralRight() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/CollectionLiteralRight.kt"); - } - - @Test - @TestMetadata("CoroutineSuspensionPoint.kt") - public void testCoroutineSuspensionPoint() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/CoroutineSuspensionPoint.kt"); - } - @Test @TestMetadata("CtrlClickResolve.kt") public void testCtrlClickResolve() throws Exception { @@ -166,12 +136,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/Deprecated.kt"); } - @Test - @TestMetadata("DeprecatedHidden.kt") - public void testDeprecatedHidden() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/DeprecatedHidden.kt"); - } - @Test @TestMetadata("EnumValues.kt") public void testEnumValues() throws Exception { @@ -184,30 +148,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/ExternalCompanionObject.kt"); } - @Test - @TestMetadata("FakeJavaLang1.kt") - public void testFakeJavaLang1() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/FakeJavaLang1.kt"); - } - - @Test - @TestMetadata("FakeJavaLang2.kt") - public void testFakeJavaLang2() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/FakeJavaLang2.kt"); - } - - @Test - @TestMetadata("FakeJavaLang3.kt") - public void testFakeJavaLang3() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/FakeJavaLang3.kt"); - } - - @Test - @TestMetadata("FakeJavaLang4.kt") - public void testFakeJavaLang4() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/FakeJavaLang4.kt"); - } - @Test @TestMetadata("functionCall.kt") public void testFunctionCall() throws Exception { @@ -286,18 +226,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/InMethodVarargParameter.kt"); } - @Test - @TestMetadata("InObjectClassObject.kt") - public void testInObjectClassObject() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/InObjectClassObject.kt"); - } - - @Test - @TestMetadata("InSecondClassObject.kt") - public void testInSecondClassObject() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/InSecondClassObject.kt"); - } - @Test @TestMetadata("InVaragReferenceInFunctionBody.kt") public void testInVaragReferenceInFunctionBody() throws Exception { @@ -310,12 +238,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/InVaragReferenceInNamedParameter.kt"); } - @Test - @TestMetadata("InvisibleMember.kt") - public void testInvisibleMember() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/InvisibleMember.kt"); - } - @Test @TestMetadata("JavaAnnotationParameter.kt") public void testJavaAnnotationParameter() throws Exception { @@ -394,12 +316,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/parameterByName.kt"); } - @Test - @TestMetadata("PropertyPlaceInClassObjectInObject.kt") - public void testPropertyPlaceInClassObjectInObject() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/PropertyPlaceInClassObjectInObject.kt"); - } - @Test @TestMetadata("ReferenceInClassWhereConstraint.kt") public void testReferenceInClassWhereConstraint() throws Exception { @@ -424,12 +340,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/ResolveClass.kt"); } - @Test - @TestMetadata("ResolveClassNameInCallExpression.kt") - public void testResolveClassNameInCallExpression() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/ResolveClassNameInCallExpression.kt"); - } - @Test @TestMetadata("ResolvePackageInProperty.kt") public void testResolvePackageInProperty() throws Exception { @@ -538,12 +448,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/TopLevelClassVsLocalClassConstructor2.kt"); } - @Test - @TestMetadata("TopLevelClassVsLocalClassQualifier.kt") - public void testTopLevelClassVsLocalClassQualifier() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TopLevelClassVsLocalClassQualifier.kt"); - } - @Test @TestMetadata("TopLevelCompanionObjectVsLocalClassConstructor.kt") public void testTopLevelCompanionObjectVsLocalClassConstructor() throws Exception { @@ -610,73 +514,19 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot.kt"); } - @Test - @TestMetadata("TypeArgumentBeforeDot2.kt") - public void testTypeArgumentBeforeDot2() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot2.kt"); - } - - @Test - @TestMetadata("TypeArgumentUnresolvedClass.kt") - public void testTypeArgumentUnresolvedClass() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedClass.kt"); - } - - @Test - @TestMetadata("TypeArgumentUnresolvedConstructor.kt") - public void testTypeArgumentUnresolvedConstructor() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedConstructor.kt"); - } - - @Test - @TestMetadata("TypeArgumentWrongNumber.kt") - public void testTypeArgumentWrongNumber() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentWrongNumber.kt"); - } - @Test @TestMetadata("ValueParameter.kt") public void testValueParameter() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/ValueParameter.kt"); } - @Test - @TestMetadata("WrongNumberOfTypeArguments.kt") - public void testWrongNumberOfTypeArguments() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments.kt"); - } - - @Test - @TestMetadata("WrongNumberOfTypeArguments2.kt") - public void testWrongNumberOfTypeArguments2() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments2.kt"); - } - - @Test - @TestMetadata("WrongNumberOfTypeArguments3.kt") - public void testWrongNumberOfTypeArguments3() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments3.kt"); - } - - @Test - @TestMetadata("WrongNumberOfTypeArguments4.kt") - public void testWrongNumberOfTypeArguments4() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments4.kt"); - } - - @Test - @TestMetadata("WrongNumberOfTypeArgumentsInSupertype.kt") - public void testWrongNumberOfTypeArgumentsInSupertype() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArgumentsInSupertype.kt"); - } - @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/arrayAccess") @TestDataPath("$PROJECT_ROOT") public class ArrayAccess { @Test public void testAllFilesPresentInArrayAccess() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/arrayAccess"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/arrayAccess"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -685,12 +535,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/get.kt"); } - @Test - @TestMetadata("getFunction.kt") - public void testGetFunction() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/getFunction.kt"); - } - @Test @TestMetadata("getOperator.kt") public void testGetOperator() throws Exception { @@ -703,12 +547,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/set.kt"); } - @Test - @TestMetadata("setFunction.kt") - public void testSetFunction() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/setFunction.kt"); - } - @Test @TestMetadata("setOperator.kt") public void testSetOperator() throws Exception { @@ -722,7 +560,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class ConstructorDelegatingReference { @Test public void testAllFilesPresentInConstructorDelegatingReference() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/constructorDelegatingReference"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/constructorDelegatingReference"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -744,13 +582,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class DelegatedPropertyAccessors { @Test public void testAllFilesPresentInDelegatedPropertyAccessors() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("unresolved.kt") - public void testUnresolved() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/unresolved.kt"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Nested @@ -759,7 +591,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class InSource { @Test public void testAllFilesPresentInInSource() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -793,7 +625,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class InStandardLibrary { @Test public void testAllFilesPresentInInStandardLibrary() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -816,13 +648,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class ForLoopIn { @Test public void testAllFilesPresentInForLoopIn() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("unresolvedIterator.kt") - public void testUnresolvedIterator() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/forLoopIn/unresolvedIterator.kt"); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Nested @@ -831,7 +657,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class InBuiltIns { @Test public void testAllFilesPresentInInBuiltIns() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -853,7 +679,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class InLibrary { @Test public void testAllFilesPresentInInLibrary() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn/inLibrary"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn/inLibrary"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -875,7 +701,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer @Test public void testAllFilesPresentInInSource() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -883,12 +709,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public void testAllMembers() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.kt"); } - - @Test - @TestMetadata("nextMissing.kt") - public void testNextMissing() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.kt"); - } } } @@ -898,7 +718,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class InImport { @Test public void testAllFilesPresentInInImport() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/inImport"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/inImport"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -962,7 +782,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class Invoke { @Test public void testAllFilesPresentInInvoke() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/invoke"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/invoke"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -971,48 +791,24 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaAndParens.kt"); } - @Test - @TestMetadata("lambdaAndParensIncorrectVararg.kt") - public void testLambdaAndParensIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaAndParensIncorrectVararg.kt"); - } - @Test @TestMetadata("lambdaNoPar.kt") public void testLambdaNoPar() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoPar.kt"); } - @Test - @TestMetadata("lambdaNoParIncorrectVararg.kt") - public void testLambdaNoParIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParIncorrectVararg.kt"); - } - @Test @TestMetadata("lambdaNoParLabel.kt") public void testLambdaNoParLabel() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParLabel.kt"); } - @Test - @TestMetadata("lambdaNoParLabelIncorrectVararg.kt") - public void testLambdaNoParLabelIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParLabelIncorrectVararg.kt"); - } - @Test @TestMetadata("lambdaNoParRCurly.kt") public void testLambdaNoParRCurly() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParRCurly.kt"); } - @Test - @TestMetadata("lambdaNoParRCurlyIncorrectVararg.kt") - public void testLambdaNoParRCurlyIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParRCurlyIncorrectVararg.kt"); - } - @Test @TestMetadata("noParams.kt") public void testNoParams() throws Exception { @@ -1031,12 +827,6 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer runTest("analysis/analysis-api/testData/referenceResolve/invoke/nonemptyLambdaRPar.kt"); } - @Test - @TestMetadata("nonemptyLambdaRParIncorrectVararg.kt") - public void testNonemptyLambdaRParIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/nonemptyLambdaRParIncorrectVararg.kt"); - } - @Test @TestMetadata("oneParam.kt") public void testOneParam() throws Exception { @@ -1056,7 +846,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class NestedTypes { @Test public void testAllFilesPresentInNestedTypes() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/nestedTypes"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/nestedTypes"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -1138,7 +928,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class PackageReference { @Test public void testAllFilesPresentInPackageReference() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/packageReference"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/packageReference"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -1172,7 +962,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class QualifiedAccess { @Test public void testAllFilesPresentInQualifiedAccess() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/qualifiedAccess"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/qualifiedAccess"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test @@ -1230,7 +1020,7 @@ public class FirLibrarySourceReferenceResolveTestGenerated extends AbstractRefer public class TypeParameter { @Test public void testAllFilesPresentInTypeParameter() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/typeParameter"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/typeParameter"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); } @Test diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java index c051b81f6ea..b967d95b206 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java @@ -58,12 +58,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/AnnotationOnFileWithImport.kt"); } - @Test - @TestMetadata("AnnotationParameter.kt") - public void testAnnotationParameter() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/AnnotationParameter.kt"); - } - @Test @TestMetadata("AnnotationTypeParameter.kt") public void testAnnotationTypeParameter() throws Exception { @@ -76,12 +70,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/ClassInTypeConstraint.kt"); } - @Test - @TestMetadata("ClassNameBeforeDot.kt") - public void testClassNameBeforeDot() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/ClassNameBeforeDot.kt"); - } - @Test @TestMetadata("ClassObjectClassLiteralReference.kt") public void testClassObjectClassLiteralReference() throws Exception { @@ -106,24 +94,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/ClassReferenceInImport.kt"); } - @Test - @TestMetadata("CollectionLiteralLeft.kt") - public void testCollectionLiteralLeft() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/CollectionLiteralLeft.kt"); - } - - @Test - @TestMetadata("CollectionLiteralRight.kt") - public void testCollectionLiteralRight() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/CollectionLiteralRight.kt"); - } - - @Test - @TestMetadata("CoroutineSuspensionPoint.kt") - public void testCoroutineSuspensionPoint() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/CoroutineSuspensionPoint.kt"); - } - @Test @TestMetadata("CtrlClickResolve.kt") public void testCtrlClickResolve() throws Exception { @@ -166,12 +136,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/Deprecated.kt"); } - @Test - @TestMetadata("DeprecatedHidden.kt") - public void testDeprecatedHidden() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/DeprecatedHidden.kt"); - } - @Test @TestMetadata("EnumValues.kt") public void testEnumValues() throws Exception { @@ -184,30 +148,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/ExternalCompanionObject.kt"); } - @Test - @TestMetadata("FakeJavaLang1.kt") - public void testFakeJavaLang1() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/FakeJavaLang1.kt"); - } - - @Test - @TestMetadata("FakeJavaLang2.kt") - public void testFakeJavaLang2() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/FakeJavaLang2.kt"); - } - - @Test - @TestMetadata("FakeJavaLang3.kt") - public void testFakeJavaLang3() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/FakeJavaLang3.kt"); - } - - @Test - @TestMetadata("FakeJavaLang4.kt") - public void testFakeJavaLang4() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/FakeJavaLang4.kt"); - } - @Test @TestMetadata("functionCall.kt") public void testFunctionCall() throws Exception { @@ -286,18 +226,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/InMethodVarargParameter.kt"); } - @Test - @TestMetadata("InObjectClassObject.kt") - public void testInObjectClassObject() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/InObjectClassObject.kt"); - } - - @Test - @TestMetadata("InSecondClassObject.kt") - public void testInSecondClassObject() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/InSecondClassObject.kt"); - } - @Test @TestMetadata("InVaragReferenceInFunctionBody.kt") public void testInVaragReferenceInFunctionBody() throws Exception { @@ -310,12 +238,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/InVaragReferenceInNamedParameter.kt"); } - @Test - @TestMetadata("InvisibleMember.kt") - public void testInvisibleMember() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/InvisibleMember.kt"); - } - @Test @TestMetadata("JavaAnnotationParameter.kt") public void testJavaAnnotationParameter() throws Exception { @@ -394,12 +316,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/parameterByName.kt"); } - @Test - @TestMetadata("PropertyPlaceInClassObjectInObject.kt") - public void testPropertyPlaceInClassObjectInObject() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/PropertyPlaceInClassObjectInObject.kt"); - } - @Test @TestMetadata("ReferenceInClassWhereConstraint.kt") public void testReferenceInClassWhereConstraint() throws Exception { @@ -424,12 +340,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/ResolveClass.kt"); } - @Test - @TestMetadata("ResolveClassNameInCallExpression.kt") - public void testResolveClassNameInCallExpression() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/ResolveClassNameInCallExpression.kt"); - } - @Test @TestMetadata("ResolvePackageInProperty.kt") public void testResolvePackageInProperty() throws Exception { @@ -538,12 +448,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/TopLevelClassVsLocalClassConstructor2.kt"); } - @Test - @TestMetadata("TopLevelClassVsLocalClassQualifier.kt") - public void testTopLevelClassVsLocalClassQualifier() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TopLevelClassVsLocalClassQualifier.kt"); - } - @Test @TestMetadata("TopLevelCompanionObjectVsLocalClassConstructor.kt") public void testTopLevelCompanionObjectVsLocalClassConstructor() throws Exception { @@ -610,66 +514,12 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot.kt"); } - @Test - @TestMetadata("TypeArgumentBeforeDot2.kt") - public void testTypeArgumentBeforeDot2() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot2.kt"); - } - - @Test - @TestMetadata("TypeArgumentUnresolvedClass.kt") - public void testTypeArgumentUnresolvedClass() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedClass.kt"); - } - - @Test - @TestMetadata("TypeArgumentUnresolvedConstructor.kt") - public void testTypeArgumentUnresolvedConstructor() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedConstructor.kt"); - } - - @Test - @TestMetadata("TypeArgumentWrongNumber.kt") - public void testTypeArgumentWrongNumber() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/TypeArgumentWrongNumber.kt"); - } - @Test @TestMetadata("ValueParameter.kt") public void testValueParameter() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/ValueParameter.kt"); } - @Test - @TestMetadata("WrongNumberOfTypeArguments.kt") - public void testWrongNumberOfTypeArguments() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments.kt"); - } - - @Test - @TestMetadata("WrongNumberOfTypeArguments2.kt") - public void testWrongNumberOfTypeArguments2() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments2.kt"); - } - - @Test - @TestMetadata("WrongNumberOfTypeArguments3.kt") - public void testWrongNumberOfTypeArguments3() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments3.kt"); - } - - @Test - @TestMetadata("WrongNumberOfTypeArguments4.kt") - public void testWrongNumberOfTypeArguments4() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments4.kt"); - } - - @Test - @TestMetadata("WrongNumberOfTypeArgumentsInSupertype.kt") - public void testWrongNumberOfTypeArgumentsInSupertype() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArgumentsInSupertype.kt"); - } - @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/arrayAccess") @TestDataPath("$PROJECT_ROOT") @@ -685,12 +535,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/get.kt"); } - @Test - @TestMetadata("getFunction.kt") - public void testGetFunction() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/getFunction.kt"); - } - @Test @TestMetadata("getOperator.kt") public void testGetOperator() throws Exception { @@ -703,17 +547,33 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/set.kt"); } - @Test - @TestMetadata("setFunction.kt") - public void testSetFunction() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/setFunction.kt"); - } - @Test @TestMetadata("setOperator.kt") public void testSetOperator() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/setOperator.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors") + @TestDataPath("$PROJECT_ROOT") + public class WithErrors { + @Test + public void testAllFilesPresentInWithErrors() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("getFunction.kt") + public void testGetFunction() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/getFunction.kt"); + } + + @Test + @TestMetadata("setFunction.kt") + public void testSetFunction() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/setFunction.kt"); + } + } } @Nested @@ -747,12 +607,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } - @Test - @TestMetadata("unresolved.kt") - public void testUnresolved() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/unresolved.kt"); - } - @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inSource") @TestDataPath("$PROJECT_ROOT") @@ -808,6 +662,22 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary/notNull.kt"); } } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors") + @TestDataPath("$PROJECT_ROOT") + public class WithErrors { + @Test + public void testAllFilesPresentInWithErrors() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("unresolved.kt") + public void testUnresolved() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.kt"); + } + } } @Nested @@ -819,12 +689,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } - @Test - @TestMetadata("unresolvedIterator.kt") - public void testUnresolvedIterator() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/forLoopIn/unresolvedIterator.kt"); - } - @Nested @TestMetadata("analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns") @TestDataPath("$PROJECT_ROOT") @@ -884,10 +748,36 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allMembers.kt"); } + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/withErrors") + @TestDataPath("$PROJECT_ROOT") + public class WithErrors { + @Test + public void testAllFilesPresentInWithErrors() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/withErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("nextMissing.kt") + public void testNextMissing() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/withErrors/nextMissing.kt"); + } + } + } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors") + @TestDataPath("$PROJECT_ROOT") + public class WithErrors { @Test - @TestMetadata("nextMissing.kt") - public void testNextMissing() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.kt"); + public void testAllFilesPresentInWithErrors() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("unresolvedIterator.kt") + public void testUnresolvedIterator() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.kt"); } } } @@ -971,48 +861,24 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaAndParens.kt"); } - @Test - @TestMetadata("lambdaAndParensIncorrectVararg.kt") - public void testLambdaAndParensIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaAndParensIncorrectVararg.kt"); - } - @Test @TestMetadata("lambdaNoPar.kt") public void testLambdaNoPar() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoPar.kt"); } - @Test - @TestMetadata("lambdaNoParIncorrectVararg.kt") - public void testLambdaNoParIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParIncorrectVararg.kt"); - } - @Test @TestMetadata("lambdaNoParLabel.kt") public void testLambdaNoParLabel() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParLabel.kt"); } - @Test - @TestMetadata("lambdaNoParLabelIncorrectVararg.kt") - public void testLambdaNoParLabelIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParLabelIncorrectVararg.kt"); - } - @Test @TestMetadata("lambdaNoParRCurly.kt") public void testLambdaNoParRCurly() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParRCurly.kt"); } - @Test - @TestMetadata("lambdaNoParRCurlyIncorrectVararg.kt") - public void testLambdaNoParRCurlyIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParRCurlyIncorrectVararg.kt"); - } - @Test @TestMetadata("noParams.kt") public void testNoParams() throws Exception { @@ -1031,12 +897,6 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/invoke/nonemptyLambdaRPar.kt"); } - @Test - @TestMetadata("nonemptyLambdaRParIncorrectVararg.kt") - public void testNonemptyLambdaRParIncorrectVararg() throws Exception { - runTest("analysis/analysis-api/testData/referenceResolve/invoke/nonemptyLambdaRParIncorrectVararg.kt"); - } - @Test @TestMetadata("oneParam.kt") public void testOneParam() throws Exception { @@ -1048,6 +908,46 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes public void testOneParamRPar() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/invoke/oneParamRPar.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/invoke/withErrors") + @TestDataPath("$PROJECT_ROOT") + public class WithErrors { + @Test + public void testAllFilesPresentInWithErrors() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/invoke/withErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("lambdaAndParensIncorrectVararg.kt") + public void testLambdaAndParensIncorrectVararg() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaAndParensIncorrectVararg.kt"); + } + + @Test + @TestMetadata("lambdaNoParIncorrectVararg.kt") + public void testLambdaNoParIncorrectVararg() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParIncorrectVararg.kt"); + } + + @Test + @TestMetadata("lambdaNoParLabelIncorrectVararg.kt") + public void testLambdaNoParLabelIncorrectVararg() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParLabelIncorrectVararg.kt"); + } + + @Test + @TestMetadata("lambdaNoParRCurlyIncorrectVararg.kt") + public void testLambdaNoParRCurlyIncorrectVararg() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParRCurlyIncorrectVararg.kt"); + } + + @Test + @TestMetadata("nonemptyLambdaRParIncorrectVararg.kt") + public void testNonemptyLambdaRParIncorrectVararg() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/invoke/withErrors/nonemptyLambdaRParIncorrectVararg.kt"); + } + } } @Nested @@ -1281,4 +1181,164 @@ public class FirSourceReferenceResolveTestGenerated extends AbstractReferenceRes runTest("analysis/analysis-api/testData/referenceResolve/typeParameter/TypeParameterInFunctionLiteral.kt"); } } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/withErrors") + @TestDataPath("$PROJECT_ROOT") + public class WithErrors { + @Test + public void testAllFilesPresentInWithErrors() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/withErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("AnnotationParameter.kt") + public void testAnnotationParameter() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.kt"); + } + + @Test + @TestMetadata("ClassNameBeforeDot.kt") + public void testClassNameBeforeDot() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/ClassNameBeforeDot.kt"); + } + + @Test + @TestMetadata("CollectionLiteralLeft.kt") + public void testCollectionLiteralLeft() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralLeft.kt"); + } + + @Test + @TestMetadata("CollectionLiteralRight.kt") + public void testCollectionLiteralRight() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralRight.kt"); + } + + @Test + @TestMetadata("CoroutineSuspensionPoint.kt") + public void testCoroutineSuspensionPoint() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.kt"); + } + + @Test + @TestMetadata("DeprecatedHidden.kt") + public void testDeprecatedHidden() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.kt"); + } + + @Test + @TestMetadata("FakeJavaLang1.kt") + public void testFakeJavaLang1() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.kt"); + } + + @Test + @TestMetadata("FakeJavaLang2.kt") + public void testFakeJavaLang2() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.kt"); + } + + @Test + @TestMetadata("FakeJavaLang3.kt") + public void testFakeJavaLang3() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.kt"); + } + + @Test + @TestMetadata("FakeJavaLang4.kt") + public void testFakeJavaLang4() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.kt"); + } + + @Test + @TestMetadata("InObjectClassObject.kt") + public void testInObjectClassObject() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/InObjectClassObject.kt"); + } + + @Test + @TestMetadata("InSecondClassObject.kt") + public void testInSecondClassObject() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/InSecondClassObject.kt"); + } + + @Test + @TestMetadata("InvisibleMember.kt") + public void testInvisibleMember() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/InvisibleMember.kt"); + } + + @Test + @TestMetadata("PropertyPlaceInClassObjectInObject.kt") + public void testPropertyPlaceInClassObjectInObject() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.kt"); + } + + @Test + @TestMetadata("ResolveClassNameInCallExpression.kt") + public void testResolveClassNameInCallExpression() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/ResolveClassNameInCallExpression.kt"); + } + + @Test + @TestMetadata("TopLevelClassVsLocalClassQualifier.kt") + public void testTopLevelClassVsLocalClassQualifier() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelClassVsLocalClassQualifier.kt"); + } + + @Test + @TestMetadata("TypeArgumentBeforeDot2.kt") + public void testTypeArgumentBeforeDot2() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentBeforeDot2.kt"); + } + + @Test + @TestMetadata("TypeArgumentUnresolvedClass.kt") + public void testTypeArgumentUnresolvedClass() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedClass.kt"); + } + + @Test + @TestMetadata("TypeArgumentUnresolvedConstructor.kt") + public void testTypeArgumentUnresolvedConstructor() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedConstructor.kt"); + } + + @Test + @TestMetadata("TypeArgumentWrongNumber.kt") + public void testTypeArgumentWrongNumber() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentWrongNumber.kt"); + } + + @Test + @TestMetadata("WrongNumberOfTypeArguments.kt") + public void testWrongNumberOfTypeArguments() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments.kt"); + } + + @Test + @TestMetadata("WrongNumberOfTypeArguments2.kt") + public void testWrongNumberOfTypeArguments2() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments2.kt"); + } + + @Test + @TestMetadata("WrongNumberOfTypeArguments3.kt") + public void testWrongNumberOfTypeArguments3() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments3.kt"); + } + + @Test + @TestMetadata("WrongNumberOfTypeArguments4.kt") + public void testWrongNumberOfTypeArguments4() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments4.kt"); + } + + @Test + @TestMetadata("WrongNumberOfTypeArgumentsInSupertype.kt") + public void testWrongNumberOfTypeArgumentsInSupertype() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArgumentsInSupertype.kt"); + } + } } diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationTypeParameter.kt b/analysis/analysis-api/testData/referenceResolve/AnnotationTypeParameter.kt index 657ba1183d1..9c3e8ca5ff6 100644 --- a/analysis/analysis-api/testData/referenceResolve/AnnotationTypeParameter.kt +++ b/analysis/analysis-api/testData/referenceResolve/AnnotationTypeParameter.kt @@ -1,6 +1,8 @@ package testing -annotation class Annotation(val clazz: Class) +import kotlin.reflect.KClass + +annotation class Annotation(val clazz: KClass) class ATest @[Annotation<ATest>(ATest::class)] diff --git a/analysis/analysis-api/testData/referenceResolve/arrayAccess/getFunction.kt b/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/getFunction.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/arrayAccess/getFunction.kt rename to analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/getFunction.kt diff --git a/analysis/analysis-api/testData/referenceResolve/arrayAccess/getFunction.txt b/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/getFunction.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/arrayAccess/getFunction.txt rename to analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/getFunction.txt diff --git a/analysis/analysis-api/testData/referenceResolve/arrayAccess/setFunction.kt b/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/setFunction.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/arrayAccess/setFunction.kt rename to analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/setFunction.kt diff --git a/analysis/analysis-api/testData/referenceResolve/arrayAccess/setFunction.txt b/analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/setFunction.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/arrayAccess/setFunction.txt rename to analysis/analysis-api/testData/referenceResolve/arrayAccess/withErrors/setFunction.txt diff --git a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/unresolved.kt b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/unresolved.kt rename to analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/withErrors/unresolved.kt diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.kt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.kt index 99670458956..02b5a9a3d3a 100644 --- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.kt +++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.kt @@ -3,10 +3,10 @@ fun test(f: Foo) { } interface Foo -fun Foo.iterator(): Iterator = TODO() +operator fun Foo.iterator(): Iterator = TODO() interface Iterator -fun Iterator.next(): Any= TODO() -fun Iterator.hasNext(): Boolean = TODO() +operator fun Iterator.next(): Any= TODO() +operator fun Iterator.hasNext(): Boolean = TODO() diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.txt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.txt index dd90f4fad0a..e0b279be8fa 100644 --- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.txt +++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/allExtensions.txt @@ -1,4 +1,4 @@ Resolved to: -0: (in ROOT) fun Foo.iterator(): Iterator -1: (in ROOT) fun Iterator.hasNext(): kotlin.Boolean -2: (in ROOT) fun Iterator.next(): kotlin.Any \ No newline at end of file +0: (in ROOT) operator fun Foo.iterator(): Iterator +1: (in ROOT) operator fun Iterator.hasNext(): kotlin.Boolean +2: (in ROOT) operator fun Iterator.next(): kotlin.Any \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.kt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/withErrors/nextMissing.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.kt rename to analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/withErrors/nextMissing.kt diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.txt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/withErrors/nextMissing.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/nextMissing.txt rename to analysis/analysis-api/testData/referenceResolve/forLoopIn/inSource/withErrors/nextMissing.txt diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/unresolvedIterator.kt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/forLoopIn/unresolvedIterator.kt rename to analysis/analysis-api/testData/referenceResolve/forLoopIn/withErrors/unresolvedIterator.kt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/lambdaAndParensIncorrectVararg.kt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaAndParensIncorrectVararg.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/lambdaAndParensIncorrectVararg.kt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaAndParensIncorrectVararg.kt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/lambdaAndParensIncorrectVararg.txt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaAndParensIncorrectVararg.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/lambdaAndParensIncorrectVararg.txt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaAndParensIncorrectVararg.txt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParIncorrectVararg.kt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParIncorrectVararg.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParIncorrectVararg.kt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParIncorrectVararg.kt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParIncorrectVararg.txt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParIncorrectVararg.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParIncorrectVararg.txt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParIncorrectVararg.txt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParLabelIncorrectVararg.kt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParLabelIncorrectVararg.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParLabelIncorrectVararg.kt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParLabelIncorrectVararg.kt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParLabelIncorrectVararg.txt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParLabelIncorrectVararg.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParLabelIncorrectVararg.txt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParLabelIncorrectVararg.txt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParRCurlyIncorrectVararg.kt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParRCurlyIncorrectVararg.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParRCurlyIncorrectVararg.kt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParRCurlyIncorrectVararg.kt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParRCurlyIncorrectVararg.txt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParRCurlyIncorrectVararg.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/lambdaNoParRCurlyIncorrectVararg.txt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/lambdaNoParRCurlyIncorrectVararg.txt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/nonemptyLambdaRParIncorrectVararg.kt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/nonemptyLambdaRParIncorrectVararg.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/nonemptyLambdaRParIncorrectVararg.kt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/nonemptyLambdaRParIncorrectVararg.kt diff --git a/analysis/analysis-api/testData/referenceResolve/invoke/nonemptyLambdaRParIncorrectVararg.txt b/analysis/analysis-api/testData/referenceResolve/invoke/withErrors/nonemptyLambdaRParIncorrectVararg.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/invoke/nonemptyLambdaRParIncorrectVararg.txt rename to analysis/analysis-api/testData/referenceResolve/invoke/withErrors/nonemptyLambdaRParIncorrectVararg.txt diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.kt b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.kt index d6b914451e4..12e3bf88714 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.kt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.kt @@ -1 +1,3 @@ -fun function(t: T) where T : Int, T : Sequence = TODO() +fun function(t: T): String where T : A, T : Sequence = TODO() + +interface A \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt index 7398b0f1970..64162b865af 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt @@ -1,2 +1,2 @@ Resolved to: -0: T : kotlin.Int \ No newline at end of file +0: T : A \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationParameter.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/AnnotationParameter.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.kt diff --git a/analysis/analysis-api/testData/referenceResolve/AnnotationParameter.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/AnnotationParameter.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/AnnotationParameter.txt diff --git a/analysis/analysis-api/testData/referenceResolve/ClassNameBeforeDot.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/ClassNameBeforeDot.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/ClassNameBeforeDot.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/ClassNameBeforeDot.kt diff --git a/analysis/analysis-api/testData/referenceResolve/ClassNameBeforeDot.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/ClassNameBeforeDot.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/ClassNameBeforeDot.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/ClassNameBeforeDot.txt diff --git a/analysis/analysis-api/testData/referenceResolve/CollectionLiteralLeft.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralLeft.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/CollectionLiteralLeft.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralLeft.kt diff --git a/analysis/analysis-api/testData/referenceResolve/CollectionLiteralLeft.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralLeft.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/CollectionLiteralLeft.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralLeft.txt diff --git a/analysis/analysis-api/testData/referenceResolve/CollectionLiteralRight.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralRight.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/CollectionLiteralRight.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralRight.kt diff --git a/analysis/analysis-api/testData/referenceResolve/CollectionLiteralRight.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralRight.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/CollectionLiteralRight.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/CollectionLiteralRight.txt diff --git a/analysis/analysis-api/testData/referenceResolve/CoroutineSuspensionPoint.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/CoroutineSuspensionPoint.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.kt diff --git a/analysis/analysis-api/testData/referenceResolve/CoroutineSuspensionPoint.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/CoroutineSuspensionPoint.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.txt diff --git a/analysis/analysis-api/testData/referenceResolve/DeprecatedHidden.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/DeprecatedHidden.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/DeprecatedHidden.kt diff --git a/analysis/analysis-api/testData/referenceResolve/FakeJavaLang1.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/FakeJavaLang1.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang1.kt diff --git a/analysis/analysis-api/testData/referenceResolve/FakeJavaLang2.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/FakeJavaLang2.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang2.kt diff --git a/analysis/analysis-api/testData/referenceResolve/FakeJavaLang3.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/FakeJavaLang3.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang3.kt diff --git a/analysis/analysis-api/testData/referenceResolve/FakeJavaLang4.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/FakeJavaLang4.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/FakeJavaLang4.kt diff --git a/analysis/analysis-api/testData/referenceResolve/InObjectClassObject.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/InObjectClassObject.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/InObjectClassObject.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/InObjectClassObject.kt diff --git a/analysis/analysis-api/testData/referenceResolve/InObjectClassObject.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/InObjectClassObject.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/InObjectClassObject.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/InObjectClassObject.txt diff --git a/analysis/analysis-api/testData/referenceResolve/InSecondClassObject.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/InSecondClassObject.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/InSecondClassObject.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/InSecondClassObject.kt diff --git a/analysis/analysis-api/testData/referenceResolve/InSecondClassObject.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/InSecondClassObject.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/InSecondClassObject.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/InSecondClassObject.txt diff --git a/analysis/analysis-api/testData/referenceResolve/InvisibleMember.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/InvisibleMember.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/InvisibleMember.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/InvisibleMember.kt diff --git a/analysis/analysis-api/testData/referenceResolve/InvisibleMember.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/InvisibleMember.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/InvisibleMember.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/InvisibleMember.txt diff --git a/analysis/analysis-api/testData/referenceResolve/PropertyPlaceInClassObjectInObject.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/PropertyPlaceInClassObjectInObject.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/PropertyPlaceInClassObjectInObject.kt diff --git a/analysis/analysis-api/testData/referenceResolve/ResolveClassNameInCallExpression.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/ResolveClassNameInCallExpression.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/ResolveClassNameInCallExpression.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/ResolveClassNameInCallExpression.kt diff --git a/analysis/analysis-api/testData/referenceResolve/ResolveClassNameInCallExpression.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/ResolveClassNameInCallExpression.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/ResolveClassNameInCallExpression.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/ResolveClassNameInCallExpression.txt diff --git a/analysis/analysis-api/testData/referenceResolve/TopLevelClassVsLocalClassQualifier.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelClassVsLocalClassQualifier.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TopLevelClassVsLocalClassQualifier.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelClassVsLocalClassQualifier.kt diff --git a/analysis/analysis-api/testData/referenceResolve/TopLevelClassVsLocalClassQualifier.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelClassVsLocalClassQualifier.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TopLevelClassVsLocalClassQualifier.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TopLevelClassVsLocalClassQualifier.txt diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot2.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentBeforeDot2.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot2.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentBeforeDot2.kt diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot2.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentBeforeDot2.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TypeArgumentBeforeDot2.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentBeforeDot2.txt diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedClass.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedClass.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedClass.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedClass.kt diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedClass.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedClass.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedClass.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedClass.txt diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedConstructor.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedConstructor.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedConstructor.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedConstructor.kt diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedConstructor.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedConstructor.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TypeArgumentUnresolvedConstructor.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedConstructor.txt diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentWrongNumber.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentWrongNumber.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TypeArgumentWrongNumber.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentWrongNumber.kt diff --git a/analysis/analysis-api/testData/referenceResolve/TypeArgumentWrongNumber.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentWrongNumber.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/TypeArgumentWrongNumber.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentWrongNumber.txt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments.kt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments.txt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments2.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments2.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments2.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments2.kt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments2.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments2.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments2.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments2.txt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments3.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments3.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments3.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments3.kt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments3.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments3.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments3.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments3.txt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments4.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments4.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments4.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments4.kt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments4.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments4.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArguments4.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArguments4.txt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArgumentsInSupertype.kt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArgumentsInSupertype.kt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArgumentsInSupertype.kt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArgumentsInSupertype.kt diff --git a/analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArgumentsInSupertype.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArgumentsInSupertype.txt similarity index 100% rename from analysis/analysis-api/testData/referenceResolve/WrongNumberOfTypeArgumentsInSupertype.txt rename to analysis/analysis-api/testData/referenceResolve/withErrors/WrongNumberOfTypeArgumentsInSupertype.txt diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt index 5607ff9d18f..48368d59395 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt @@ -37,12 +37,12 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolBy import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest import org.jetbrains.kotlin.generators.TestGroupSuite -import org.jetbrains.kotlin.generators.tests.analysis.api.dsl.* import org.jetbrains.kotlin.generators.tests.analysis.api.dsl.TestModuleKind import org.jetbrains.kotlin.generators.tests.analysis.api.dsl.component import org.jetbrains.kotlin.generators.tests.analysis.api.dsl.group import org.jetbrains.kotlin.generators.tests.analysis.api.dsl.test import org.jetbrains.kotlin.generators.util.TestGeneratorUtil +import java.nio.file.Paths fun TestGroupSuite.generateAnalysisApiTests() { generateAnalysisApiComponentsTests() @@ -52,10 +52,17 @@ fun TestGroupSuite.generateAnalysisApiTests() { private fun TestGroupSuite.generateAnalysisApiNonComponentsTests() { test( AbstractReferenceResolveTest::class, - testModuleKinds = TestModuleKind.SOURCES_AND_LIBRARIES_SOURCES, + testModuleKinds = TestModuleKind.SOURCE_AND_LIBRARY_SOURCE, addFe10 = false, - ) { - model("referenceResolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) + ) { moduleKind -> + when (moduleKind) { + TestModuleKind.LIBRARY_SOURCE -> { + model("referenceResolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, excludeDirsRecursively = listOf("withErrors")) + } + else -> { + model("referenceResolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) + } + } } group("scopes") { diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/dsl.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/dsl.kt index db981d3f6ea..c4c8060688c 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/dsl.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/dsl/dsl.kt @@ -28,8 +28,8 @@ internal sealed class TestModuleKind(val componentName: String) { object LIBRARY_SOURCE : TestModuleKind("librarySource") companion object { - val SOURCES_ONLY = listOf(SOURCE) - val SOURCES_AND_LIBRARIES_SOURCES = listOf(SOURCE, LIBRARY_SOURCE) + val SOURCE_ONLY by lazy(LazyThreadSafetyMode.NONE) { listOf(SOURCE) } + val SOURCE_AND_LIBRARY_SOURCE by lazy(LazyThreadSafetyMode.NONE) { listOf(SOURCE, LIBRARY_SOURCE) } } } @@ -41,7 +41,7 @@ internal enum class Frontend(val prefix: String) { internal fun FirAndFe10TestGroup.test( baseClass: KClass<*>, generateFe10: Boolean = true, - init: TestGroup.TestClass.() -> Unit, + init: TestGroup.TestClass.(module: TestModuleKind) -> Unit, ) { analysisApiTest( "analysis/analysis-api-fir/tests", @@ -63,8 +63,8 @@ internal fun FirAndFe10TestGroup.test( internal fun TestGroupSuite.test( baseClass: KClass<*>, addFe10: Boolean = true, - testModuleKinds: List = TestModuleKind.SOURCES_ONLY, - init: TestGroup.TestClass.() -> Unit, + testModuleKinds: List = TestModuleKind.SOURCE_ONLY, + init: TestGroup.TestClass.(module: TestModuleKind) -> Unit, ) { FirAndFe10TestGroup(this, directory = null, testModuleKinds).test(baseClass, addFe10, init) } @@ -72,26 +72,24 @@ internal fun TestGroupSuite.test( internal fun TestGroupSuite.group( directory: String, - testModuleKinds: List = TestModuleKind.SOURCES_ONLY, init: FirAndFe10TestGroup.() -> Unit, ) { - FirAndFe10TestGroup(this, directory, testModuleKinds).init() + FirAndFe10TestGroup(this, directory, testModuleKinds = listOf(TestModuleKind.SOURCE)).init() } internal fun TestGroupSuite.component( directory: String, - moduleKinds: List = TestModuleKind.SOURCES_ONLY, init: FirAndFe10TestGroup.() -> Unit, ) { - group("components/$directory", moduleKinds, init) + group("components/$directory", init) } private fun FirAndFe10TestGroup.analysisApiTest( testRoot: String, frontend: Frontend, testClass: KClass<*>, - init: TestGroup.TestClass.() -> Unit, + init: TestGroup.TestClass.(module: TestModuleKind) -> Unit, ) { with(suite) { val fullTestPath = "analysis/analysis-api/testData" + directory?.let { "/$it" }.orEmpty() @@ -112,14 +110,19 @@ private fun TestGroup.analysisApiTestClass( moduleKind: TestModuleKind, testClass: KClass<*>, prefixNeeded: Boolean, - init: TestGroup.TestClass.() -> Unit + init: TestGroup.TestClass.(module: TestModuleKind) -> Unit ) { val fullPackage = getPackageName(frontend.prefix, testClass) - val suiteTestClassName = fullPackage + - frontend.prefix + - moduleKind.componentName.capitalizeAsciiOnly().takeIf { prefixNeeded }.orEmpty() + - getDefaultSuiteTestClassName(testClass.java.simpleName) + val suiteTestClassName = buildString { + append(fullPackage) + append(frontend.prefix) + moduleKind.componentName + .capitalizeAsciiOnly() + .takeIf { prefixNeeded } + ?.let(::append) + append(getDefaultSuiteTestClassName(testClass.java.simpleName)) + } getDefaultSuiteTestClassName(testClass.java.simpleName) @@ -131,7 +134,7 @@ private fun TestGroup.analysisApiTestClass( useJunit4 = false ) { method(FrontendConfiguratorTestModel(configurator)) - init() + init(moduleKind) } } diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt index 3ab2e8c66ca..ce579954f2d 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt @@ -82,6 +82,8 @@ class TestGroup( val annotations: List, val targetBackendComputer: TargetBackendComputer ) { + val testDataRoot: String + get() = this@TestGroup.testDataRoot val baseDir: String get() = this@TestGroup.testsRoot @@ -106,6 +108,7 @@ class TestGroup( // directives TARGET_BACKEND/DONT_TARGET_EXACT_BACKEND won't be generated targetBackend: TargetBackend? = null, excludeDirs: List = listOf(), + excludeDirsRecursively: List = listOf(), filenameStartsLowerCase: Boolean? = null, // assert that file is properly named skipIgnored: Boolean = false, // pretty meaningless flag, affects only few test names in one test runner deep: Int? = null, // specifies how deep recursive search will follow directory with testdata @@ -128,7 +131,7 @@ class TestGroup( SimpleTestClassModel( rootFile, recursive, excludeParentDirs, compiledPattern, compiledExcludedPattern, filenameStartsLowerCase, testMethod, className, - realTargetBackend, excludeDirs, skipIgnored, testRunnerMethodName, additionalRunnerArguments, deep, annotations, + realTargetBackend, excludeDirs, excludeDirsRecursively, skipIgnored, testRunnerMethodName, additionalRunnerArguments, deep, annotations, extractTagsFromDirectory(rootFile), methodModels ) } diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt index e28ded09f20..f5c6e159c5b 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt @@ -25,7 +25,7 @@ object SimpleTestClassModelTestAllFilesPresentMethodGenerator : MethodGenerator< override fun generateBody(method: SimpleTestClassModel.TestAllFilesPresentMethodModel, p: Printer) { with(method) { val exclude = StringBuilder() - for (dir in classModel.excludeDirs) { + for (dir in classModel.excludeDirs + classModel.excludeDirsRecursively) { exclude.append(", \"") exclude.append(StringUtil.escapeStringCharacters(dir)) exclude.append("\"") diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt index 7d1c6c348c4..7489b6e9ed2 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt @@ -25,6 +25,7 @@ class SimpleTestClassModel( private val testClassName: String, val targetBackend: TargetBackend, excludeDirs: Collection, + excludeDirsRecursively: Collection, private val skipIgnored: Boolean, private val testRunnerMethodName: String, private val additionalRunnerArguments: List, @@ -37,6 +38,7 @@ class SimpleTestClassModel( get() = testClassName val excludeDirs: Set = excludeDirs.toSet() + val excludeDirsRecursively: Set = excludeDirsRecursively.toSet() override val innerTestClasses: Collection by lazy { if (!rootFile.isDirectory || !recursive || deep != null && deep < 1) { @@ -45,7 +47,7 @@ class SimpleTestClassModel( val children = mutableListOf() val files = rootFile.listFiles() ?: return@lazy emptyList() for (file in files) { - if (file.isDirectory && dirHasFilesInside(file) && !excludeDirs.contains(file.name)) { + if (file.isDirectory && dirHasFilesInside(file) && !excludeDirs.contains(file.name) && !excludeDirsRecursively.contains(file.name)) { val innerTestClassName = fileNameToJavaIdentifier(file) children.add( SimpleTestClassModel( @@ -59,6 +61,7 @@ class SimpleTestClassModel( innerTestClassName, targetBackend, excludesStripOneDirectory(file.name), + excludeDirsRecursively, skipIgnored, testRunnerMethodName, additionalRunnerArguments,