From ec478215677258cb46710c3cb400ee2e09598cfb Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 4 Mar 2014 19:00:18 +0400 Subject: [PATCH] restructured control flow tests --- .../cfg/{ => arrays}/ArrayAccess.instructions | 0 .../testData/cfg/{ => arrays}/ArrayAccess.kt | 0 .../ArrayOfFunctions.instructions | 0 .../cfg/{ => arrays}/ArrayOfFunctions.kt | 0 .../arrayAccessExpression.instructions | 0 .../cfg/{ => arrays}/arrayAccessExpression.kt | 0 .../cfg/{ => arrays}/arraySet.instructions | 0 .../testData/cfg/{ => arrays}/arraySet.kt | 0 .../arraySetPlusAssign.instructions | 0 .../cfg/{ => arrays}/arraySetPlusAssign.kt | 0 .../cfg/{ => basic}/Basic.instructions | 0 compiler/testData/cfg/{ => basic}/Basic.kt | 0 .../{ => basic}/EmptyFunction.instructions | 0 .../testData/cfg/{ => basic}/EmptyFunction.kt | 0 .../{ => basic}/ShortFunction.instructions | 0 .../testData/cfg/{ => basic}/ShortFunction.kt | 0 .../Finally.instructions | 0 .../cfg/{ => controlStructures}/Finally.kt | 0 .../FinallyTestCopy.instructions | 0 .../FinallyTestCopy.kt | 0 .../{ => controlStructures}/For.instructions | 0 .../cfg/{ => controlStructures}/For.kt | 0 .../{ => controlStructures}/If.instructions | 0 .../cfg/{ => controlStructures}/If.kt | 0 .../OnlyWhileInFunctionBody.instructions | 0 .../OnlyWhileInFunctionBody.kt | 0 .../returnsInWhen.instructions | 0 .../{ => controlStructures}/returnsInWhen.kt | 0 .../cfg/{ => conventions}/equals.instructions | 0 .../testData/cfg/{ => conventions}/equals.kt | 0 .../incrementAtTheEnd.instructions | 0 .../{ => conventions}/incrementAtTheEnd.kt | 0 .../cfg/{ => conventions}/invoke.instructions | 0 .../testData/cfg/{ => conventions}/invoke.kt | 0 .../{ => conventions}/notEqual.instructions | 0 .../cfg/{ => conventions}/notEqual.kt | 0 .../AnonymousInitializers.instructions | 0 .../AnonymousInitializers.kt | 0 .../unusedFunctionLiteral.instructions | 0 .../unusedFunctionLiteral.kt | 0 .../functions}/FailFunction.instructions | 0 .../functions}/FailFunction.kt | 0 .../functions}/typeParameter.instructions | 0 .../functions}/typeParameter.kt | 0 .../local}/LocalDeclarations.instructions | 0 .../local}/LocalDeclarations.kt | 0 .../local}/ObjectExpression.instructions | 0 .../local}/ObjectExpression.kt | 0 .../local}/localClass.instructions | 0 .../{ => declarations/local}/localClass.kt | 0 .../local}/localProperty.instructions | 0 .../{ => declarations/local}/localProperty.kt | 0 .../multiDeclaration}/MultiDecl.instructions | 0 .../multiDeclaration}/MultiDecl.kt | 0 .../multiDeclarationWithError.instructions | 0 .../multiDeclarationWithError.kt | 0 .../DelegatedProperty.instructions | 0 .../properties}/DelegatedProperty.kt | 0 .../backingFieldAccess.instructions | 0 .../properties}/backingFieldAccess.kt | 0 ...backingFieldQualifiedWithThis.instructions | 0 .../backingFieldQualifiedWithThis.kt | 0 .../Assignments.instructions | 0 .../cfg/{ => expressions}/Assignments.kt | 0 .../LazyBooleans.instructions | 0 .../cfg/{ => expressions}/LazyBooleans.kt | 0 .../ReturnFromExpression.instructions | 0 .../{ => expressions}/ReturnFromExpression.kt | 0 .../assignmentToThis.instructions | 0 .../cfg/{ => expressions}/assignmentToThis.kt | 0 .../chainedQualifiedExpression.instructions | 0 .../chainedQualifiedExpression.kt | 0 .../expressionAsFunction.instructions | 0 .../{ => expressions}/expressionAsFunction.kt | 0 .../propertySafeCall.instructions | 0 .../cfg/{ => expressions}/propertySafeCall.kt | 0 ...fiedExpressionWithoutSelector.instructions | 0 .../qualifiedExpressionWithoutSelector.kt | 0 .../thisExpression.instructions | 0 .../cfg/{ => expressions}/thisExpression.kt | 0 .../{ => expressions}/unresolved.instructions | 0 .../cfg/{ => expressions}/unresolved.kt | 0 .../unusedExpressionSimpleName.instructions | 0 .../unusedExpressionSimpleName.kt | 0 .../jet/cfg/ControlFlowTestGenerated.java | 520 +++++++++++------- 85 files changed, 317 insertions(+), 203 deletions(-) rename compiler/testData/cfg/{ => arrays}/ArrayAccess.instructions (100%) rename compiler/testData/cfg/{ => arrays}/ArrayAccess.kt (100%) rename compiler/testData/cfg/{ => arrays}/ArrayOfFunctions.instructions (100%) rename compiler/testData/cfg/{ => arrays}/ArrayOfFunctions.kt (100%) rename compiler/testData/cfg/{ => arrays}/arrayAccessExpression.instructions (100%) rename compiler/testData/cfg/{ => arrays}/arrayAccessExpression.kt (100%) rename compiler/testData/cfg/{ => arrays}/arraySet.instructions (100%) rename compiler/testData/cfg/{ => arrays}/arraySet.kt (100%) rename compiler/testData/cfg/{ => arrays}/arraySetPlusAssign.instructions (100%) rename compiler/testData/cfg/{ => arrays}/arraySetPlusAssign.kt (100%) rename compiler/testData/cfg/{ => basic}/Basic.instructions (100%) rename compiler/testData/cfg/{ => basic}/Basic.kt (100%) rename compiler/testData/cfg/{ => basic}/EmptyFunction.instructions (100%) rename compiler/testData/cfg/{ => basic}/EmptyFunction.kt (100%) rename compiler/testData/cfg/{ => basic}/ShortFunction.instructions (100%) rename compiler/testData/cfg/{ => basic}/ShortFunction.kt (100%) rename compiler/testData/cfg/{ => controlStructures}/Finally.instructions (100%) rename compiler/testData/cfg/{ => controlStructures}/Finally.kt (100%) rename compiler/testData/cfg/{ => controlStructures}/FinallyTestCopy.instructions (100%) rename compiler/testData/cfg/{ => controlStructures}/FinallyTestCopy.kt (100%) rename compiler/testData/cfg/{ => controlStructures}/For.instructions (100%) rename compiler/testData/cfg/{ => controlStructures}/For.kt (100%) rename compiler/testData/cfg/{ => controlStructures}/If.instructions (100%) rename compiler/testData/cfg/{ => controlStructures}/If.kt (100%) rename compiler/testData/cfg/{ => controlStructures}/OnlyWhileInFunctionBody.instructions (100%) rename compiler/testData/cfg/{ => controlStructures}/OnlyWhileInFunctionBody.kt (100%) rename compiler/testData/cfg/{ => controlStructures}/returnsInWhen.instructions (100%) rename compiler/testData/cfg/{ => controlStructures}/returnsInWhen.kt (100%) rename compiler/testData/cfg/{ => conventions}/equals.instructions (100%) rename compiler/testData/cfg/{ => conventions}/equals.kt (100%) rename compiler/testData/cfg/{ => conventions}/incrementAtTheEnd.instructions (100%) rename compiler/testData/cfg/{ => conventions}/incrementAtTheEnd.kt (100%) rename compiler/testData/cfg/{ => conventions}/invoke.instructions (100%) rename compiler/testData/cfg/{ => conventions}/invoke.kt (100%) rename compiler/testData/cfg/{ => conventions}/notEqual.instructions (100%) rename compiler/testData/cfg/{ => conventions}/notEqual.kt (100%) rename compiler/testData/cfg/{ => declarations/classesAndObjects}/AnonymousInitializers.instructions (100%) rename compiler/testData/cfg/{ => declarations/classesAndObjects}/AnonymousInitializers.kt (100%) rename compiler/testData/cfg/{ => declarations/functionLiterals}/unusedFunctionLiteral.instructions (100%) rename compiler/testData/cfg/{ => declarations/functionLiterals}/unusedFunctionLiteral.kt (100%) rename compiler/testData/cfg/{ => declarations/functions}/FailFunction.instructions (100%) rename compiler/testData/cfg/{ => declarations/functions}/FailFunction.kt (100%) rename compiler/testData/cfg/{ => declarations/functions}/typeParameter.instructions (100%) rename compiler/testData/cfg/{ => declarations/functions}/typeParameter.kt (100%) rename compiler/testData/cfg/{ => declarations/local}/LocalDeclarations.instructions (100%) rename compiler/testData/cfg/{ => declarations/local}/LocalDeclarations.kt (100%) rename compiler/testData/cfg/{ => declarations/local}/ObjectExpression.instructions (100%) rename compiler/testData/cfg/{ => declarations/local}/ObjectExpression.kt (100%) rename compiler/testData/cfg/{ => declarations/local}/localClass.instructions (100%) rename compiler/testData/cfg/{ => declarations/local}/localClass.kt (100%) rename compiler/testData/cfg/{ => declarations/local}/localProperty.instructions (100%) rename compiler/testData/cfg/{ => declarations/local}/localProperty.kt (100%) rename compiler/testData/cfg/{ => declarations/multiDeclaration}/MultiDecl.instructions (100%) rename compiler/testData/cfg/{ => declarations/multiDeclaration}/MultiDecl.kt (100%) rename compiler/testData/cfg/{ => declarations/multiDeclaration}/multiDeclarationWithError.instructions (100%) rename compiler/testData/cfg/{ => declarations/multiDeclaration}/multiDeclarationWithError.kt (100%) rename compiler/testData/cfg/{ => declarations/properties}/DelegatedProperty.instructions (100%) rename compiler/testData/cfg/{ => declarations/properties}/DelegatedProperty.kt (100%) rename compiler/testData/cfg/{ => declarations/properties}/backingFieldAccess.instructions (100%) rename compiler/testData/cfg/{ => declarations/properties}/backingFieldAccess.kt (100%) rename compiler/testData/cfg/{ => declarations/properties}/backingFieldQualifiedWithThis.instructions (100%) rename compiler/testData/cfg/{ => declarations/properties}/backingFieldQualifiedWithThis.kt (100%) rename compiler/testData/cfg/{ => expressions}/Assignments.instructions (100%) rename compiler/testData/cfg/{ => expressions}/Assignments.kt (100%) rename compiler/testData/cfg/{ => expressions}/LazyBooleans.instructions (100%) rename compiler/testData/cfg/{ => expressions}/LazyBooleans.kt (100%) rename compiler/testData/cfg/{ => expressions}/ReturnFromExpression.instructions (100%) rename compiler/testData/cfg/{ => expressions}/ReturnFromExpression.kt (100%) rename compiler/testData/cfg/{ => expressions}/assignmentToThis.instructions (100%) rename compiler/testData/cfg/{ => expressions}/assignmentToThis.kt (100%) rename compiler/testData/cfg/{ => expressions}/chainedQualifiedExpression.instructions (100%) rename compiler/testData/cfg/{ => expressions}/chainedQualifiedExpression.kt (100%) rename compiler/testData/cfg/{ => expressions}/expressionAsFunction.instructions (100%) rename compiler/testData/cfg/{ => expressions}/expressionAsFunction.kt (100%) rename compiler/testData/cfg/{ => expressions}/propertySafeCall.instructions (100%) rename compiler/testData/cfg/{ => expressions}/propertySafeCall.kt (100%) rename compiler/testData/cfg/{ => expressions}/qualifiedExpressionWithoutSelector.instructions (100%) rename compiler/testData/cfg/{ => expressions}/qualifiedExpressionWithoutSelector.kt (100%) rename compiler/testData/cfg/{ => expressions}/thisExpression.instructions (100%) rename compiler/testData/cfg/{ => expressions}/thisExpression.kt (100%) rename compiler/testData/cfg/{ => expressions}/unresolved.instructions (100%) rename compiler/testData/cfg/{ => expressions}/unresolved.kt (100%) rename compiler/testData/cfg/{ => expressions}/unusedExpressionSimpleName.instructions (100%) rename compiler/testData/cfg/{ => expressions}/unusedExpressionSimpleName.kt (100%) diff --git a/compiler/testData/cfg/ArrayAccess.instructions b/compiler/testData/cfg/arrays/ArrayAccess.instructions similarity index 100% rename from compiler/testData/cfg/ArrayAccess.instructions rename to compiler/testData/cfg/arrays/ArrayAccess.instructions diff --git a/compiler/testData/cfg/ArrayAccess.kt b/compiler/testData/cfg/arrays/ArrayAccess.kt similarity index 100% rename from compiler/testData/cfg/ArrayAccess.kt rename to compiler/testData/cfg/arrays/ArrayAccess.kt diff --git a/compiler/testData/cfg/ArrayOfFunctions.instructions b/compiler/testData/cfg/arrays/ArrayOfFunctions.instructions similarity index 100% rename from compiler/testData/cfg/ArrayOfFunctions.instructions rename to compiler/testData/cfg/arrays/ArrayOfFunctions.instructions diff --git a/compiler/testData/cfg/ArrayOfFunctions.kt b/compiler/testData/cfg/arrays/ArrayOfFunctions.kt similarity index 100% rename from compiler/testData/cfg/ArrayOfFunctions.kt rename to compiler/testData/cfg/arrays/ArrayOfFunctions.kt diff --git a/compiler/testData/cfg/arrayAccessExpression.instructions b/compiler/testData/cfg/arrays/arrayAccessExpression.instructions similarity index 100% rename from compiler/testData/cfg/arrayAccessExpression.instructions rename to compiler/testData/cfg/arrays/arrayAccessExpression.instructions diff --git a/compiler/testData/cfg/arrayAccessExpression.kt b/compiler/testData/cfg/arrays/arrayAccessExpression.kt similarity index 100% rename from compiler/testData/cfg/arrayAccessExpression.kt rename to compiler/testData/cfg/arrays/arrayAccessExpression.kt diff --git a/compiler/testData/cfg/arraySet.instructions b/compiler/testData/cfg/arrays/arraySet.instructions similarity index 100% rename from compiler/testData/cfg/arraySet.instructions rename to compiler/testData/cfg/arrays/arraySet.instructions diff --git a/compiler/testData/cfg/arraySet.kt b/compiler/testData/cfg/arrays/arraySet.kt similarity index 100% rename from compiler/testData/cfg/arraySet.kt rename to compiler/testData/cfg/arrays/arraySet.kt diff --git a/compiler/testData/cfg/arraySetPlusAssign.instructions b/compiler/testData/cfg/arrays/arraySetPlusAssign.instructions similarity index 100% rename from compiler/testData/cfg/arraySetPlusAssign.instructions rename to compiler/testData/cfg/arrays/arraySetPlusAssign.instructions diff --git a/compiler/testData/cfg/arraySetPlusAssign.kt b/compiler/testData/cfg/arrays/arraySetPlusAssign.kt similarity index 100% rename from compiler/testData/cfg/arraySetPlusAssign.kt rename to compiler/testData/cfg/arrays/arraySetPlusAssign.kt diff --git a/compiler/testData/cfg/Basic.instructions b/compiler/testData/cfg/basic/Basic.instructions similarity index 100% rename from compiler/testData/cfg/Basic.instructions rename to compiler/testData/cfg/basic/Basic.instructions diff --git a/compiler/testData/cfg/Basic.kt b/compiler/testData/cfg/basic/Basic.kt similarity index 100% rename from compiler/testData/cfg/Basic.kt rename to compiler/testData/cfg/basic/Basic.kt diff --git a/compiler/testData/cfg/EmptyFunction.instructions b/compiler/testData/cfg/basic/EmptyFunction.instructions similarity index 100% rename from compiler/testData/cfg/EmptyFunction.instructions rename to compiler/testData/cfg/basic/EmptyFunction.instructions diff --git a/compiler/testData/cfg/EmptyFunction.kt b/compiler/testData/cfg/basic/EmptyFunction.kt similarity index 100% rename from compiler/testData/cfg/EmptyFunction.kt rename to compiler/testData/cfg/basic/EmptyFunction.kt diff --git a/compiler/testData/cfg/ShortFunction.instructions b/compiler/testData/cfg/basic/ShortFunction.instructions similarity index 100% rename from compiler/testData/cfg/ShortFunction.instructions rename to compiler/testData/cfg/basic/ShortFunction.instructions diff --git a/compiler/testData/cfg/ShortFunction.kt b/compiler/testData/cfg/basic/ShortFunction.kt similarity index 100% rename from compiler/testData/cfg/ShortFunction.kt rename to compiler/testData/cfg/basic/ShortFunction.kt diff --git a/compiler/testData/cfg/Finally.instructions b/compiler/testData/cfg/controlStructures/Finally.instructions similarity index 100% rename from compiler/testData/cfg/Finally.instructions rename to compiler/testData/cfg/controlStructures/Finally.instructions diff --git a/compiler/testData/cfg/Finally.kt b/compiler/testData/cfg/controlStructures/Finally.kt similarity index 100% rename from compiler/testData/cfg/Finally.kt rename to compiler/testData/cfg/controlStructures/Finally.kt diff --git a/compiler/testData/cfg/FinallyTestCopy.instructions b/compiler/testData/cfg/controlStructures/FinallyTestCopy.instructions similarity index 100% rename from compiler/testData/cfg/FinallyTestCopy.instructions rename to compiler/testData/cfg/controlStructures/FinallyTestCopy.instructions diff --git a/compiler/testData/cfg/FinallyTestCopy.kt b/compiler/testData/cfg/controlStructures/FinallyTestCopy.kt similarity index 100% rename from compiler/testData/cfg/FinallyTestCopy.kt rename to compiler/testData/cfg/controlStructures/FinallyTestCopy.kt diff --git a/compiler/testData/cfg/For.instructions b/compiler/testData/cfg/controlStructures/For.instructions similarity index 100% rename from compiler/testData/cfg/For.instructions rename to compiler/testData/cfg/controlStructures/For.instructions diff --git a/compiler/testData/cfg/For.kt b/compiler/testData/cfg/controlStructures/For.kt similarity index 100% rename from compiler/testData/cfg/For.kt rename to compiler/testData/cfg/controlStructures/For.kt diff --git a/compiler/testData/cfg/If.instructions b/compiler/testData/cfg/controlStructures/If.instructions similarity index 100% rename from compiler/testData/cfg/If.instructions rename to compiler/testData/cfg/controlStructures/If.instructions diff --git a/compiler/testData/cfg/If.kt b/compiler/testData/cfg/controlStructures/If.kt similarity index 100% rename from compiler/testData/cfg/If.kt rename to compiler/testData/cfg/controlStructures/If.kt diff --git a/compiler/testData/cfg/OnlyWhileInFunctionBody.instructions b/compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.instructions similarity index 100% rename from compiler/testData/cfg/OnlyWhileInFunctionBody.instructions rename to compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.instructions diff --git a/compiler/testData/cfg/OnlyWhileInFunctionBody.kt b/compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt similarity index 100% rename from compiler/testData/cfg/OnlyWhileInFunctionBody.kt rename to compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt diff --git a/compiler/testData/cfg/returnsInWhen.instructions b/compiler/testData/cfg/controlStructures/returnsInWhen.instructions similarity index 100% rename from compiler/testData/cfg/returnsInWhen.instructions rename to compiler/testData/cfg/controlStructures/returnsInWhen.instructions diff --git a/compiler/testData/cfg/returnsInWhen.kt b/compiler/testData/cfg/controlStructures/returnsInWhen.kt similarity index 100% rename from compiler/testData/cfg/returnsInWhen.kt rename to compiler/testData/cfg/controlStructures/returnsInWhen.kt diff --git a/compiler/testData/cfg/equals.instructions b/compiler/testData/cfg/conventions/equals.instructions similarity index 100% rename from compiler/testData/cfg/equals.instructions rename to compiler/testData/cfg/conventions/equals.instructions diff --git a/compiler/testData/cfg/equals.kt b/compiler/testData/cfg/conventions/equals.kt similarity index 100% rename from compiler/testData/cfg/equals.kt rename to compiler/testData/cfg/conventions/equals.kt diff --git a/compiler/testData/cfg/incrementAtTheEnd.instructions b/compiler/testData/cfg/conventions/incrementAtTheEnd.instructions similarity index 100% rename from compiler/testData/cfg/incrementAtTheEnd.instructions rename to compiler/testData/cfg/conventions/incrementAtTheEnd.instructions diff --git a/compiler/testData/cfg/incrementAtTheEnd.kt b/compiler/testData/cfg/conventions/incrementAtTheEnd.kt similarity index 100% rename from compiler/testData/cfg/incrementAtTheEnd.kt rename to compiler/testData/cfg/conventions/incrementAtTheEnd.kt diff --git a/compiler/testData/cfg/invoke.instructions b/compiler/testData/cfg/conventions/invoke.instructions similarity index 100% rename from compiler/testData/cfg/invoke.instructions rename to compiler/testData/cfg/conventions/invoke.instructions diff --git a/compiler/testData/cfg/invoke.kt b/compiler/testData/cfg/conventions/invoke.kt similarity index 100% rename from compiler/testData/cfg/invoke.kt rename to compiler/testData/cfg/conventions/invoke.kt diff --git a/compiler/testData/cfg/notEqual.instructions b/compiler/testData/cfg/conventions/notEqual.instructions similarity index 100% rename from compiler/testData/cfg/notEqual.instructions rename to compiler/testData/cfg/conventions/notEqual.instructions diff --git a/compiler/testData/cfg/notEqual.kt b/compiler/testData/cfg/conventions/notEqual.kt similarity index 100% rename from compiler/testData/cfg/notEqual.kt rename to compiler/testData/cfg/conventions/notEqual.kt diff --git a/compiler/testData/cfg/AnonymousInitializers.instructions b/compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.instructions similarity index 100% rename from compiler/testData/cfg/AnonymousInitializers.instructions rename to compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.instructions diff --git a/compiler/testData/cfg/AnonymousInitializers.kt b/compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt similarity index 100% rename from compiler/testData/cfg/AnonymousInitializers.kt rename to compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt diff --git a/compiler/testData/cfg/unusedFunctionLiteral.instructions b/compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.instructions similarity index 100% rename from compiler/testData/cfg/unusedFunctionLiteral.instructions rename to compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.instructions diff --git a/compiler/testData/cfg/unusedFunctionLiteral.kt b/compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt similarity index 100% rename from compiler/testData/cfg/unusedFunctionLiteral.kt rename to compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt diff --git a/compiler/testData/cfg/FailFunction.instructions b/compiler/testData/cfg/declarations/functions/FailFunction.instructions similarity index 100% rename from compiler/testData/cfg/FailFunction.instructions rename to compiler/testData/cfg/declarations/functions/FailFunction.instructions diff --git a/compiler/testData/cfg/FailFunction.kt b/compiler/testData/cfg/declarations/functions/FailFunction.kt similarity index 100% rename from compiler/testData/cfg/FailFunction.kt rename to compiler/testData/cfg/declarations/functions/FailFunction.kt diff --git a/compiler/testData/cfg/typeParameter.instructions b/compiler/testData/cfg/declarations/functions/typeParameter.instructions similarity index 100% rename from compiler/testData/cfg/typeParameter.instructions rename to compiler/testData/cfg/declarations/functions/typeParameter.instructions diff --git a/compiler/testData/cfg/typeParameter.kt b/compiler/testData/cfg/declarations/functions/typeParameter.kt similarity index 100% rename from compiler/testData/cfg/typeParameter.kt rename to compiler/testData/cfg/declarations/functions/typeParameter.kt diff --git a/compiler/testData/cfg/LocalDeclarations.instructions b/compiler/testData/cfg/declarations/local/LocalDeclarations.instructions similarity index 100% rename from compiler/testData/cfg/LocalDeclarations.instructions rename to compiler/testData/cfg/declarations/local/LocalDeclarations.instructions diff --git a/compiler/testData/cfg/LocalDeclarations.kt b/compiler/testData/cfg/declarations/local/LocalDeclarations.kt similarity index 100% rename from compiler/testData/cfg/LocalDeclarations.kt rename to compiler/testData/cfg/declarations/local/LocalDeclarations.kt diff --git a/compiler/testData/cfg/ObjectExpression.instructions b/compiler/testData/cfg/declarations/local/ObjectExpression.instructions similarity index 100% rename from compiler/testData/cfg/ObjectExpression.instructions rename to compiler/testData/cfg/declarations/local/ObjectExpression.instructions diff --git a/compiler/testData/cfg/ObjectExpression.kt b/compiler/testData/cfg/declarations/local/ObjectExpression.kt similarity index 100% rename from compiler/testData/cfg/ObjectExpression.kt rename to compiler/testData/cfg/declarations/local/ObjectExpression.kt diff --git a/compiler/testData/cfg/localClass.instructions b/compiler/testData/cfg/declarations/local/localClass.instructions similarity index 100% rename from compiler/testData/cfg/localClass.instructions rename to compiler/testData/cfg/declarations/local/localClass.instructions diff --git a/compiler/testData/cfg/localClass.kt b/compiler/testData/cfg/declarations/local/localClass.kt similarity index 100% rename from compiler/testData/cfg/localClass.kt rename to compiler/testData/cfg/declarations/local/localClass.kt diff --git a/compiler/testData/cfg/localProperty.instructions b/compiler/testData/cfg/declarations/local/localProperty.instructions similarity index 100% rename from compiler/testData/cfg/localProperty.instructions rename to compiler/testData/cfg/declarations/local/localProperty.instructions diff --git a/compiler/testData/cfg/localProperty.kt b/compiler/testData/cfg/declarations/local/localProperty.kt similarity index 100% rename from compiler/testData/cfg/localProperty.kt rename to compiler/testData/cfg/declarations/local/localProperty.kt diff --git a/compiler/testData/cfg/MultiDecl.instructions b/compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.instructions similarity index 100% rename from compiler/testData/cfg/MultiDecl.instructions rename to compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.instructions diff --git a/compiler/testData/cfg/MultiDecl.kt b/compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt similarity index 100% rename from compiler/testData/cfg/MultiDecl.kt rename to compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt diff --git a/compiler/testData/cfg/multiDeclarationWithError.instructions b/compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.instructions similarity index 100% rename from compiler/testData/cfg/multiDeclarationWithError.instructions rename to compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.instructions diff --git a/compiler/testData/cfg/multiDeclarationWithError.kt b/compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt similarity index 100% rename from compiler/testData/cfg/multiDeclarationWithError.kt rename to compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt diff --git a/compiler/testData/cfg/DelegatedProperty.instructions b/compiler/testData/cfg/declarations/properties/DelegatedProperty.instructions similarity index 100% rename from compiler/testData/cfg/DelegatedProperty.instructions rename to compiler/testData/cfg/declarations/properties/DelegatedProperty.instructions diff --git a/compiler/testData/cfg/DelegatedProperty.kt b/compiler/testData/cfg/declarations/properties/DelegatedProperty.kt similarity index 100% rename from compiler/testData/cfg/DelegatedProperty.kt rename to compiler/testData/cfg/declarations/properties/DelegatedProperty.kt diff --git a/compiler/testData/cfg/backingFieldAccess.instructions b/compiler/testData/cfg/declarations/properties/backingFieldAccess.instructions similarity index 100% rename from compiler/testData/cfg/backingFieldAccess.instructions rename to compiler/testData/cfg/declarations/properties/backingFieldAccess.instructions diff --git a/compiler/testData/cfg/backingFieldAccess.kt b/compiler/testData/cfg/declarations/properties/backingFieldAccess.kt similarity index 100% rename from compiler/testData/cfg/backingFieldAccess.kt rename to compiler/testData/cfg/declarations/properties/backingFieldAccess.kt diff --git a/compiler/testData/cfg/backingFieldQualifiedWithThis.instructions b/compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.instructions similarity index 100% rename from compiler/testData/cfg/backingFieldQualifiedWithThis.instructions rename to compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.instructions diff --git a/compiler/testData/cfg/backingFieldQualifiedWithThis.kt b/compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt similarity index 100% rename from compiler/testData/cfg/backingFieldQualifiedWithThis.kt rename to compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt diff --git a/compiler/testData/cfg/Assignments.instructions b/compiler/testData/cfg/expressions/Assignments.instructions similarity index 100% rename from compiler/testData/cfg/Assignments.instructions rename to compiler/testData/cfg/expressions/Assignments.instructions diff --git a/compiler/testData/cfg/Assignments.kt b/compiler/testData/cfg/expressions/Assignments.kt similarity index 100% rename from compiler/testData/cfg/Assignments.kt rename to compiler/testData/cfg/expressions/Assignments.kt diff --git a/compiler/testData/cfg/LazyBooleans.instructions b/compiler/testData/cfg/expressions/LazyBooleans.instructions similarity index 100% rename from compiler/testData/cfg/LazyBooleans.instructions rename to compiler/testData/cfg/expressions/LazyBooleans.instructions diff --git a/compiler/testData/cfg/LazyBooleans.kt b/compiler/testData/cfg/expressions/LazyBooleans.kt similarity index 100% rename from compiler/testData/cfg/LazyBooleans.kt rename to compiler/testData/cfg/expressions/LazyBooleans.kt diff --git a/compiler/testData/cfg/ReturnFromExpression.instructions b/compiler/testData/cfg/expressions/ReturnFromExpression.instructions similarity index 100% rename from compiler/testData/cfg/ReturnFromExpression.instructions rename to compiler/testData/cfg/expressions/ReturnFromExpression.instructions diff --git a/compiler/testData/cfg/ReturnFromExpression.kt b/compiler/testData/cfg/expressions/ReturnFromExpression.kt similarity index 100% rename from compiler/testData/cfg/ReturnFromExpression.kt rename to compiler/testData/cfg/expressions/ReturnFromExpression.kt diff --git a/compiler/testData/cfg/assignmentToThis.instructions b/compiler/testData/cfg/expressions/assignmentToThis.instructions similarity index 100% rename from compiler/testData/cfg/assignmentToThis.instructions rename to compiler/testData/cfg/expressions/assignmentToThis.instructions diff --git a/compiler/testData/cfg/assignmentToThis.kt b/compiler/testData/cfg/expressions/assignmentToThis.kt similarity index 100% rename from compiler/testData/cfg/assignmentToThis.kt rename to compiler/testData/cfg/expressions/assignmentToThis.kt diff --git a/compiler/testData/cfg/chainedQualifiedExpression.instructions b/compiler/testData/cfg/expressions/chainedQualifiedExpression.instructions similarity index 100% rename from compiler/testData/cfg/chainedQualifiedExpression.instructions rename to compiler/testData/cfg/expressions/chainedQualifiedExpression.instructions diff --git a/compiler/testData/cfg/chainedQualifiedExpression.kt b/compiler/testData/cfg/expressions/chainedQualifiedExpression.kt similarity index 100% rename from compiler/testData/cfg/chainedQualifiedExpression.kt rename to compiler/testData/cfg/expressions/chainedQualifiedExpression.kt diff --git a/compiler/testData/cfg/expressionAsFunction.instructions b/compiler/testData/cfg/expressions/expressionAsFunction.instructions similarity index 100% rename from compiler/testData/cfg/expressionAsFunction.instructions rename to compiler/testData/cfg/expressions/expressionAsFunction.instructions diff --git a/compiler/testData/cfg/expressionAsFunction.kt b/compiler/testData/cfg/expressions/expressionAsFunction.kt similarity index 100% rename from compiler/testData/cfg/expressionAsFunction.kt rename to compiler/testData/cfg/expressions/expressionAsFunction.kt diff --git a/compiler/testData/cfg/propertySafeCall.instructions b/compiler/testData/cfg/expressions/propertySafeCall.instructions similarity index 100% rename from compiler/testData/cfg/propertySafeCall.instructions rename to compiler/testData/cfg/expressions/propertySafeCall.instructions diff --git a/compiler/testData/cfg/propertySafeCall.kt b/compiler/testData/cfg/expressions/propertySafeCall.kt similarity index 100% rename from compiler/testData/cfg/propertySafeCall.kt rename to compiler/testData/cfg/expressions/propertySafeCall.kt diff --git a/compiler/testData/cfg/qualifiedExpressionWithoutSelector.instructions b/compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.instructions similarity index 100% rename from compiler/testData/cfg/qualifiedExpressionWithoutSelector.instructions rename to compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.instructions diff --git a/compiler/testData/cfg/qualifiedExpressionWithoutSelector.kt b/compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt similarity index 100% rename from compiler/testData/cfg/qualifiedExpressionWithoutSelector.kt rename to compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt diff --git a/compiler/testData/cfg/thisExpression.instructions b/compiler/testData/cfg/expressions/thisExpression.instructions similarity index 100% rename from compiler/testData/cfg/thisExpression.instructions rename to compiler/testData/cfg/expressions/thisExpression.instructions diff --git a/compiler/testData/cfg/thisExpression.kt b/compiler/testData/cfg/expressions/thisExpression.kt similarity index 100% rename from compiler/testData/cfg/thisExpression.kt rename to compiler/testData/cfg/expressions/thisExpression.kt diff --git a/compiler/testData/cfg/unresolved.instructions b/compiler/testData/cfg/expressions/unresolved.instructions similarity index 100% rename from compiler/testData/cfg/unresolved.instructions rename to compiler/testData/cfg/expressions/unresolved.instructions diff --git a/compiler/testData/cfg/unresolved.kt b/compiler/testData/cfg/expressions/unresolved.kt similarity index 100% rename from compiler/testData/cfg/unresolved.kt rename to compiler/testData/cfg/expressions/unresolved.kt diff --git a/compiler/testData/cfg/unusedExpressionSimpleName.instructions b/compiler/testData/cfg/expressions/unusedExpressionSimpleName.instructions similarity index 100% rename from compiler/testData/cfg/unusedExpressionSimpleName.instructions rename to compiler/testData/cfg/expressions/unusedExpressionSimpleName.instructions diff --git a/compiler/testData/cfg/unusedExpressionSimpleName.kt b/compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt similarity index 100% rename from compiler/testData/cfg/unusedExpressionSimpleName.kt rename to compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt diff --git a/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java b/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java index b26f4701c29..511da135d36 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java @@ -31,220 +31,132 @@ import org.jetbrains.jet.cfg.AbstractControlFlowTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/cfg") -@InnerTestClasses({ControlFlowTestGenerated.DeadCode.class, ControlFlowTestGenerated.TailCalls.class}) +@InnerTestClasses({ControlFlowTestGenerated.Arrays.class, ControlFlowTestGenerated.Basic.class, ControlFlowTestGenerated.ControlStructures.class, ControlFlowTestGenerated.Conventions.class, ControlFlowTestGenerated.DeadCode.class, ControlFlowTestGenerated.Declarations.class, ControlFlowTestGenerated.Expressions.class, ControlFlowTestGenerated.TailCalls.class}) public class ControlFlowTestGenerated extends AbstractControlFlowTest { public void testAllFilesPresentInCfg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("AnonymousInitializers.kt") - public void testAnonymousInitializers() throws Exception { - doTest("compiler/testData/cfg/AnonymousInitializers.kt"); + @TestMetadata("compiler/testData/cfg/arrays") + public static class Arrays extends AbstractControlFlowTest { + public void testAllFilesPresentInArrays() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("ArrayAccess.kt") + public void testArrayAccess() throws Exception { + doTest("compiler/testData/cfg/arrays/ArrayAccess.kt"); + } + + @TestMetadata("arrayAccessExpression.kt") + public void testArrayAccessExpression() throws Exception { + doTest("compiler/testData/cfg/arrays/arrayAccessExpression.kt"); + } + + @TestMetadata("ArrayOfFunctions.kt") + public void testArrayOfFunctions() throws Exception { + doTest("compiler/testData/cfg/arrays/ArrayOfFunctions.kt"); + } + + @TestMetadata("arraySet.kt") + public void testArraySet() throws Exception { + doTest("compiler/testData/cfg/arrays/arraySet.kt"); + } + + @TestMetadata("arraySetPlusAssign.kt") + public void testArraySetPlusAssign() throws Exception { + doTest("compiler/testData/cfg/arrays/arraySetPlusAssign.kt"); + } + } - @TestMetadata("ArrayAccess.kt") - public void testArrayAccess() throws Exception { - doTest("compiler/testData/cfg/ArrayAccess.kt"); + @TestMetadata("compiler/testData/cfg/basic") + public static class Basic extends AbstractControlFlowTest { + public void testAllFilesPresentInBasic() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("Basic.kt") + public void testBasic() throws Exception { + doTest("compiler/testData/cfg/basic/Basic.kt"); + } + + @TestMetadata("EmptyFunction.kt") + public void testEmptyFunction() throws Exception { + doTest("compiler/testData/cfg/basic/EmptyFunction.kt"); + } + + @TestMetadata("ShortFunction.kt") + public void testShortFunction() throws Exception { + doTest("compiler/testData/cfg/basic/ShortFunction.kt"); + } + } - @TestMetadata("arrayAccessExpression.kt") - public void testArrayAccessExpression() throws Exception { - doTest("compiler/testData/cfg/arrayAccessExpression.kt"); + @TestMetadata("compiler/testData/cfg/controlStructures") + public static class ControlStructures extends AbstractControlFlowTest { + public void testAllFilesPresentInControlStructures() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("Finally.kt") + public void testFinally() throws Exception { + doTest("compiler/testData/cfg/controlStructures/Finally.kt"); + } + + @TestMetadata("FinallyTestCopy.kt") + public void testFinallyTestCopy() throws Exception { + doTest("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt"); + } + + @TestMetadata("For.kt") + public void testFor() throws Exception { + doTest("compiler/testData/cfg/controlStructures/For.kt"); + } + + @TestMetadata("If.kt") + public void testIf() throws Exception { + doTest("compiler/testData/cfg/controlStructures/If.kt"); + } + + @TestMetadata("OnlyWhileInFunctionBody.kt") + public void testOnlyWhileInFunctionBody() throws Exception { + doTest("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt"); + } + + @TestMetadata("returnsInWhen.kt") + public void testReturnsInWhen() throws Exception { + doTest("compiler/testData/cfg/controlStructures/returnsInWhen.kt"); + } + } - @TestMetadata("ArrayOfFunctions.kt") - public void testArrayOfFunctions() throws Exception { - doTest("compiler/testData/cfg/ArrayOfFunctions.kt"); - } - - @TestMetadata("arraySet.kt") - public void testArraySet() throws Exception { - doTest("compiler/testData/cfg/arraySet.kt"); - } - - @TestMetadata("arraySetPlusAssign.kt") - public void testArraySetPlusAssign() throws Exception { - doTest("compiler/testData/cfg/arraySetPlusAssign.kt"); - } - - @TestMetadata("assignmentToThis.kt") - public void testAssignmentToThis() throws Exception { - doTest("compiler/testData/cfg/assignmentToThis.kt"); - } - - @TestMetadata("Assignments.kt") - public void testAssignments() throws Exception { - doTest("compiler/testData/cfg/Assignments.kt"); - } - - @TestMetadata("backingFieldAccess.kt") - public void testBackingFieldAccess() throws Exception { - doTest("compiler/testData/cfg/backingFieldAccess.kt"); - } - - @TestMetadata("backingFieldQualifiedWithThis.kt") - public void testBackingFieldQualifiedWithThis() throws Exception { - doTest("compiler/testData/cfg/backingFieldQualifiedWithThis.kt"); - } - - @TestMetadata("Basic.kt") - public void testBasic() throws Exception { - doTest("compiler/testData/cfg/Basic.kt"); - } - - @TestMetadata("chainedQualifiedExpression.kt") - public void testChainedQualifiedExpression() throws Exception { - doTest("compiler/testData/cfg/chainedQualifiedExpression.kt"); - } - - @TestMetadata("DelegatedProperty.kt") - public void testDelegatedProperty() throws Exception { - doTest("compiler/testData/cfg/DelegatedProperty.kt"); - } - - @TestMetadata("EmptyFunction.kt") - public void testEmptyFunction() throws Exception { - doTest("compiler/testData/cfg/EmptyFunction.kt"); - } - - @TestMetadata("equals.kt") - public void testEquals() throws Exception { - doTest("compiler/testData/cfg/equals.kt"); - } - - @TestMetadata("expressionAsFunction.kt") - public void testExpressionAsFunction() throws Exception { - doTest("compiler/testData/cfg/expressionAsFunction.kt"); - } - - @TestMetadata("FailFunction.kt") - public void testFailFunction() throws Exception { - doTest("compiler/testData/cfg/FailFunction.kt"); - } - - @TestMetadata("Finally.kt") - public void testFinally() throws Exception { - doTest("compiler/testData/cfg/Finally.kt"); - } - - @TestMetadata("FinallyTestCopy.kt") - public void testFinallyTestCopy() throws Exception { - doTest("compiler/testData/cfg/FinallyTestCopy.kt"); - } - - @TestMetadata("For.kt") - public void testFor() throws Exception { - doTest("compiler/testData/cfg/For.kt"); - } - - @TestMetadata("If.kt") - public void testIf() throws Exception { - doTest("compiler/testData/cfg/If.kt"); - } - - @TestMetadata("incrementAtTheEnd.kt") - public void testIncrementAtTheEnd() throws Exception { - doTest("compiler/testData/cfg/incrementAtTheEnd.kt"); - } - - @TestMetadata("invoke.kt") - public void testInvoke() throws Exception { - doTest("compiler/testData/cfg/invoke.kt"); - } - - @TestMetadata("LazyBooleans.kt") - public void testLazyBooleans() throws Exception { - doTest("compiler/testData/cfg/LazyBooleans.kt"); - } - - @TestMetadata("localClass.kt") - public void testLocalClass() throws Exception { - doTest("compiler/testData/cfg/localClass.kt"); - } - - @TestMetadata("LocalDeclarations.kt") - public void testLocalDeclarations() throws Exception { - doTest("compiler/testData/cfg/LocalDeclarations.kt"); - } - - @TestMetadata("localProperty.kt") - public void testLocalProperty() throws Exception { - doTest("compiler/testData/cfg/localProperty.kt"); - } - - @TestMetadata("MultiDecl.kt") - public void testMultiDecl() throws Exception { - doTest("compiler/testData/cfg/MultiDecl.kt"); - } - - @TestMetadata("multiDeclarationWithError.kt") - public void testMultiDeclarationWithError() throws Exception { - doTest("compiler/testData/cfg/multiDeclarationWithError.kt"); - } - - @TestMetadata("notEqual.kt") - public void testNotEqual() throws Exception { - doTest("compiler/testData/cfg/notEqual.kt"); - } - - @TestMetadata("ObjectExpression.kt") - public void testObjectExpression() throws Exception { - doTest("compiler/testData/cfg/ObjectExpression.kt"); - } - - @TestMetadata("OnlyWhileInFunctionBody.kt") - public void testOnlyWhileInFunctionBody() throws Exception { - doTest("compiler/testData/cfg/OnlyWhileInFunctionBody.kt"); - } - - @TestMetadata("propertySafeCall.kt") - public void testPropertySafeCall() throws Exception { - doTest("compiler/testData/cfg/propertySafeCall.kt"); - } - - @TestMetadata("qualifiedExpressionWithoutSelector.kt") - public void testQualifiedExpressionWithoutSelector() throws Exception { - doTest("compiler/testData/cfg/qualifiedExpressionWithoutSelector.kt"); - } - - @TestMetadata("ReturnFromExpression.kt") - public void testReturnFromExpression() throws Exception { - doTest("compiler/testData/cfg/ReturnFromExpression.kt"); - } - - @TestMetadata("returnsInWhen.kt") - public void testReturnsInWhen() throws Exception { - doTest("compiler/testData/cfg/returnsInWhen.kt"); - } - - @TestMetadata("ShortFunction.kt") - public void testShortFunction() throws Exception { - doTest("compiler/testData/cfg/ShortFunction.kt"); - } - - @TestMetadata("thisExpression.kt") - public void testThisExpression() throws Exception { - doTest("compiler/testData/cfg/thisExpression.kt"); - } - - @TestMetadata("typeParameter.kt") - public void testTypeParameter() throws Exception { - doTest("compiler/testData/cfg/typeParameter.kt"); - } - - @TestMetadata("unresolved.kt") - public void testUnresolved() throws Exception { - doTest("compiler/testData/cfg/unresolved.kt"); - } - - @TestMetadata("unusedExpressionSimpleName.kt") - public void testUnusedExpressionSimpleName() throws Exception { - doTest("compiler/testData/cfg/unusedExpressionSimpleName.kt"); - } - - @TestMetadata("unusedFunctionLiteral.kt") - public void testUnusedFunctionLiteral() throws Exception { - doTest("compiler/testData/cfg/unusedFunctionLiteral.kt"); + @TestMetadata("compiler/testData/cfg/conventions") + public static class Conventions extends AbstractControlFlowTest { + public void testAllFilesPresentInConventions() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("equals.kt") + public void testEquals() throws Exception { + doTest("compiler/testData/cfg/conventions/equals.kt"); + } + + @TestMetadata("incrementAtTheEnd.kt") + public void testIncrementAtTheEnd() throws Exception { + doTest("compiler/testData/cfg/conventions/incrementAtTheEnd.kt"); + } + + @TestMetadata("invoke.kt") + public void testInvoke() throws Exception { + doTest("compiler/testData/cfg/conventions/invoke.kt"); + } + + @TestMetadata("notEqual.kt") + public void testNotEqual() throws Exception { + doTest("compiler/testData/cfg/conventions/notEqual.kt"); + } + } @TestMetadata("compiler/testData/cfg/deadCode") @@ -270,6 +182,202 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { } + @TestMetadata("compiler/testData/cfg/declarations") + @InnerTestClasses({Declarations.ClassesAndObjects.class, Declarations.FunctionLiterals.class, Declarations.Functions.class, Declarations.Local.class, Declarations.MultiDeclaration.class, Declarations.Properties.class}) + public static class Declarations extends AbstractControlFlowTest { + public void testAllFilesPresentInDeclarations() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/declarations"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects") + public static class ClassesAndObjects extends AbstractControlFlowTest { + public void testAllFilesPresentInClassesAndObjects() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("AnonymousInitializers.kt") + public void testAnonymousInitializers() throws Exception { + doTest("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt"); + } + + } + + @TestMetadata("compiler/testData/cfg/declarations/functionLiterals") + public static class FunctionLiterals extends AbstractControlFlowTest { + public void testAllFilesPresentInFunctionLiterals() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("unusedFunctionLiteral.kt") + public void testUnusedFunctionLiteral() throws Exception { + doTest("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt"); + } + + } + + @TestMetadata("compiler/testData/cfg/declarations/functions") + public static class Functions extends AbstractControlFlowTest { + public void testAllFilesPresentInFunctions() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("FailFunction.kt") + public void testFailFunction() throws Exception { + doTest("compiler/testData/cfg/declarations/functions/FailFunction.kt"); + } + + @TestMetadata("typeParameter.kt") + public void testTypeParameter() throws Exception { + doTest("compiler/testData/cfg/declarations/functions/typeParameter.kt"); + } + + } + + @TestMetadata("compiler/testData/cfg/declarations/local") + public static class Local extends AbstractControlFlowTest { + public void testAllFilesPresentInLocal() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("localClass.kt") + public void testLocalClass() throws Exception { + doTest("compiler/testData/cfg/declarations/local/localClass.kt"); + } + + @TestMetadata("LocalDeclarations.kt") + public void testLocalDeclarations() throws Exception { + doTest("compiler/testData/cfg/declarations/local/LocalDeclarations.kt"); + } + + @TestMetadata("localProperty.kt") + public void testLocalProperty() throws Exception { + doTest("compiler/testData/cfg/declarations/local/localProperty.kt"); + } + + @TestMetadata("ObjectExpression.kt") + public void testObjectExpression() throws Exception { + doTest("compiler/testData/cfg/declarations/local/ObjectExpression.kt"); + } + + } + + @TestMetadata("compiler/testData/cfg/declarations/multiDeclaration") + public static class MultiDeclaration extends AbstractControlFlowTest { + public void testAllFilesPresentInMultiDeclaration() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("MultiDecl.kt") + public void testMultiDecl() throws Exception { + doTest("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt"); + } + + @TestMetadata("multiDeclarationWithError.kt") + public void testMultiDeclarationWithError() throws Exception { + doTest("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt"); + } + + } + + @TestMetadata("compiler/testData/cfg/declarations/properties") + public static class Properties extends AbstractControlFlowTest { + public void testAllFilesPresentInProperties() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("backingFieldAccess.kt") + public void testBackingFieldAccess() throws Exception { + doTest("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt"); + } + + @TestMetadata("backingFieldQualifiedWithThis.kt") + public void testBackingFieldQualifiedWithThis() throws Exception { + doTest("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt"); + } + + @TestMetadata("DelegatedProperty.kt") + public void testDelegatedProperty() throws Exception { + doTest("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt"); + } + + } + + public static Test innerSuite() { + TestSuite suite = new TestSuite("Declarations"); + suite.addTestSuite(Declarations.class); + suite.addTestSuite(ClassesAndObjects.class); + suite.addTestSuite(FunctionLiterals.class); + suite.addTestSuite(Functions.class); + suite.addTestSuite(Local.class); + suite.addTestSuite(MultiDeclaration.class); + suite.addTestSuite(Properties.class); + return suite; + } + } + + @TestMetadata("compiler/testData/cfg/expressions") + public static class Expressions extends AbstractControlFlowTest { + public void testAllFilesPresentInExpressions() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("assignmentToThis.kt") + public void testAssignmentToThis() throws Exception { + doTest("compiler/testData/cfg/expressions/assignmentToThis.kt"); + } + + @TestMetadata("Assignments.kt") + public void testAssignments() throws Exception { + doTest("compiler/testData/cfg/expressions/Assignments.kt"); + } + + @TestMetadata("chainedQualifiedExpression.kt") + public void testChainedQualifiedExpression() throws Exception { + doTest("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt"); + } + + @TestMetadata("expressionAsFunction.kt") + public void testExpressionAsFunction() throws Exception { + doTest("compiler/testData/cfg/expressions/expressionAsFunction.kt"); + } + + @TestMetadata("LazyBooleans.kt") + public void testLazyBooleans() throws Exception { + doTest("compiler/testData/cfg/expressions/LazyBooleans.kt"); + } + + @TestMetadata("propertySafeCall.kt") + public void testPropertySafeCall() throws Exception { + doTest("compiler/testData/cfg/expressions/propertySafeCall.kt"); + } + + @TestMetadata("qualifiedExpressionWithoutSelector.kt") + public void testQualifiedExpressionWithoutSelector() throws Exception { + doTest("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt"); + } + + @TestMetadata("ReturnFromExpression.kt") + public void testReturnFromExpression() throws Exception { + doTest("compiler/testData/cfg/expressions/ReturnFromExpression.kt"); + } + + @TestMetadata("thisExpression.kt") + public void testThisExpression() throws Exception { + doTest("compiler/testData/cfg/expressions/thisExpression.kt"); + } + + @TestMetadata("unresolved.kt") + public void testUnresolved() throws Exception { + doTest("compiler/testData/cfg/expressions/unresolved.kt"); + } + + @TestMetadata("unusedExpressionSimpleName.kt") + public void testUnusedExpressionSimpleName() throws Exception { + doTest("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt"); + } + + } + @TestMetadata("compiler/testData/cfg/tailCalls") public static class TailCalls extends AbstractControlFlowTest { public void testAllFilesPresentInTailCalls() throws Exception { @@ -306,7 +414,13 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { public static Test suite() { TestSuite suite = new TestSuite("ControlFlowTestGenerated"); suite.addTestSuite(ControlFlowTestGenerated.class); + suite.addTestSuite(Arrays.class); + suite.addTestSuite(Basic.class); + suite.addTestSuite(ControlStructures.class); + suite.addTestSuite(Conventions.class); suite.addTestSuite(DeadCode.class); + suite.addTest(Declarations.innerSuite()); + suite.addTestSuite(Expressions.class); suite.addTestSuite(TailCalls.class); return suite; }