From 87c9a656671b30b703e308e63e8b8dc981c102c8 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Apr 2013 17:33:24 +0400 Subject: [PATCH] Move all basic completion tests to common folder --- .../jet/generators/tests/GenerateTests.java | 10 +- .../basic/{ => common}/AutoCastAfterIf.kt | 0 .../{ => common}/AutoCastAfterIfMethod.kt | 0 .../basic/{ => common}/AutoCastForThis.kt | 0 .../basic/{ => common}/AutoCastInWhen.kt | 0 .../completion/basic/{ => common}/BasicAny.kt | 0 .../completion/basic/{ => common}/BasicInt.kt | 0 .../basic/{ => common}/BeforeDotInCall.kt | 0 .../basic/{ => common}/CallLocalLambda.kt | 0 .../basic/{ => common}/ClassRedeclaration1.kt | 0 .../basic/{ => common}/ClassRedeclaration2.kt | 0 .../basic/{ => common}/CompletionInSetter.kt | 0 .../DoNotCompleteForErrorReceivers.kt | 0 .../basic/{ => common}/ExtendClassName.kt | 0 .../{ => common}/ExtendQualifiedClassName.kt | 0 .../{ => common}/ExtensionForProperty.kt | 0 .../{ => common}/ExtensionFunReceiver.kt | 0 .../ExtensionWithAdditionalTypeParameters.kt | 0 .../ExtensionWithGenericParamInReceiver.kt | 0 .../ExtensionWithGenericReceiver.kt | 0 .../ExtensionWithInternalGenericParameters.kt | 0 .../ExtensionWithManyTypeParamsInReceiver.kt | 0 .../basic/{ => common}/FromImports.kt | 0 .../FunctionCompletionFormatting.kt | 0 .../basic/{ => common}/InCallExpression.kt | 0 .../basic/{ => common}/InClassInitializer.kt | 0 .../{ => common}/InClassPropertyAccessor.kt | 0 .../basic/{ => common}/InEmptyImport.kt | 0 .../{ => common}/InExpressionNoPrefix.kt | 0 .../{ => common}/InExtendTypeAnnotation.kt | 0 .../InFileWithMultiDeclaration.kt | 0 .../basic/{ => common}/InFileWithTypedef.kt | 0 .../{ => common}/InFunInClassInitializer.kt | 0 .../InGlobalPropertyInitializer.kt | 0 .../completion/basic/{ => common}/InImport.kt | 0 .../InInitializerInPropertyAccessor.kt | 0 .../{ => common}/InLocalObjectDeclaration.kt | 0 .../InLongDotQualifiedExpression.kt | 0 .../basic/{ => common}/InMiddleOfNamespace.kt | 0 .../basic/{ => common}/InMiddleOfPackage.kt | 0 .../InObjectInDelegationSpecifier.kt | 0 .../basic/{ => common}/InPackageBegin.kt | 0 .../basic/{ => common}/InTypeAnnotation.kt | 0 .../basic/{ => common}/JavaPackage.kt | 0 .../LocalMultideclarationValues.kt | 0 .../basic/{ => common}/NamedObject.kt | 0 .../{ => common}/NoClassNameDuplication.kt | 0 .../basic/{ => common}/NoEmptyNamespace.kt | 0 .../{ => common}/NoObjectInTypePosition.kt | 0 ...oTopLevelCompletionInQualifiedUserTypes.kt | 0 .../{ => common}/ObjectRedeclaration1.kt | 0 .../{ => common}/ObjectRedeclaration2.kt | 0 .../OnlyScopedClassesWithoutExplicit.kt | 0 .../basic/{ => common}/OverloadFunctions.kt | 0 .../ShortClassNamesInTypePosition.kt | 0 .../{ => common}/StandardJetArrayFirst.kt | 0 .../{ => common}/StandardJetDoubleFirst.kt | 0 .../basic/{ => common}/SubpackageInFun.kt | 0 .../basic/{ => common}/VariableClassName.kt | 0 .../VisibilityClassMembersFromExternal.kt | 0 ...VisibilityClassMembersFromExternalForce.kt | 0 .../{ => common}/VisibilityInSubclass.kt | 0 .../{ => common}/VisibilityInSubclassForce.kt | 0 .../extensions/ExtensionInExtendedClass.kt | 0 .../ExtensionInExtendedClassThis.kt | 0 .../extensions/ExtensionInExtension.kt | 0 .../extensions/ExtensionInExtensionThis.kt | 0 .../extensions/InvalidTypeParameters.kt | 0 .../extensions/IrrelevantExtension.kt | 0 .../extensions/JavaTypeExtension.kt | 0 .../extensions/KotlinGenericTypeExtension.kt | 0 .../extensions/KotlinTypeExtension.kt | 0 .../completion/JetBasicJSCompletionTest.java | 246 +++++++++--------- .../JetBasicJavaCompletionTest.java | 246 +++++++++--------- 74 files changed, 256 insertions(+), 246 deletions(-) rename idea/testData/completion/basic/{ => common}/AutoCastAfterIf.kt (100%) rename idea/testData/completion/basic/{ => common}/AutoCastAfterIfMethod.kt (100%) rename idea/testData/completion/basic/{ => common}/AutoCastForThis.kt (100%) rename idea/testData/completion/basic/{ => common}/AutoCastInWhen.kt (100%) rename idea/testData/completion/basic/{ => common}/BasicAny.kt (100%) rename idea/testData/completion/basic/{ => common}/BasicInt.kt (100%) rename idea/testData/completion/basic/{ => common}/BeforeDotInCall.kt (100%) rename idea/testData/completion/basic/{ => common}/CallLocalLambda.kt (100%) rename idea/testData/completion/basic/{ => common}/ClassRedeclaration1.kt (100%) rename idea/testData/completion/basic/{ => common}/ClassRedeclaration2.kt (100%) rename idea/testData/completion/basic/{ => common}/CompletionInSetter.kt (100%) rename idea/testData/completion/basic/{ => common}/DoNotCompleteForErrorReceivers.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtendClassName.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtendQualifiedClassName.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtensionForProperty.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtensionFunReceiver.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtensionWithAdditionalTypeParameters.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtensionWithGenericParamInReceiver.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtensionWithGenericReceiver.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtensionWithInternalGenericParameters.kt (100%) rename idea/testData/completion/basic/{ => common}/ExtensionWithManyTypeParamsInReceiver.kt (100%) rename idea/testData/completion/basic/{ => common}/FromImports.kt (100%) rename idea/testData/completion/basic/{ => common}/FunctionCompletionFormatting.kt (100%) rename idea/testData/completion/basic/{ => common}/InCallExpression.kt (100%) rename idea/testData/completion/basic/{ => common}/InClassInitializer.kt (100%) rename idea/testData/completion/basic/{ => common}/InClassPropertyAccessor.kt (100%) rename idea/testData/completion/basic/{ => common}/InEmptyImport.kt (100%) rename idea/testData/completion/basic/{ => common}/InExpressionNoPrefix.kt (100%) rename idea/testData/completion/basic/{ => common}/InExtendTypeAnnotation.kt (100%) rename idea/testData/completion/basic/{ => common}/InFileWithMultiDeclaration.kt (100%) rename idea/testData/completion/basic/{ => common}/InFileWithTypedef.kt (100%) rename idea/testData/completion/basic/{ => common}/InFunInClassInitializer.kt (100%) rename idea/testData/completion/basic/{ => common}/InGlobalPropertyInitializer.kt (100%) rename idea/testData/completion/basic/{ => common}/InImport.kt (100%) rename idea/testData/completion/basic/{ => common}/InInitializerInPropertyAccessor.kt (100%) rename idea/testData/completion/basic/{ => common}/InLocalObjectDeclaration.kt (100%) rename idea/testData/completion/basic/{ => common}/InLongDotQualifiedExpression.kt (100%) rename idea/testData/completion/basic/{ => common}/InMiddleOfNamespace.kt (100%) rename idea/testData/completion/basic/{ => common}/InMiddleOfPackage.kt (100%) rename idea/testData/completion/basic/{ => common}/InObjectInDelegationSpecifier.kt (100%) rename idea/testData/completion/basic/{ => common}/InPackageBegin.kt (100%) rename idea/testData/completion/basic/{ => common}/InTypeAnnotation.kt (100%) rename idea/testData/completion/basic/{ => common}/JavaPackage.kt (100%) rename idea/testData/completion/basic/{ => common}/LocalMultideclarationValues.kt (100%) rename idea/testData/completion/basic/{ => common}/NamedObject.kt (100%) rename idea/testData/completion/basic/{ => common}/NoClassNameDuplication.kt (100%) rename idea/testData/completion/basic/{ => common}/NoEmptyNamespace.kt (100%) rename idea/testData/completion/basic/{ => common}/NoObjectInTypePosition.kt (100%) rename idea/testData/completion/basic/{ => common}/NoTopLevelCompletionInQualifiedUserTypes.kt (100%) rename idea/testData/completion/basic/{ => common}/ObjectRedeclaration1.kt (100%) rename idea/testData/completion/basic/{ => common}/ObjectRedeclaration2.kt (100%) rename idea/testData/completion/basic/{ => common}/OnlyScopedClassesWithoutExplicit.kt (100%) rename idea/testData/completion/basic/{ => common}/OverloadFunctions.kt (100%) rename idea/testData/completion/basic/{ => common}/ShortClassNamesInTypePosition.kt (100%) rename idea/testData/completion/basic/{ => common}/StandardJetArrayFirst.kt (100%) rename idea/testData/completion/basic/{ => common}/StandardJetDoubleFirst.kt (100%) rename idea/testData/completion/basic/{ => common}/SubpackageInFun.kt (100%) rename idea/testData/completion/basic/{ => common}/VariableClassName.kt (100%) rename idea/testData/completion/basic/{ => common}/VisibilityClassMembersFromExternal.kt (100%) rename idea/testData/completion/basic/{ => common}/VisibilityClassMembersFromExternalForce.kt (100%) rename idea/testData/completion/basic/{ => common}/VisibilityInSubclass.kt (100%) rename idea/testData/completion/basic/{ => common}/VisibilityInSubclassForce.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/ExtensionInExtendedClass.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/ExtensionInExtendedClassThis.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/ExtensionInExtension.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/ExtensionInExtensionThis.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/InvalidTypeParameters.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/IrrelevantExtension.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/JavaTypeExtension.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/KotlinGenericTypeExtension.kt (100%) rename idea/testData/completion/basic/{ => common}/extensions/KotlinTypeExtension.kt (100%) diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 855c895be07..76481bee353 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -231,18 +231,16 @@ public class GenerateTests { "idea/tests/", "JetBasicJSCompletionTest", AbstractJetJSCompletionTest.class, - testModel("idea/testData/completion/basic", false, "doTest"), - testModel("idea/testData/completion/basic/extensions", false, "doTest"), - testModel("idea/testData/completion/basic/js", false, "doTest") + testModel("idea/testData/completion/basic/common"), + testModel("idea/testData/completion/basic/js") ); generateTest( "idea/tests/", "JetBasicJavaCompletionTest", AbstractJavaCompletionTest.class, - testModel("idea/testData/completion/basic", false, "doTest"), - testModel("idea/testData/completion/basic/extensions", false, "doTest"), - testModel("idea/testData/completion/basic/java", false, "doTest") + testModel("idea/testData/completion/basic/common"), + testModel("idea/testData/completion/basic/java") ); generateTest( diff --git a/idea/testData/completion/basic/AutoCastAfterIf.kt b/idea/testData/completion/basic/common/AutoCastAfterIf.kt similarity index 100% rename from idea/testData/completion/basic/AutoCastAfterIf.kt rename to idea/testData/completion/basic/common/AutoCastAfterIf.kt diff --git a/idea/testData/completion/basic/AutoCastAfterIfMethod.kt b/idea/testData/completion/basic/common/AutoCastAfterIfMethod.kt similarity index 100% rename from idea/testData/completion/basic/AutoCastAfterIfMethod.kt rename to idea/testData/completion/basic/common/AutoCastAfterIfMethod.kt diff --git a/idea/testData/completion/basic/AutoCastForThis.kt b/idea/testData/completion/basic/common/AutoCastForThis.kt similarity index 100% rename from idea/testData/completion/basic/AutoCastForThis.kt rename to idea/testData/completion/basic/common/AutoCastForThis.kt diff --git a/idea/testData/completion/basic/AutoCastInWhen.kt b/idea/testData/completion/basic/common/AutoCastInWhen.kt similarity index 100% rename from idea/testData/completion/basic/AutoCastInWhen.kt rename to idea/testData/completion/basic/common/AutoCastInWhen.kt diff --git a/idea/testData/completion/basic/BasicAny.kt b/idea/testData/completion/basic/common/BasicAny.kt similarity index 100% rename from idea/testData/completion/basic/BasicAny.kt rename to idea/testData/completion/basic/common/BasicAny.kt diff --git a/idea/testData/completion/basic/BasicInt.kt b/idea/testData/completion/basic/common/BasicInt.kt similarity index 100% rename from idea/testData/completion/basic/BasicInt.kt rename to idea/testData/completion/basic/common/BasicInt.kt diff --git a/idea/testData/completion/basic/BeforeDotInCall.kt b/idea/testData/completion/basic/common/BeforeDotInCall.kt similarity index 100% rename from idea/testData/completion/basic/BeforeDotInCall.kt rename to idea/testData/completion/basic/common/BeforeDotInCall.kt diff --git a/idea/testData/completion/basic/CallLocalLambda.kt b/idea/testData/completion/basic/common/CallLocalLambda.kt similarity index 100% rename from idea/testData/completion/basic/CallLocalLambda.kt rename to idea/testData/completion/basic/common/CallLocalLambda.kt diff --git a/idea/testData/completion/basic/ClassRedeclaration1.kt b/idea/testData/completion/basic/common/ClassRedeclaration1.kt similarity index 100% rename from idea/testData/completion/basic/ClassRedeclaration1.kt rename to idea/testData/completion/basic/common/ClassRedeclaration1.kt diff --git a/idea/testData/completion/basic/ClassRedeclaration2.kt b/idea/testData/completion/basic/common/ClassRedeclaration2.kt similarity index 100% rename from idea/testData/completion/basic/ClassRedeclaration2.kt rename to idea/testData/completion/basic/common/ClassRedeclaration2.kt diff --git a/idea/testData/completion/basic/CompletionInSetter.kt b/idea/testData/completion/basic/common/CompletionInSetter.kt similarity index 100% rename from idea/testData/completion/basic/CompletionInSetter.kt rename to idea/testData/completion/basic/common/CompletionInSetter.kt diff --git a/idea/testData/completion/basic/DoNotCompleteForErrorReceivers.kt b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt similarity index 100% rename from idea/testData/completion/basic/DoNotCompleteForErrorReceivers.kt rename to idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt diff --git a/idea/testData/completion/basic/ExtendClassName.kt b/idea/testData/completion/basic/common/ExtendClassName.kt similarity index 100% rename from idea/testData/completion/basic/ExtendClassName.kt rename to idea/testData/completion/basic/common/ExtendClassName.kt diff --git a/idea/testData/completion/basic/ExtendQualifiedClassName.kt b/idea/testData/completion/basic/common/ExtendQualifiedClassName.kt similarity index 100% rename from idea/testData/completion/basic/ExtendQualifiedClassName.kt rename to idea/testData/completion/basic/common/ExtendQualifiedClassName.kt diff --git a/idea/testData/completion/basic/ExtensionForProperty.kt b/idea/testData/completion/basic/common/ExtensionForProperty.kt similarity index 100% rename from idea/testData/completion/basic/ExtensionForProperty.kt rename to idea/testData/completion/basic/common/ExtensionForProperty.kt diff --git a/idea/testData/completion/basic/ExtensionFunReceiver.kt b/idea/testData/completion/basic/common/ExtensionFunReceiver.kt similarity index 100% rename from idea/testData/completion/basic/ExtensionFunReceiver.kt rename to idea/testData/completion/basic/common/ExtensionFunReceiver.kt diff --git a/idea/testData/completion/basic/ExtensionWithAdditionalTypeParameters.kt b/idea/testData/completion/basic/common/ExtensionWithAdditionalTypeParameters.kt similarity index 100% rename from idea/testData/completion/basic/ExtensionWithAdditionalTypeParameters.kt rename to idea/testData/completion/basic/common/ExtensionWithAdditionalTypeParameters.kt diff --git a/idea/testData/completion/basic/ExtensionWithGenericParamInReceiver.kt b/idea/testData/completion/basic/common/ExtensionWithGenericParamInReceiver.kt similarity index 100% rename from idea/testData/completion/basic/ExtensionWithGenericParamInReceiver.kt rename to idea/testData/completion/basic/common/ExtensionWithGenericParamInReceiver.kt diff --git a/idea/testData/completion/basic/ExtensionWithGenericReceiver.kt b/idea/testData/completion/basic/common/ExtensionWithGenericReceiver.kt similarity index 100% rename from idea/testData/completion/basic/ExtensionWithGenericReceiver.kt rename to idea/testData/completion/basic/common/ExtensionWithGenericReceiver.kt diff --git a/idea/testData/completion/basic/ExtensionWithInternalGenericParameters.kt b/idea/testData/completion/basic/common/ExtensionWithInternalGenericParameters.kt similarity index 100% rename from idea/testData/completion/basic/ExtensionWithInternalGenericParameters.kt rename to idea/testData/completion/basic/common/ExtensionWithInternalGenericParameters.kt diff --git a/idea/testData/completion/basic/ExtensionWithManyTypeParamsInReceiver.kt b/idea/testData/completion/basic/common/ExtensionWithManyTypeParamsInReceiver.kt similarity index 100% rename from idea/testData/completion/basic/ExtensionWithManyTypeParamsInReceiver.kt rename to idea/testData/completion/basic/common/ExtensionWithManyTypeParamsInReceiver.kt diff --git a/idea/testData/completion/basic/FromImports.kt b/idea/testData/completion/basic/common/FromImports.kt similarity index 100% rename from idea/testData/completion/basic/FromImports.kt rename to idea/testData/completion/basic/common/FromImports.kt diff --git a/idea/testData/completion/basic/FunctionCompletionFormatting.kt b/idea/testData/completion/basic/common/FunctionCompletionFormatting.kt similarity index 100% rename from idea/testData/completion/basic/FunctionCompletionFormatting.kt rename to idea/testData/completion/basic/common/FunctionCompletionFormatting.kt diff --git a/idea/testData/completion/basic/InCallExpression.kt b/idea/testData/completion/basic/common/InCallExpression.kt similarity index 100% rename from idea/testData/completion/basic/InCallExpression.kt rename to idea/testData/completion/basic/common/InCallExpression.kt diff --git a/idea/testData/completion/basic/InClassInitializer.kt b/idea/testData/completion/basic/common/InClassInitializer.kt similarity index 100% rename from idea/testData/completion/basic/InClassInitializer.kt rename to idea/testData/completion/basic/common/InClassInitializer.kt diff --git a/idea/testData/completion/basic/InClassPropertyAccessor.kt b/idea/testData/completion/basic/common/InClassPropertyAccessor.kt similarity index 100% rename from idea/testData/completion/basic/InClassPropertyAccessor.kt rename to idea/testData/completion/basic/common/InClassPropertyAccessor.kt diff --git a/idea/testData/completion/basic/InEmptyImport.kt b/idea/testData/completion/basic/common/InEmptyImport.kt similarity index 100% rename from idea/testData/completion/basic/InEmptyImport.kt rename to idea/testData/completion/basic/common/InEmptyImport.kt diff --git a/idea/testData/completion/basic/InExpressionNoPrefix.kt b/idea/testData/completion/basic/common/InExpressionNoPrefix.kt similarity index 100% rename from idea/testData/completion/basic/InExpressionNoPrefix.kt rename to idea/testData/completion/basic/common/InExpressionNoPrefix.kt diff --git a/idea/testData/completion/basic/InExtendTypeAnnotation.kt b/idea/testData/completion/basic/common/InExtendTypeAnnotation.kt similarity index 100% rename from idea/testData/completion/basic/InExtendTypeAnnotation.kt rename to idea/testData/completion/basic/common/InExtendTypeAnnotation.kt diff --git a/idea/testData/completion/basic/InFileWithMultiDeclaration.kt b/idea/testData/completion/basic/common/InFileWithMultiDeclaration.kt similarity index 100% rename from idea/testData/completion/basic/InFileWithMultiDeclaration.kt rename to idea/testData/completion/basic/common/InFileWithMultiDeclaration.kt diff --git a/idea/testData/completion/basic/InFileWithTypedef.kt b/idea/testData/completion/basic/common/InFileWithTypedef.kt similarity index 100% rename from idea/testData/completion/basic/InFileWithTypedef.kt rename to idea/testData/completion/basic/common/InFileWithTypedef.kt diff --git a/idea/testData/completion/basic/InFunInClassInitializer.kt b/idea/testData/completion/basic/common/InFunInClassInitializer.kt similarity index 100% rename from idea/testData/completion/basic/InFunInClassInitializer.kt rename to idea/testData/completion/basic/common/InFunInClassInitializer.kt diff --git a/idea/testData/completion/basic/InGlobalPropertyInitializer.kt b/idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt similarity index 100% rename from idea/testData/completion/basic/InGlobalPropertyInitializer.kt rename to idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt diff --git a/idea/testData/completion/basic/InImport.kt b/idea/testData/completion/basic/common/InImport.kt similarity index 100% rename from idea/testData/completion/basic/InImport.kt rename to idea/testData/completion/basic/common/InImport.kt diff --git a/idea/testData/completion/basic/InInitializerInPropertyAccessor.kt b/idea/testData/completion/basic/common/InInitializerInPropertyAccessor.kt similarity index 100% rename from idea/testData/completion/basic/InInitializerInPropertyAccessor.kt rename to idea/testData/completion/basic/common/InInitializerInPropertyAccessor.kt diff --git a/idea/testData/completion/basic/InLocalObjectDeclaration.kt b/idea/testData/completion/basic/common/InLocalObjectDeclaration.kt similarity index 100% rename from idea/testData/completion/basic/InLocalObjectDeclaration.kt rename to idea/testData/completion/basic/common/InLocalObjectDeclaration.kt diff --git a/idea/testData/completion/basic/InLongDotQualifiedExpression.kt b/idea/testData/completion/basic/common/InLongDotQualifiedExpression.kt similarity index 100% rename from idea/testData/completion/basic/InLongDotQualifiedExpression.kt rename to idea/testData/completion/basic/common/InLongDotQualifiedExpression.kt diff --git a/idea/testData/completion/basic/InMiddleOfNamespace.kt b/idea/testData/completion/basic/common/InMiddleOfNamespace.kt similarity index 100% rename from idea/testData/completion/basic/InMiddleOfNamespace.kt rename to idea/testData/completion/basic/common/InMiddleOfNamespace.kt diff --git a/idea/testData/completion/basic/InMiddleOfPackage.kt b/idea/testData/completion/basic/common/InMiddleOfPackage.kt similarity index 100% rename from idea/testData/completion/basic/InMiddleOfPackage.kt rename to idea/testData/completion/basic/common/InMiddleOfPackage.kt diff --git a/idea/testData/completion/basic/InObjectInDelegationSpecifier.kt b/idea/testData/completion/basic/common/InObjectInDelegationSpecifier.kt similarity index 100% rename from idea/testData/completion/basic/InObjectInDelegationSpecifier.kt rename to idea/testData/completion/basic/common/InObjectInDelegationSpecifier.kt diff --git a/idea/testData/completion/basic/InPackageBegin.kt b/idea/testData/completion/basic/common/InPackageBegin.kt similarity index 100% rename from idea/testData/completion/basic/InPackageBegin.kt rename to idea/testData/completion/basic/common/InPackageBegin.kt diff --git a/idea/testData/completion/basic/InTypeAnnotation.kt b/idea/testData/completion/basic/common/InTypeAnnotation.kt similarity index 100% rename from idea/testData/completion/basic/InTypeAnnotation.kt rename to idea/testData/completion/basic/common/InTypeAnnotation.kt diff --git a/idea/testData/completion/basic/JavaPackage.kt b/idea/testData/completion/basic/common/JavaPackage.kt similarity index 100% rename from idea/testData/completion/basic/JavaPackage.kt rename to idea/testData/completion/basic/common/JavaPackage.kt diff --git a/idea/testData/completion/basic/LocalMultideclarationValues.kt b/idea/testData/completion/basic/common/LocalMultideclarationValues.kt similarity index 100% rename from idea/testData/completion/basic/LocalMultideclarationValues.kt rename to idea/testData/completion/basic/common/LocalMultideclarationValues.kt diff --git a/idea/testData/completion/basic/NamedObject.kt b/idea/testData/completion/basic/common/NamedObject.kt similarity index 100% rename from idea/testData/completion/basic/NamedObject.kt rename to idea/testData/completion/basic/common/NamedObject.kt diff --git a/idea/testData/completion/basic/NoClassNameDuplication.kt b/idea/testData/completion/basic/common/NoClassNameDuplication.kt similarity index 100% rename from idea/testData/completion/basic/NoClassNameDuplication.kt rename to idea/testData/completion/basic/common/NoClassNameDuplication.kt diff --git a/idea/testData/completion/basic/NoEmptyNamespace.kt b/idea/testData/completion/basic/common/NoEmptyNamespace.kt similarity index 100% rename from idea/testData/completion/basic/NoEmptyNamespace.kt rename to idea/testData/completion/basic/common/NoEmptyNamespace.kt diff --git a/idea/testData/completion/basic/NoObjectInTypePosition.kt b/idea/testData/completion/basic/common/NoObjectInTypePosition.kt similarity index 100% rename from idea/testData/completion/basic/NoObjectInTypePosition.kt rename to idea/testData/completion/basic/common/NoObjectInTypePosition.kt diff --git a/idea/testData/completion/basic/NoTopLevelCompletionInQualifiedUserTypes.kt b/idea/testData/completion/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt similarity index 100% rename from idea/testData/completion/basic/NoTopLevelCompletionInQualifiedUserTypes.kt rename to idea/testData/completion/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt diff --git a/idea/testData/completion/basic/ObjectRedeclaration1.kt b/idea/testData/completion/basic/common/ObjectRedeclaration1.kt similarity index 100% rename from idea/testData/completion/basic/ObjectRedeclaration1.kt rename to idea/testData/completion/basic/common/ObjectRedeclaration1.kt diff --git a/idea/testData/completion/basic/ObjectRedeclaration2.kt b/idea/testData/completion/basic/common/ObjectRedeclaration2.kt similarity index 100% rename from idea/testData/completion/basic/ObjectRedeclaration2.kt rename to idea/testData/completion/basic/common/ObjectRedeclaration2.kt diff --git a/idea/testData/completion/basic/OnlyScopedClassesWithoutExplicit.kt b/idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt similarity index 100% rename from idea/testData/completion/basic/OnlyScopedClassesWithoutExplicit.kt rename to idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt diff --git a/idea/testData/completion/basic/OverloadFunctions.kt b/idea/testData/completion/basic/common/OverloadFunctions.kt similarity index 100% rename from idea/testData/completion/basic/OverloadFunctions.kt rename to idea/testData/completion/basic/common/OverloadFunctions.kt diff --git a/idea/testData/completion/basic/ShortClassNamesInTypePosition.kt b/idea/testData/completion/basic/common/ShortClassNamesInTypePosition.kt similarity index 100% rename from idea/testData/completion/basic/ShortClassNamesInTypePosition.kt rename to idea/testData/completion/basic/common/ShortClassNamesInTypePosition.kt diff --git a/idea/testData/completion/basic/StandardJetArrayFirst.kt b/idea/testData/completion/basic/common/StandardJetArrayFirst.kt similarity index 100% rename from idea/testData/completion/basic/StandardJetArrayFirst.kt rename to idea/testData/completion/basic/common/StandardJetArrayFirst.kt diff --git a/idea/testData/completion/basic/StandardJetDoubleFirst.kt b/idea/testData/completion/basic/common/StandardJetDoubleFirst.kt similarity index 100% rename from idea/testData/completion/basic/StandardJetDoubleFirst.kt rename to idea/testData/completion/basic/common/StandardJetDoubleFirst.kt diff --git a/idea/testData/completion/basic/SubpackageInFun.kt b/idea/testData/completion/basic/common/SubpackageInFun.kt similarity index 100% rename from idea/testData/completion/basic/SubpackageInFun.kt rename to idea/testData/completion/basic/common/SubpackageInFun.kt diff --git a/idea/testData/completion/basic/VariableClassName.kt b/idea/testData/completion/basic/common/VariableClassName.kt similarity index 100% rename from idea/testData/completion/basic/VariableClassName.kt rename to idea/testData/completion/basic/common/VariableClassName.kt diff --git a/idea/testData/completion/basic/VisibilityClassMembersFromExternal.kt b/idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt similarity index 100% rename from idea/testData/completion/basic/VisibilityClassMembersFromExternal.kt rename to idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt diff --git a/idea/testData/completion/basic/VisibilityClassMembersFromExternalForce.kt b/idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt similarity index 100% rename from idea/testData/completion/basic/VisibilityClassMembersFromExternalForce.kt rename to idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt diff --git a/idea/testData/completion/basic/VisibilityInSubclass.kt b/idea/testData/completion/basic/common/VisibilityInSubclass.kt similarity index 100% rename from idea/testData/completion/basic/VisibilityInSubclass.kt rename to idea/testData/completion/basic/common/VisibilityInSubclass.kt diff --git a/idea/testData/completion/basic/VisibilityInSubclassForce.kt b/idea/testData/completion/basic/common/VisibilityInSubclassForce.kt similarity index 100% rename from idea/testData/completion/basic/VisibilityInSubclassForce.kt rename to idea/testData/completion/basic/common/VisibilityInSubclassForce.kt diff --git a/idea/testData/completion/basic/extensions/ExtensionInExtendedClass.kt b/idea/testData/completion/basic/common/extensions/ExtensionInExtendedClass.kt similarity index 100% rename from idea/testData/completion/basic/extensions/ExtensionInExtendedClass.kt rename to idea/testData/completion/basic/common/extensions/ExtensionInExtendedClass.kt diff --git a/idea/testData/completion/basic/extensions/ExtensionInExtendedClassThis.kt b/idea/testData/completion/basic/common/extensions/ExtensionInExtendedClassThis.kt similarity index 100% rename from idea/testData/completion/basic/extensions/ExtensionInExtendedClassThis.kt rename to idea/testData/completion/basic/common/extensions/ExtensionInExtendedClassThis.kt diff --git a/idea/testData/completion/basic/extensions/ExtensionInExtension.kt b/idea/testData/completion/basic/common/extensions/ExtensionInExtension.kt similarity index 100% rename from idea/testData/completion/basic/extensions/ExtensionInExtension.kt rename to idea/testData/completion/basic/common/extensions/ExtensionInExtension.kt diff --git a/idea/testData/completion/basic/extensions/ExtensionInExtensionThis.kt b/idea/testData/completion/basic/common/extensions/ExtensionInExtensionThis.kt similarity index 100% rename from idea/testData/completion/basic/extensions/ExtensionInExtensionThis.kt rename to idea/testData/completion/basic/common/extensions/ExtensionInExtensionThis.kt diff --git a/idea/testData/completion/basic/extensions/InvalidTypeParameters.kt b/idea/testData/completion/basic/common/extensions/InvalidTypeParameters.kt similarity index 100% rename from idea/testData/completion/basic/extensions/InvalidTypeParameters.kt rename to idea/testData/completion/basic/common/extensions/InvalidTypeParameters.kt diff --git a/idea/testData/completion/basic/extensions/IrrelevantExtension.kt b/idea/testData/completion/basic/common/extensions/IrrelevantExtension.kt similarity index 100% rename from idea/testData/completion/basic/extensions/IrrelevantExtension.kt rename to idea/testData/completion/basic/common/extensions/IrrelevantExtension.kt diff --git a/idea/testData/completion/basic/extensions/JavaTypeExtension.kt b/idea/testData/completion/basic/common/extensions/JavaTypeExtension.kt similarity index 100% rename from idea/testData/completion/basic/extensions/JavaTypeExtension.kt rename to idea/testData/completion/basic/common/extensions/JavaTypeExtension.kt diff --git a/idea/testData/completion/basic/extensions/KotlinGenericTypeExtension.kt b/idea/testData/completion/basic/common/extensions/KotlinGenericTypeExtension.kt similarity index 100% rename from idea/testData/completion/basic/extensions/KotlinGenericTypeExtension.kt rename to idea/testData/completion/basic/common/extensions/KotlinGenericTypeExtension.kt diff --git a/idea/testData/completion/basic/extensions/KotlinTypeExtension.kt b/idea/testData/completion/basic/common/extensions/KotlinTypeExtension.kt similarity index 100% rename from idea/testData/completion/basic/extensions/KotlinTypeExtension.kt rename to idea/testData/completion/basic/common/extensions/KotlinTypeExtension.kt diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java index 7ee55b0cd98..71fb421f233 100644 --- a/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java +++ b/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java @@ -30,383 +30,390 @@ import org.jetbrains.jet.completion.AbstractJetJSCompletionTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({JetBasicJSCompletionTest.Basic.class, JetBasicJSCompletionTest.Extensions.class, JetBasicJSCompletionTest.Js.class}) +@InnerTestClasses({JetBasicJSCompletionTest.Common.class, JetBasicJSCompletionTest.Js.class}) public class JetBasicJSCompletionTest extends AbstractJetJSCompletionTest { - @TestMetadata("idea/testData/completion/basic") - public static class Basic extends AbstractJetJSCompletionTest { - public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic"), Pattern.compile("^(.+)\\.kt$"), false); + @TestMetadata("idea/testData/completion/basic/common") + @InnerTestClasses({Common.Extensions.class}) + public static class Common extends AbstractJetJSCompletionTest { + public void testAllFilesPresentInCommon() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/common"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutoCastAfterIf.kt") public void testAutoCastAfterIf() throws Exception { - doTest("idea/testData/completion/basic/AutoCastAfterIf.kt"); + doTest("idea/testData/completion/basic/common/AutoCastAfterIf.kt"); } @TestMetadata("AutoCastAfterIfMethod.kt") public void testAutoCastAfterIfMethod() throws Exception { - doTest("idea/testData/completion/basic/AutoCastAfterIfMethod.kt"); + doTest("idea/testData/completion/basic/common/AutoCastAfterIfMethod.kt"); } @TestMetadata("AutoCastForThis.kt") public void testAutoCastForThis() throws Exception { - doTest("idea/testData/completion/basic/AutoCastForThis.kt"); + doTest("idea/testData/completion/basic/common/AutoCastForThis.kt"); } @TestMetadata("AutoCastInWhen.kt") public void testAutoCastInWhen() throws Exception { - doTest("idea/testData/completion/basic/AutoCastInWhen.kt"); + doTest("idea/testData/completion/basic/common/AutoCastInWhen.kt"); } @TestMetadata("BasicAny.kt") public void testBasicAny() throws Exception { - doTest("idea/testData/completion/basic/BasicAny.kt"); + doTest("idea/testData/completion/basic/common/BasicAny.kt"); } @TestMetadata("BasicInt.kt") public void testBasicInt() throws Exception { - doTest("idea/testData/completion/basic/BasicInt.kt"); + doTest("idea/testData/completion/basic/common/BasicInt.kt"); } @TestMetadata("BeforeDotInCall.kt") public void testBeforeDotInCall() throws Exception { - doTest("idea/testData/completion/basic/BeforeDotInCall.kt"); + doTest("idea/testData/completion/basic/common/BeforeDotInCall.kt"); } @TestMetadata("CallLocalLambda.kt") public void testCallLocalLambda() throws Exception { - doTest("idea/testData/completion/basic/CallLocalLambda.kt"); + doTest("idea/testData/completion/basic/common/CallLocalLambda.kt"); } @TestMetadata("ClassRedeclaration1.kt") public void testClassRedeclaration1() throws Exception { - doTest("idea/testData/completion/basic/ClassRedeclaration1.kt"); + doTest("idea/testData/completion/basic/common/ClassRedeclaration1.kt"); } @TestMetadata("ClassRedeclaration2.kt") public void testClassRedeclaration2() throws Exception { - doTest("idea/testData/completion/basic/ClassRedeclaration2.kt"); + doTest("idea/testData/completion/basic/common/ClassRedeclaration2.kt"); } @TestMetadata("CompletionInSetter.kt") public void testCompletionInSetter() throws Exception { - doTest("idea/testData/completion/basic/CompletionInSetter.kt"); + doTest("idea/testData/completion/basic/common/CompletionInSetter.kt"); } @TestMetadata("DoNotCompleteForErrorReceivers.kt") public void testDoNotCompleteForErrorReceivers() throws Exception { - doTest("idea/testData/completion/basic/DoNotCompleteForErrorReceivers.kt"); + doTest("idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt"); } @TestMetadata("ExtendClassName.kt") public void testExtendClassName() throws Exception { - doTest("idea/testData/completion/basic/ExtendClassName.kt"); + doTest("idea/testData/completion/basic/common/ExtendClassName.kt"); } @TestMetadata("ExtendQualifiedClassName.kt") public void testExtendQualifiedClassName() throws Exception { - doTest("idea/testData/completion/basic/ExtendQualifiedClassName.kt"); + doTest("idea/testData/completion/basic/common/ExtendQualifiedClassName.kt"); } @TestMetadata("ExtensionForProperty.kt") public void testExtensionForProperty() throws Exception { - doTest("idea/testData/completion/basic/ExtensionForProperty.kt"); + doTest("idea/testData/completion/basic/common/ExtensionForProperty.kt"); } @TestMetadata("ExtensionFunReceiver.kt") public void testExtensionFunReceiver() throws Exception { - doTest("idea/testData/completion/basic/ExtensionFunReceiver.kt"); + doTest("idea/testData/completion/basic/common/ExtensionFunReceiver.kt"); } @TestMetadata("ExtensionWithAdditionalTypeParameters.kt") public void testExtensionWithAdditionalTypeParameters() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithAdditionalTypeParameters.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithAdditionalTypeParameters.kt"); } @TestMetadata("ExtensionWithGenericParamInReceiver.kt") public void testExtensionWithGenericParamInReceiver() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithGenericParamInReceiver.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithGenericParamInReceiver.kt"); } @TestMetadata("ExtensionWithGenericReceiver.kt") public void testExtensionWithGenericReceiver() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithGenericReceiver.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithGenericReceiver.kt"); } @TestMetadata("ExtensionWithInternalGenericParameters.kt") public void testExtensionWithInternalGenericParameters() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithInternalGenericParameters.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithInternalGenericParameters.kt"); } @TestMetadata("ExtensionWithManyTypeParamsInReceiver.kt") public void testExtensionWithManyTypeParamsInReceiver() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithManyTypeParamsInReceiver.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithManyTypeParamsInReceiver.kt"); } @TestMetadata("FromImports.kt") public void testFromImports() throws Exception { - doTest("idea/testData/completion/basic/FromImports.kt"); + doTest("idea/testData/completion/basic/common/FromImports.kt"); } @TestMetadata("FunctionCompletionFormatting.kt") public void testFunctionCompletionFormatting() throws Exception { - doTest("idea/testData/completion/basic/FunctionCompletionFormatting.kt"); + doTest("idea/testData/completion/basic/common/FunctionCompletionFormatting.kt"); } @TestMetadata("InCallExpression.kt") public void testInCallExpression() throws Exception { - doTest("idea/testData/completion/basic/InCallExpression.kt"); + doTest("idea/testData/completion/basic/common/InCallExpression.kt"); } @TestMetadata("InClassInitializer.kt") public void testInClassInitializer() throws Exception { - doTest("idea/testData/completion/basic/InClassInitializer.kt"); + doTest("idea/testData/completion/basic/common/InClassInitializer.kt"); } @TestMetadata("InClassPropertyAccessor.kt") public void testInClassPropertyAccessor() throws Exception { - doTest("idea/testData/completion/basic/InClassPropertyAccessor.kt"); + doTest("idea/testData/completion/basic/common/InClassPropertyAccessor.kt"); } @TestMetadata("InEmptyImport.kt") public void testInEmptyImport() throws Exception { - doTest("idea/testData/completion/basic/InEmptyImport.kt"); + doTest("idea/testData/completion/basic/common/InEmptyImport.kt"); } @TestMetadata("InExpressionNoPrefix.kt") public void testInExpressionNoPrefix() throws Exception { - doTest("idea/testData/completion/basic/InExpressionNoPrefix.kt"); + doTest("idea/testData/completion/basic/common/InExpressionNoPrefix.kt"); } @TestMetadata("InExtendTypeAnnotation.kt") public void testInExtendTypeAnnotation() throws Exception { - doTest("idea/testData/completion/basic/InExtendTypeAnnotation.kt"); + doTest("idea/testData/completion/basic/common/InExtendTypeAnnotation.kt"); } @TestMetadata("InFileWithMultiDeclaration.kt") public void testInFileWithMultiDeclaration() throws Exception { - doTest("idea/testData/completion/basic/InFileWithMultiDeclaration.kt"); + doTest("idea/testData/completion/basic/common/InFileWithMultiDeclaration.kt"); } @TestMetadata("InFileWithTypedef.kt") public void testInFileWithTypedef() throws Exception { - doTest("idea/testData/completion/basic/InFileWithTypedef.kt"); + doTest("idea/testData/completion/basic/common/InFileWithTypedef.kt"); } @TestMetadata("InFunInClassInitializer.kt") public void testInFunInClassInitializer() throws Exception { - doTest("idea/testData/completion/basic/InFunInClassInitializer.kt"); + doTest("idea/testData/completion/basic/common/InFunInClassInitializer.kt"); } @TestMetadata("InGlobalPropertyInitializer.kt") public void testInGlobalPropertyInitializer() throws Exception { - doTest("idea/testData/completion/basic/InGlobalPropertyInitializer.kt"); + doTest("idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt"); } @TestMetadata("InImport.kt") public void testInImport() throws Exception { - doTest("idea/testData/completion/basic/InImport.kt"); + doTest("idea/testData/completion/basic/common/InImport.kt"); } @TestMetadata("InInitializerInPropertyAccessor.kt") public void testInInitializerInPropertyAccessor() throws Exception { - doTest("idea/testData/completion/basic/InInitializerInPropertyAccessor.kt"); + doTest("idea/testData/completion/basic/common/InInitializerInPropertyAccessor.kt"); } @TestMetadata("InLocalObjectDeclaration.kt") public void testInLocalObjectDeclaration() throws Exception { - doTest("idea/testData/completion/basic/InLocalObjectDeclaration.kt"); + doTest("idea/testData/completion/basic/common/InLocalObjectDeclaration.kt"); } @TestMetadata("InLongDotQualifiedExpression.kt") public void testInLongDotQualifiedExpression() throws Exception { - doTest("idea/testData/completion/basic/InLongDotQualifiedExpression.kt"); + doTest("idea/testData/completion/basic/common/InLongDotQualifiedExpression.kt"); } @TestMetadata("InMiddleOfNamespace.kt") public void testInMiddleOfNamespace() throws Exception { - doTest("idea/testData/completion/basic/InMiddleOfNamespace.kt"); + doTest("idea/testData/completion/basic/common/InMiddleOfNamespace.kt"); } @TestMetadata("InMiddleOfPackage.kt") public void testInMiddleOfPackage() throws Exception { - doTest("idea/testData/completion/basic/InMiddleOfPackage.kt"); + doTest("idea/testData/completion/basic/common/InMiddleOfPackage.kt"); } @TestMetadata("InObjectInDelegationSpecifier.kt") public void testInObjectInDelegationSpecifier() throws Exception { - doTest("idea/testData/completion/basic/InObjectInDelegationSpecifier.kt"); + doTest("idea/testData/completion/basic/common/InObjectInDelegationSpecifier.kt"); } @TestMetadata("InPackageBegin.kt") public void testInPackageBegin() throws Exception { - doTest("idea/testData/completion/basic/InPackageBegin.kt"); + doTest("idea/testData/completion/basic/common/InPackageBegin.kt"); } @TestMetadata("InTypeAnnotation.kt") public void testInTypeAnnotation() throws Exception { - doTest("idea/testData/completion/basic/InTypeAnnotation.kt"); + doTest("idea/testData/completion/basic/common/InTypeAnnotation.kt"); } @TestMetadata("JavaPackage.kt") public void testJavaPackage() throws Exception { - doTest("idea/testData/completion/basic/JavaPackage.kt"); + doTest("idea/testData/completion/basic/common/JavaPackage.kt"); } @TestMetadata("LocalMultideclarationValues.kt") public void testLocalMultideclarationValues() throws Exception { - doTest("idea/testData/completion/basic/LocalMultideclarationValues.kt"); + doTest("idea/testData/completion/basic/common/LocalMultideclarationValues.kt"); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - doTest("idea/testData/completion/basic/NamedObject.kt"); + doTest("idea/testData/completion/basic/common/NamedObject.kt"); } @TestMetadata("NoClassNameDuplication.kt") public void testNoClassNameDuplication() throws Exception { - doTest("idea/testData/completion/basic/NoClassNameDuplication.kt"); + doTest("idea/testData/completion/basic/common/NoClassNameDuplication.kt"); } @TestMetadata("NoEmptyNamespace.kt") public void testNoEmptyNamespace() throws Exception { - doTest("idea/testData/completion/basic/NoEmptyNamespace.kt"); + doTest("idea/testData/completion/basic/common/NoEmptyNamespace.kt"); } @TestMetadata("NoObjectInTypePosition.kt") public void testNoObjectInTypePosition() throws Exception { - doTest("idea/testData/completion/basic/NoObjectInTypePosition.kt"); + doTest("idea/testData/completion/basic/common/NoObjectInTypePosition.kt"); } @TestMetadata("NoTopLevelCompletionInQualifiedUserTypes.kt") public void testNoTopLevelCompletionInQualifiedUserTypes() throws Exception { - doTest("idea/testData/completion/basic/NoTopLevelCompletionInQualifiedUserTypes.kt"); + doTest("idea/testData/completion/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt"); } @TestMetadata("ObjectRedeclaration1.kt") public void testObjectRedeclaration1() throws Exception { - doTest("idea/testData/completion/basic/ObjectRedeclaration1.kt"); + doTest("idea/testData/completion/basic/common/ObjectRedeclaration1.kt"); } @TestMetadata("ObjectRedeclaration2.kt") public void testObjectRedeclaration2() throws Exception { - doTest("idea/testData/completion/basic/ObjectRedeclaration2.kt"); + doTest("idea/testData/completion/basic/common/ObjectRedeclaration2.kt"); } @TestMetadata("OnlyScopedClassesWithoutExplicit.kt") public void testOnlyScopedClassesWithoutExplicit() throws Exception { - doTest("idea/testData/completion/basic/OnlyScopedClassesWithoutExplicit.kt"); + doTest("idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt"); } @TestMetadata("OverloadFunctions.kt") public void testOverloadFunctions() throws Exception { - doTest("idea/testData/completion/basic/OverloadFunctions.kt"); + doTest("idea/testData/completion/basic/common/OverloadFunctions.kt"); } @TestMetadata("ShortClassNamesInTypePosition.kt") public void testShortClassNamesInTypePosition() throws Exception { - doTest("idea/testData/completion/basic/ShortClassNamesInTypePosition.kt"); + doTest("idea/testData/completion/basic/common/ShortClassNamesInTypePosition.kt"); } @TestMetadata("StandardJetArrayFirst.kt") public void testStandardJetArrayFirst() throws Exception { - doTest("idea/testData/completion/basic/StandardJetArrayFirst.kt"); + doTest("idea/testData/completion/basic/common/StandardJetArrayFirst.kt"); } @TestMetadata("StandardJetDoubleFirst.kt") public void testStandardJetDoubleFirst() throws Exception { - doTest("idea/testData/completion/basic/StandardJetDoubleFirst.kt"); + doTest("idea/testData/completion/basic/common/StandardJetDoubleFirst.kt"); } @TestMetadata("SubpackageInFun.kt") public void testSubpackageInFun() throws Exception { - doTest("idea/testData/completion/basic/SubpackageInFun.kt"); + doTest("idea/testData/completion/basic/common/SubpackageInFun.kt"); } @TestMetadata("VariableClassName.kt") public void testVariableClassName() throws Exception { - doTest("idea/testData/completion/basic/VariableClassName.kt"); + doTest("idea/testData/completion/basic/common/VariableClassName.kt"); } @TestMetadata("VisibilityClassMembersFromExternal.kt") public void testVisibilityClassMembersFromExternal() throws Exception { - doTest("idea/testData/completion/basic/VisibilityClassMembersFromExternal.kt"); + doTest("idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt"); } @TestMetadata("VisibilityClassMembersFromExternalForce.kt") public void testVisibilityClassMembersFromExternalForce() throws Exception { - doTest("idea/testData/completion/basic/VisibilityClassMembersFromExternalForce.kt"); + doTest("idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt"); } @TestMetadata("VisibilityInSubclass.kt") public void testVisibilityInSubclass() throws Exception { - doTest("idea/testData/completion/basic/VisibilityInSubclass.kt"); + doTest("idea/testData/completion/basic/common/VisibilityInSubclass.kt"); } @TestMetadata("VisibilityInSubclassForce.kt") public void testVisibilityInSubclassForce() throws Exception { - doTest("idea/testData/completion/basic/VisibilityInSubclassForce.kt"); + doTest("idea/testData/completion/basic/common/VisibilityInSubclassForce.kt"); } - } - - @TestMetadata("idea/testData/completion/basic/extensions") - public static class Extensions extends AbstractJetJSCompletionTest { - public void testAllFilesPresentInExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/extensions"), Pattern.compile("^(.+)\\.kt$"), false); + @TestMetadata("idea/testData/completion/basic/common/extensions") + public static class Extensions extends AbstractJetJSCompletionTest { + public void testAllFilesPresentInExtensions() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("ExtensionInExtendedClass.kt") + public void testExtensionInExtendedClass() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClass.kt"); + } + + @TestMetadata("ExtensionInExtendedClassThis.kt") + public void testExtensionInExtendedClassThis() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClassThis.kt"); + } + + @TestMetadata("ExtensionInExtension.kt") + public void testExtensionInExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtension.kt"); + } + + @TestMetadata("ExtensionInExtensionThis.kt") + public void testExtensionInExtensionThis() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtensionThis.kt"); + } + + @TestMetadata("InvalidTypeParameters.kt") + public void testInvalidTypeParameters() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/InvalidTypeParameters.kt"); + } + + @TestMetadata("IrrelevantExtension.kt") + public void testIrrelevantExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/IrrelevantExtension.kt"); + } + + @TestMetadata("JavaTypeExtension.kt") + public void testJavaTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/JavaTypeExtension.kt"); + } + + @TestMetadata("KotlinGenericTypeExtension.kt") + public void testKotlinGenericTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/KotlinGenericTypeExtension.kt"); + } + + @TestMetadata("KotlinTypeExtension.kt") + public void testKotlinTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/KotlinTypeExtension.kt"); + } + } - @TestMetadata("ExtensionInExtendedClass.kt") - public void testExtensionInExtendedClass() throws Exception { - doTest("idea/testData/completion/basic/extensions/ExtensionInExtendedClass.kt"); + public static Test innerSuite() { + TestSuite suite = new TestSuite("Common"); + suite.addTestSuite(Common.class); + suite.addTestSuite(Extensions.class); + return suite; } - - @TestMetadata("ExtensionInExtendedClassThis.kt") - public void testExtensionInExtendedClassThis() throws Exception { - doTest("idea/testData/completion/basic/extensions/ExtensionInExtendedClassThis.kt"); - } - - @TestMetadata("ExtensionInExtension.kt") - public void testExtensionInExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/ExtensionInExtension.kt"); - } - - @TestMetadata("ExtensionInExtensionThis.kt") - public void testExtensionInExtensionThis() throws Exception { - doTest("idea/testData/completion/basic/extensions/ExtensionInExtensionThis.kt"); - } - - @TestMetadata("InvalidTypeParameters.kt") - public void testInvalidTypeParameters() throws Exception { - doTest("idea/testData/completion/basic/extensions/InvalidTypeParameters.kt"); - } - - @TestMetadata("IrrelevantExtension.kt") - public void testIrrelevantExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/IrrelevantExtension.kt"); - } - - @TestMetadata("JavaTypeExtension.kt") - public void testJavaTypeExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/JavaTypeExtension.kt"); - } - - @TestMetadata("KotlinGenericTypeExtension.kt") - public void testKotlinGenericTypeExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/KotlinGenericTypeExtension.kt"); - } - - @TestMetadata("KotlinTypeExtension.kt") - public void testKotlinTypeExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/KotlinTypeExtension.kt"); - } - } @TestMetadata("idea/testData/completion/basic/js") public static class Js extends AbstractJetJSCompletionTest { public void testAllFilesPresentInJs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/js"), Pattern.compile("^(.+)\\.kt$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/js"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InPackage.kt") @@ -423,8 +430,7 @@ public class JetBasicJSCompletionTest extends AbstractJetJSCompletionTest { public static Test suite() { TestSuite suite = new TestSuite("JetBasicJSCompletionTest"); - suite.addTestSuite(Basic.class); - suite.addTestSuite(Extensions.class); + suite.addTest(Common.innerSuite()); suite.addTestSuite(Js.class); return suite; } diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java index 6260e6a2033..f46cdb76c86 100644 --- a/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java +++ b/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java @@ -30,383 +30,390 @@ import org.jetbrains.jet.completion.AbstractJavaCompletionTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({JetBasicJavaCompletionTest.Basic.class, JetBasicJavaCompletionTest.Extensions.class, JetBasicJavaCompletionTest.Java.class}) +@InnerTestClasses({JetBasicJavaCompletionTest.Common.class, JetBasicJavaCompletionTest.Java.class}) public class JetBasicJavaCompletionTest extends AbstractJavaCompletionTest { - @TestMetadata("idea/testData/completion/basic") - public static class Basic extends AbstractJavaCompletionTest { - public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic"), Pattern.compile("^(.+)\\.kt$"), false); + @TestMetadata("idea/testData/completion/basic/common") + @InnerTestClasses({Common.Extensions.class}) + public static class Common extends AbstractJavaCompletionTest { + public void testAllFilesPresentInCommon() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/common"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutoCastAfterIf.kt") public void testAutoCastAfterIf() throws Exception { - doTest("idea/testData/completion/basic/AutoCastAfterIf.kt"); + doTest("idea/testData/completion/basic/common/AutoCastAfterIf.kt"); } @TestMetadata("AutoCastAfterIfMethod.kt") public void testAutoCastAfterIfMethod() throws Exception { - doTest("idea/testData/completion/basic/AutoCastAfterIfMethod.kt"); + doTest("idea/testData/completion/basic/common/AutoCastAfterIfMethod.kt"); } @TestMetadata("AutoCastForThis.kt") public void testAutoCastForThis() throws Exception { - doTest("idea/testData/completion/basic/AutoCastForThis.kt"); + doTest("idea/testData/completion/basic/common/AutoCastForThis.kt"); } @TestMetadata("AutoCastInWhen.kt") public void testAutoCastInWhen() throws Exception { - doTest("idea/testData/completion/basic/AutoCastInWhen.kt"); + doTest("idea/testData/completion/basic/common/AutoCastInWhen.kt"); } @TestMetadata("BasicAny.kt") public void testBasicAny() throws Exception { - doTest("idea/testData/completion/basic/BasicAny.kt"); + doTest("idea/testData/completion/basic/common/BasicAny.kt"); } @TestMetadata("BasicInt.kt") public void testBasicInt() throws Exception { - doTest("idea/testData/completion/basic/BasicInt.kt"); + doTest("idea/testData/completion/basic/common/BasicInt.kt"); } @TestMetadata("BeforeDotInCall.kt") public void testBeforeDotInCall() throws Exception { - doTest("idea/testData/completion/basic/BeforeDotInCall.kt"); + doTest("idea/testData/completion/basic/common/BeforeDotInCall.kt"); } @TestMetadata("CallLocalLambda.kt") public void testCallLocalLambda() throws Exception { - doTest("idea/testData/completion/basic/CallLocalLambda.kt"); + doTest("idea/testData/completion/basic/common/CallLocalLambda.kt"); } @TestMetadata("ClassRedeclaration1.kt") public void testClassRedeclaration1() throws Exception { - doTest("idea/testData/completion/basic/ClassRedeclaration1.kt"); + doTest("idea/testData/completion/basic/common/ClassRedeclaration1.kt"); } @TestMetadata("ClassRedeclaration2.kt") public void testClassRedeclaration2() throws Exception { - doTest("idea/testData/completion/basic/ClassRedeclaration2.kt"); + doTest("idea/testData/completion/basic/common/ClassRedeclaration2.kt"); } @TestMetadata("CompletionInSetter.kt") public void testCompletionInSetter() throws Exception { - doTest("idea/testData/completion/basic/CompletionInSetter.kt"); + doTest("idea/testData/completion/basic/common/CompletionInSetter.kt"); } @TestMetadata("DoNotCompleteForErrorReceivers.kt") public void testDoNotCompleteForErrorReceivers() throws Exception { - doTest("idea/testData/completion/basic/DoNotCompleteForErrorReceivers.kt"); + doTest("idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt"); } @TestMetadata("ExtendClassName.kt") public void testExtendClassName() throws Exception { - doTest("idea/testData/completion/basic/ExtendClassName.kt"); + doTest("idea/testData/completion/basic/common/ExtendClassName.kt"); } @TestMetadata("ExtendQualifiedClassName.kt") public void testExtendQualifiedClassName() throws Exception { - doTest("idea/testData/completion/basic/ExtendQualifiedClassName.kt"); + doTest("idea/testData/completion/basic/common/ExtendQualifiedClassName.kt"); } @TestMetadata("ExtensionForProperty.kt") public void testExtensionForProperty() throws Exception { - doTest("idea/testData/completion/basic/ExtensionForProperty.kt"); + doTest("idea/testData/completion/basic/common/ExtensionForProperty.kt"); } @TestMetadata("ExtensionFunReceiver.kt") public void testExtensionFunReceiver() throws Exception { - doTest("idea/testData/completion/basic/ExtensionFunReceiver.kt"); + doTest("idea/testData/completion/basic/common/ExtensionFunReceiver.kt"); } @TestMetadata("ExtensionWithAdditionalTypeParameters.kt") public void testExtensionWithAdditionalTypeParameters() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithAdditionalTypeParameters.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithAdditionalTypeParameters.kt"); } @TestMetadata("ExtensionWithGenericParamInReceiver.kt") public void testExtensionWithGenericParamInReceiver() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithGenericParamInReceiver.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithGenericParamInReceiver.kt"); } @TestMetadata("ExtensionWithGenericReceiver.kt") public void testExtensionWithGenericReceiver() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithGenericReceiver.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithGenericReceiver.kt"); } @TestMetadata("ExtensionWithInternalGenericParameters.kt") public void testExtensionWithInternalGenericParameters() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithInternalGenericParameters.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithInternalGenericParameters.kt"); } @TestMetadata("ExtensionWithManyTypeParamsInReceiver.kt") public void testExtensionWithManyTypeParamsInReceiver() throws Exception { - doTest("idea/testData/completion/basic/ExtensionWithManyTypeParamsInReceiver.kt"); + doTest("idea/testData/completion/basic/common/ExtensionWithManyTypeParamsInReceiver.kt"); } @TestMetadata("FromImports.kt") public void testFromImports() throws Exception { - doTest("idea/testData/completion/basic/FromImports.kt"); + doTest("idea/testData/completion/basic/common/FromImports.kt"); } @TestMetadata("FunctionCompletionFormatting.kt") public void testFunctionCompletionFormatting() throws Exception { - doTest("idea/testData/completion/basic/FunctionCompletionFormatting.kt"); + doTest("idea/testData/completion/basic/common/FunctionCompletionFormatting.kt"); } @TestMetadata("InCallExpression.kt") public void testInCallExpression() throws Exception { - doTest("idea/testData/completion/basic/InCallExpression.kt"); + doTest("idea/testData/completion/basic/common/InCallExpression.kt"); } @TestMetadata("InClassInitializer.kt") public void testInClassInitializer() throws Exception { - doTest("idea/testData/completion/basic/InClassInitializer.kt"); + doTest("idea/testData/completion/basic/common/InClassInitializer.kt"); } @TestMetadata("InClassPropertyAccessor.kt") public void testInClassPropertyAccessor() throws Exception { - doTest("idea/testData/completion/basic/InClassPropertyAccessor.kt"); + doTest("idea/testData/completion/basic/common/InClassPropertyAccessor.kt"); } @TestMetadata("InEmptyImport.kt") public void testInEmptyImport() throws Exception { - doTest("idea/testData/completion/basic/InEmptyImport.kt"); + doTest("idea/testData/completion/basic/common/InEmptyImport.kt"); } @TestMetadata("InExpressionNoPrefix.kt") public void testInExpressionNoPrefix() throws Exception { - doTest("idea/testData/completion/basic/InExpressionNoPrefix.kt"); + doTest("idea/testData/completion/basic/common/InExpressionNoPrefix.kt"); } @TestMetadata("InExtendTypeAnnotation.kt") public void testInExtendTypeAnnotation() throws Exception { - doTest("idea/testData/completion/basic/InExtendTypeAnnotation.kt"); + doTest("idea/testData/completion/basic/common/InExtendTypeAnnotation.kt"); } @TestMetadata("InFileWithMultiDeclaration.kt") public void testInFileWithMultiDeclaration() throws Exception { - doTest("idea/testData/completion/basic/InFileWithMultiDeclaration.kt"); + doTest("idea/testData/completion/basic/common/InFileWithMultiDeclaration.kt"); } @TestMetadata("InFileWithTypedef.kt") public void testInFileWithTypedef() throws Exception { - doTest("idea/testData/completion/basic/InFileWithTypedef.kt"); + doTest("idea/testData/completion/basic/common/InFileWithTypedef.kt"); } @TestMetadata("InFunInClassInitializer.kt") public void testInFunInClassInitializer() throws Exception { - doTest("idea/testData/completion/basic/InFunInClassInitializer.kt"); + doTest("idea/testData/completion/basic/common/InFunInClassInitializer.kt"); } @TestMetadata("InGlobalPropertyInitializer.kt") public void testInGlobalPropertyInitializer() throws Exception { - doTest("idea/testData/completion/basic/InGlobalPropertyInitializer.kt"); + doTest("idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt"); } @TestMetadata("InImport.kt") public void testInImport() throws Exception { - doTest("idea/testData/completion/basic/InImport.kt"); + doTest("idea/testData/completion/basic/common/InImport.kt"); } @TestMetadata("InInitializerInPropertyAccessor.kt") public void testInInitializerInPropertyAccessor() throws Exception { - doTest("idea/testData/completion/basic/InInitializerInPropertyAccessor.kt"); + doTest("idea/testData/completion/basic/common/InInitializerInPropertyAccessor.kt"); } @TestMetadata("InLocalObjectDeclaration.kt") public void testInLocalObjectDeclaration() throws Exception { - doTest("idea/testData/completion/basic/InLocalObjectDeclaration.kt"); + doTest("idea/testData/completion/basic/common/InLocalObjectDeclaration.kt"); } @TestMetadata("InLongDotQualifiedExpression.kt") public void testInLongDotQualifiedExpression() throws Exception { - doTest("idea/testData/completion/basic/InLongDotQualifiedExpression.kt"); + doTest("idea/testData/completion/basic/common/InLongDotQualifiedExpression.kt"); } @TestMetadata("InMiddleOfNamespace.kt") public void testInMiddleOfNamespace() throws Exception { - doTest("idea/testData/completion/basic/InMiddleOfNamespace.kt"); + doTest("idea/testData/completion/basic/common/InMiddleOfNamespace.kt"); } @TestMetadata("InMiddleOfPackage.kt") public void testInMiddleOfPackage() throws Exception { - doTest("idea/testData/completion/basic/InMiddleOfPackage.kt"); + doTest("idea/testData/completion/basic/common/InMiddleOfPackage.kt"); } @TestMetadata("InObjectInDelegationSpecifier.kt") public void testInObjectInDelegationSpecifier() throws Exception { - doTest("idea/testData/completion/basic/InObjectInDelegationSpecifier.kt"); + doTest("idea/testData/completion/basic/common/InObjectInDelegationSpecifier.kt"); } @TestMetadata("InPackageBegin.kt") public void testInPackageBegin() throws Exception { - doTest("idea/testData/completion/basic/InPackageBegin.kt"); + doTest("idea/testData/completion/basic/common/InPackageBegin.kt"); } @TestMetadata("InTypeAnnotation.kt") public void testInTypeAnnotation() throws Exception { - doTest("idea/testData/completion/basic/InTypeAnnotation.kt"); + doTest("idea/testData/completion/basic/common/InTypeAnnotation.kt"); } @TestMetadata("JavaPackage.kt") public void testJavaPackage() throws Exception { - doTest("idea/testData/completion/basic/JavaPackage.kt"); + doTest("idea/testData/completion/basic/common/JavaPackage.kt"); } @TestMetadata("LocalMultideclarationValues.kt") public void testLocalMultideclarationValues() throws Exception { - doTest("idea/testData/completion/basic/LocalMultideclarationValues.kt"); + doTest("idea/testData/completion/basic/common/LocalMultideclarationValues.kt"); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - doTest("idea/testData/completion/basic/NamedObject.kt"); + doTest("idea/testData/completion/basic/common/NamedObject.kt"); } @TestMetadata("NoClassNameDuplication.kt") public void testNoClassNameDuplication() throws Exception { - doTest("idea/testData/completion/basic/NoClassNameDuplication.kt"); + doTest("idea/testData/completion/basic/common/NoClassNameDuplication.kt"); } @TestMetadata("NoEmptyNamespace.kt") public void testNoEmptyNamespace() throws Exception { - doTest("idea/testData/completion/basic/NoEmptyNamespace.kt"); + doTest("idea/testData/completion/basic/common/NoEmptyNamespace.kt"); } @TestMetadata("NoObjectInTypePosition.kt") public void testNoObjectInTypePosition() throws Exception { - doTest("idea/testData/completion/basic/NoObjectInTypePosition.kt"); + doTest("idea/testData/completion/basic/common/NoObjectInTypePosition.kt"); } @TestMetadata("NoTopLevelCompletionInQualifiedUserTypes.kt") public void testNoTopLevelCompletionInQualifiedUserTypes() throws Exception { - doTest("idea/testData/completion/basic/NoTopLevelCompletionInQualifiedUserTypes.kt"); + doTest("idea/testData/completion/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt"); } @TestMetadata("ObjectRedeclaration1.kt") public void testObjectRedeclaration1() throws Exception { - doTest("idea/testData/completion/basic/ObjectRedeclaration1.kt"); + doTest("idea/testData/completion/basic/common/ObjectRedeclaration1.kt"); } @TestMetadata("ObjectRedeclaration2.kt") public void testObjectRedeclaration2() throws Exception { - doTest("idea/testData/completion/basic/ObjectRedeclaration2.kt"); + doTest("idea/testData/completion/basic/common/ObjectRedeclaration2.kt"); } @TestMetadata("OnlyScopedClassesWithoutExplicit.kt") public void testOnlyScopedClassesWithoutExplicit() throws Exception { - doTest("idea/testData/completion/basic/OnlyScopedClassesWithoutExplicit.kt"); + doTest("idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt"); } @TestMetadata("OverloadFunctions.kt") public void testOverloadFunctions() throws Exception { - doTest("idea/testData/completion/basic/OverloadFunctions.kt"); + doTest("idea/testData/completion/basic/common/OverloadFunctions.kt"); } @TestMetadata("ShortClassNamesInTypePosition.kt") public void testShortClassNamesInTypePosition() throws Exception { - doTest("idea/testData/completion/basic/ShortClassNamesInTypePosition.kt"); + doTest("idea/testData/completion/basic/common/ShortClassNamesInTypePosition.kt"); } @TestMetadata("StandardJetArrayFirst.kt") public void testStandardJetArrayFirst() throws Exception { - doTest("idea/testData/completion/basic/StandardJetArrayFirst.kt"); + doTest("idea/testData/completion/basic/common/StandardJetArrayFirst.kt"); } @TestMetadata("StandardJetDoubleFirst.kt") public void testStandardJetDoubleFirst() throws Exception { - doTest("idea/testData/completion/basic/StandardJetDoubleFirst.kt"); + doTest("idea/testData/completion/basic/common/StandardJetDoubleFirst.kt"); } @TestMetadata("SubpackageInFun.kt") public void testSubpackageInFun() throws Exception { - doTest("idea/testData/completion/basic/SubpackageInFun.kt"); + doTest("idea/testData/completion/basic/common/SubpackageInFun.kt"); } @TestMetadata("VariableClassName.kt") public void testVariableClassName() throws Exception { - doTest("idea/testData/completion/basic/VariableClassName.kt"); + doTest("idea/testData/completion/basic/common/VariableClassName.kt"); } @TestMetadata("VisibilityClassMembersFromExternal.kt") public void testVisibilityClassMembersFromExternal() throws Exception { - doTest("idea/testData/completion/basic/VisibilityClassMembersFromExternal.kt"); + doTest("idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt"); } @TestMetadata("VisibilityClassMembersFromExternalForce.kt") public void testVisibilityClassMembersFromExternalForce() throws Exception { - doTest("idea/testData/completion/basic/VisibilityClassMembersFromExternalForce.kt"); + doTest("idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt"); } @TestMetadata("VisibilityInSubclass.kt") public void testVisibilityInSubclass() throws Exception { - doTest("idea/testData/completion/basic/VisibilityInSubclass.kt"); + doTest("idea/testData/completion/basic/common/VisibilityInSubclass.kt"); } @TestMetadata("VisibilityInSubclassForce.kt") public void testVisibilityInSubclassForce() throws Exception { - doTest("idea/testData/completion/basic/VisibilityInSubclassForce.kt"); + doTest("idea/testData/completion/basic/common/VisibilityInSubclassForce.kt"); } - } - - @TestMetadata("idea/testData/completion/basic/extensions") - public static class Extensions extends AbstractJavaCompletionTest { - public void testAllFilesPresentInExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/extensions"), Pattern.compile("^(.+)\\.kt$"), false); + @TestMetadata("idea/testData/completion/basic/common/extensions") + public static class Extensions extends AbstractJavaCompletionTest { + public void testAllFilesPresentInExtensions() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("ExtensionInExtendedClass.kt") + public void testExtensionInExtendedClass() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClass.kt"); + } + + @TestMetadata("ExtensionInExtendedClassThis.kt") + public void testExtensionInExtendedClassThis() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClassThis.kt"); + } + + @TestMetadata("ExtensionInExtension.kt") + public void testExtensionInExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtension.kt"); + } + + @TestMetadata("ExtensionInExtensionThis.kt") + public void testExtensionInExtensionThis() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtensionThis.kt"); + } + + @TestMetadata("InvalidTypeParameters.kt") + public void testInvalidTypeParameters() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/InvalidTypeParameters.kt"); + } + + @TestMetadata("IrrelevantExtension.kt") + public void testIrrelevantExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/IrrelevantExtension.kt"); + } + + @TestMetadata("JavaTypeExtension.kt") + public void testJavaTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/JavaTypeExtension.kt"); + } + + @TestMetadata("KotlinGenericTypeExtension.kt") + public void testKotlinGenericTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/KotlinGenericTypeExtension.kt"); + } + + @TestMetadata("KotlinTypeExtension.kt") + public void testKotlinTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/common/extensions/KotlinTypeExtension.kt"); + } + } - @TestMetadata("ExtensionInExtendedClass.kt") - public void testExtensionInExtendedClass() throws Exception { - doTest("idea/testData/completion/basic/extensions/ExtensionInExtendedClass.kt"); + public static Test innerSuite() { + TestSuite suite = new TestSuite("Common"); + suite.addTestSuite(Common.class); + suite.addTestSuite(Extensions.class); + return suite; } - - @TestMetadata("ExtensionInExtendedClassThis.kt") - public void testExtensionInExtendedClassThis() throws Exception { - doTest("idea/testData/completion/basic/extensions/ExtensionInExtendedClassThis.kt"); - } - - @TestMetadata("ExtensionInExtension.kt") - public void testExtensionInExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/ExtensionInExtension.kt"); - } - - @TestMetadata("ExtensionInExtensionThis.kt") - public void testExtensionInExtensionThis() throws Exception { - doTest("idea/testData/completion/basic/extensions/ExtensionInExtensionThis.kt"); - } - - @TestMetadata("InvalidTypeParameters.kt") - public void testInvalidTypeParameters() throws Exception { - doTest("idea/testData/completion/basic/extensions/InvalidTypeParameters.kt"); - } - - @TestMetadata("IrrelevantExtension.kt") - public void testIrrelevantExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/IrrelevantExtension.kt"); - } - - @TestMetadata("JavaTypeExtension.kt") - public void testJavaTypeExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/JavaTypeExtension.kt"); - } - - @TestMetadata("KotlinGenericTypeExtension.kt") - public void testKotlinGenericTypeExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/KotlinGenericTypeExtension.kt"); - } - - @TestMetadata("KotlinTypeExtension.kt") - public void testKotlinTypeExtension() throws Exception { - doTest("idea/testData/completion/basic/extensions/KotlinTypeExtension.kt"); - } - } @TestMetadata("idea/testData/completion/basic/java") public static class Java extends AbstractJavaCompletionTest { public void testAllFilesPresentInJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/java"), Pattern.compile("^(.+)\\.kt$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/java"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ExtensionFromStandardLibrary.kt") @@ -448,8 +455,7 @@ public class JetBasicJavaCompletionTest extends AbstractJavaCompletionTest { public static Test suite() { TestSuite suite = new TestSuite("JetBasicJavaCompletionTest"); - suite.addTestSuite(Basic.class); - suite.addTestSuite(Extensions.class); + suite.addTest(Common.innerSuite()); suite.addTestSuite(Java.class); return suite; }