diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.txt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.kt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.lazy.log diff --git a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.txt similarity index 100% rename from compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.txt rename to compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixCall.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/infixCall.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixCall.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/infixCall.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/insideElvis.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/insideElvis.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/loops.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/loops.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/loops.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/loops.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnIf.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnIf.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnIf.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnIf.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInTry.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/returnInTry.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/sum.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/sum.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/sum.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/sum.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/thisReferences.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/thisReferences.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.txt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.kt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.lazy.log similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.lazy.log diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.txt similarity index 100% rename from compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.txt rename to compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.txt diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index d5cce78ebb3..f9757e56bc7 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -28,7 +28,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, JetDiagnosticsTestGenerated.TailRecursion.class, JetDiagnosticsTestGenerated.OnObjects.class, JetDiagnosticsTestGenerated.Diagnostics.class}) +@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, JetDiagnosticsTestGenerated.Diagnostics.class}) @RunWith(JUnit3RunnerWithInners.class) public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests") @@ -10231,300 +10231,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } } - @TestMetadata("compiler/testData/codegen/box/functions/tailRecursion") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class TailRecursion extends AbstractJetDiagnosticsTest { - public void testAllFilesPresentInTailRecursion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("defaultArgs.kt") - public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.kt"); - doTest(fileName); - } - - @TestMetadata("extensionTailCall.kt") - public void testExtensionTailCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.kt"); - doTest(fileName); - } - - @TestMetadata("functionWithNoTails.kt") - public void testFunctionWithNoTails() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.kt"); - doTest(fileName); - } - - @TestMetadata("functionWithNonTailRecursions.kt") - public void testFunctionWithNonTailRecursions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.kt"); - doTest(fileName); - } - - @TestMetadata("functionWithoutAnnotation.kt") - public void testFunctionWithoutAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.kt"); - doTest(fileName); - } - - @TestMetadata("infixCall.kt") - public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/infixCall.kt"); - doTest(fileName); - } - - @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.kt"); - doTest(fileName); - } - - @TestMetadata("insideElvis.kt") - public void testInsideElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/insideElvis.kt"); - doTest(fileName); - } - - @TestMetadata("labeledThisReferences.kt") - public void testLabeledThisReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.kt"); - doTest(fileName); - } - - @TestMetadata("loops.kt") - public void testLoops() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/loops.kt"); - doTest(fileName); - } - - @TestMetadata("multilevelBlocks.kt") - public void testMultilevelBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.kt"); - doTest(fileName); - } - - @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.kt"); - doTest(fileName); - } - - @TestMetadata("realStringEscape.kt") - public void testRealStringEscape() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.kt"); - doTest(fileName); - } - - @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveCallInLambda.kt") - public void testRecursiveCallInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveCallInLocalFunction.kt") - public void testRecursiveCallInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveInnerFunction.kt") - public void testRecursiveInnerFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.kt"); - doTest(fileName); - } - - @TestMetadata("returnIf.kt") - public void testReturnIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnIf.kt"); - doTest(fileName); - } - - @TestMetadata("returnInCatch.kt") - public void testReturnInCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.kt"); - doTest(fileName); - } - - @TestMetadata("returnInFinally.kt") - public void testReturnInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.kt"); - doTest(fileName); - } - - @TestMetadata("returnInIfInFinally.kt") - public void testReturnInIfInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.kt"); - doTest(fileName); - } - - @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.kt"); - doTest(fileName); - } - - @TestMetadata("returnInTry.kt") - public void testReturnInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInTry.kt"); - doTest(fileName); - } - - @TestMetadata("simpleBlock.kt") - public void testSimpleBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.kt"); - doTest(fileName); - } - - @TestMetadata("simpleReturn.kt") - public void testSimpleReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.kt"); - doTest(fileName); - } - - @TestMetadata("simpleReturnWithElse.kt") - public void testSimpleReturnWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.kt"); - doTest(fileName); - } - - @TestMetadata("sum.kt") - public void testSum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/sum.kt"); - doTest(fileName); - } - - @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.kt"); - doTest(fileName); - } - - @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.kt"); - doTest(fileName); - } - - @TestMetadata("tailRecursionInFinally.kt") - public void testTailRecursionInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.kt"); - doTest(fileName); - } - - @TestMetadata("thisReferences.kt") - public void testThisReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/thisReferences.kt"); - doTest(fileName); - } - - @TestMetadata("unitBlocks.kt") - public void testUnitBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.kt"); - doTest(fileName); - } - - @TestMetadata("whenWithCondition.kt") - public void testWhenWithCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.kt"); - doTest(fileName); - } - - @TestMetadata("whenWithInRange.kt") - public void testWhenWithInRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.kt"); - doTest(fileName); - } - - @TestMetadata("whenWithIs.kt") - public void testWhenWithIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.kt"); - doTest(fileName); - } - - @TestMetadata("whenWithoutCondition.kt") - public void testWhenWithoutCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/box/functions/invoke/onObjects") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OnObjects extends AbstractJetDiagnosticsTest { - public void testAllFilesPresentInOnObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("invokeOnClassObject1.kt") - public void testInvokeOnClassObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnClassObject2.kt") - public void testInvokeOnClassObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnClassObjectOfNestedClass1.kt") - public void testInvokeOnClassObjectOfNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnClassObjectOfNestedClass2.kt") - public void testInvokeOnClassObjectOfNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnEnum1.kt") - public void testInvokeOnEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnEnum2.kt") - public void testInvokeOnEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnImportedEnum1.kt") - public void testInvokeOnImportedEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnImportedEnum2.kt") - public void testInvokeOnImportedEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnObject1.kt") - public void testInvokeOnObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnObject2.kt") - public void testInvokeOnObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/box/diagnostics") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Diagnostics.Functions.class}) @@ -10536,7 +10242,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/functions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({Functions.Inference.class}) + @InnerTestClasses({Functions.Inference.class, Functions.Invoke.class, Functions.TailRecursion.class}) @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInFunctions() throws Exception { @@ -10557,6 +10263,310 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest(fileName); } } + + @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke") + @TestDataPath("$PROJECT_ROOT") + @InnerTestClasses({Invoke.OnObjects.class}) + @RunWith(JUnit3RunnerWithInners.class) + public static class Invoke extends AbstractJetDiagnosticsTest { + public void testAllFilesPresentInInvoke() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class OnObjects extends AbstractJetDiagnosticsTest { + public void testAllFilesPresentInOnObjects() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("invokeOnClassObject1.kt") + public void testInvokeOnClassObject1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnClassObject2.kt") + public void testInvokeOnClassObject2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnClassObjectOfNestedClass1.kt") + public void testInvokeOnClassObjectOfNestedClass1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnClassObjectOfNestedClass2.kt") + public void testInvokeOnClassObjectOfNestedClass2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnEnum1.kt") + public void testInvokeOnEnum1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnEnum2.kt") + public void testInvokeOnEnum2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnImportedEnum1.kt") + public void testInvokeOnImportedEnum1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnImportedEnum2.kt") + public void testInvokeOnImportedEnum2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnObject1.kt") + public void testInvokeOnObject1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnObject2.kt") + public void testInvokeOnObject2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt"); + doTest(fileName); + } + } + } + + @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class TailRecursion extends AbstractJetDiagnosticsTest { + public void testAllFilesPresentInTailRecursion() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("defaultArgs.kt") + public void testDefaultArgs() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt"); + doTest(fileName); + } + + @TestMetadata("extensionTailCall.kt") + public void testExtensionTailCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt"); + doTest(fileName); + } + + @TestMetadata("functionWithNoTails.kt") + public void testFunctionWithNoTails() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt"); + doTest(fileName); + } + + @TestMetadata("functionWithNonTailRecursions.kt") + public void testFunctionWithNonTailRecursions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt"); + doTest(fileName); + } + + @TestMetadata("functionWithoutAnnotation.kt") + public void testFunctionWithoutAnnotation() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt"); + doTest(fileName); + } + + @TestMetadata("infixCall.kt") + public void testInfixCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt"); + doTest(fileName); + } + + @TestMetadata("infixRecursiveCall.kt") + public void testInfixRecursiveCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt"); + doTest(fileName); + } + + @TestMetadata("insideElvis.kt") + public void testInsideElvis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt"); + doTest(fileName); + } + + @TestMetadata("labeledThisReferences.kt") + public void testLabeledThisReferences() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt"); + doTest(fileName); + } + + @TestMetadata("loops.kt") + public void testLoops() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt"); + doTest(fileName); + } + + @TestMetadata("multilevelBlocks.kt") + public void testMultilevelBlocks() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt"); + doTest(fileName); + } + + @TestMetadata("realIteratorFoldl.kt") + public void testRealIteratorFoldl() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt"); + doTest(fileName); + } + + @TestMetadata("realStringEscape.kt") + public void testRealStringEscape() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt"); + doTest(fileName); + } + + @TestMetadata("realStringRepeat.kt") + public void testRealStringRepeat() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt"); + doTest(fileName); + } + + @TestMetadata("recursiveCallInLambda.kt") + public void testRecursiveCallInLambda() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt"); + doTest(fileName); + } + + @TestMetadata("recursiveCallInLocalFunction.kt") + public void testRecursiveCallInLocalFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt"); + doTest(fileName); + } + + @TestMetadata("recursiveInnerFunction.kt") + public void testRecursiveInnerFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt"); + doTest(fileName); + } + + @TestMetadata("returnIf.kt") + public void testReturnIf() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt"); + doTest(fileName); + } + + @TestMetadata("returnInCatch.kt") + public void testReturnInCatch() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt"); + doTest(fileName); + } + + @TestMetadata("returnInFinally.kt") + public void testReturnInFinally() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt"); + doTest(fileName); + } + + @TestMetadata("returnInIfInFinally.kt") + public void testReturnInIfInFinally() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt"); + doTest(fileName); + } + + @TestMetadata("returnInParentheses.kt") + public void testReturnInParentheses() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt"); + doTest(fileName); + } + + @TestMetadata("returnInTry.kt") + public void testReturnInTry() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt"); + doTest(fileName); + } + + @TestMetadata("simpleBlock.kt") + public void testSimpleBlock() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt"); + doTest(fileName); + } + + @TestMetadata("simpleReturn.kt") + public void testSimpleReturn() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt"); + doTest(fileName); + } + + @TestMetadata("simpleReturnWithElse.kt") + public void testSimpleReturnWithElse() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt"); + doTest(fileName); + } + + @TestMetadata("sum.kt") + public void testSum() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt"); + doTest(fileName); + } + + @TestMetadata("tailCallInBlockInParentheses.kt") + public void testTailCallInBlockInParentheses() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt"); + doTest(fileName); + } + + @TestMetadata("tailCallInParentheses.kt") + public void testTailCallInParentheses() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt"); + doTest(fileName); + } + + @TestMetadata("tailRecursionInFinally.kt") + public void testTailRecursionInFinally() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt"); + doTest(fileName); + } + + @TestMetadata("thisReferences.kt") + public void testThisReferences() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt"); + doTest(fileName); + } + + @TestMetadata("unitBlocks.kt") + public void testUnitBlocks() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt"); + doTest(fileName); + } + + @TestMetadata("whenWithCondition.kt") + public void testWhenWithCondition() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt"); + doTest(fileName); + } + + @TestMetadata("whenWithInRange.kt") + public void testWhenWithInRange() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt"); + doTest(fileName); + } + + @TestMetadata("whenWithIs.kt") + public void testWhenWithIs() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt"); + doTest(fileName); + } + + @TestMetadata("whenWithoutCondition.kt") + public void testWhenWithoutCondition() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt"); + doTest(fileName); + } + } } } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java index bd99b7e5159..a7929e10fae 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -2645,7 +2645,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/functions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({Functions.Inference.class}) + @InnerTestClasses({Functions.Inference.class, Functions.Invoke.class, Functions.TailRecursion.class}) @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { @@ -2666,6 +2666,310 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } } + + @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke") + @TestDataPath("$PROJECT_ROOT") + @InnerTestClasses({Invoke.OnObjects.class}) + @RunWith(JUnit3RunnerWithInners.class) + public static class Invoke extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInInvoke() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class OnObjects extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInOnObjects() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("invokeOnClassObject1.kt") + public void testInvokeOnClassObject1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnClassObject2.kt") + public void testInvokeOnClassObject2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnClassObjectOfNestedClass1.kt") + public void testInvokeOnClassObjectOfNestedClass1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnClassObjectOfNestedClass2.kt") + public void testInvokeOnClassObjectOfNestedClass2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnEnum1.kt") + public void testInvokeOnEnum1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnEnum2.kt") + public void testInvokeOnEnum2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnImportedEnum1.kt") + public void testInvokeOnImportedEnum1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnImportedEnum2.kt") + public void testInvokeOnImportedEnum2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnObject1.kt") + public void testInvokeOnObject1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt"); + doTest(fileName); + } + + @TestMetadata("invokeOnObject2.kt") + public void testInvokeOnObject2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt"); + doTest(fileName); + } + } + } + + @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class TailRecursion extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInTailRecursion() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("defaultArgs.kt") + public void testDefaultArgs() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt"); + doTest(fileName); + } + + @TestMetadata("extensionTailCall.kt") + public void testExtensionTailCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt"); + doTest(fileName); + } + + @TestMetadata("functionWithNoTails.kt") + public void testFunctionWithNoTails() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt"); + doTest(fileName); + } + + @TestMetadata("functionWithNonTailRecursions.kt") + public void testFunctionWithNonTailRecursions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt"); + doTest(fileName); + } + + @TestMetadata("functionWithoutAnnotation.kt") + public void testFunctionWithoutAnnotation() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt"); + doTest(fileName); + } + + @TestMetadata("infixCall.kt") + public void testInfixCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt"); + doTest(fileName); + } + + @TestMetadata("infixRecursiveCall.kt") + public void testInfixRecursiveCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt"); + doTest(fileName); + } + + @TestMetadata("insideElvis.kt") + public void testInsideElvis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt"); + doTest(fileName); + } + + @TestMetadata("labeledThisReferences.kt") + public void testLabeledThisReferences() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt"); + doTest(fileName); + } + + @TestMetadata("loops.kt") + public void testLoops() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt"); + doTest(fileName); + } + + @TestMetadata("multilevelBlocks.kt") + public void testMultilevelBlocks() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt"); + doTest(fileName); + } + + @TestMetadata("realIteratorFoldl.kt") + public void testRealIteratorFoldl() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt"); + doTest(fileName); + } + + @TestMetadata("realStringEscape.kt") + public void testRealStringEscape() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt"); + doTest(fileName); + } + + @TestMetadata("realStringRepeat.kt") + public void testRealStringRepeat() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt"); + doTest(fileName); + } + + @TestMetadata("recursiveCallInLambda.kt") + public void testRecursiveCallInLambda() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt"); + doTest(fileName); + } + + @TestMetadata("recursiveCallInLocalFunction.kt") + public void testRecursiveCallInLocalFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt"); + doTest(fileName); + } + + @TestMetadata("recursiveInnerFunction.kt") + public void testRecursiveInnerFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt"); + doTest(fileName); + } + + @TestMetadata("returnIf.kt") + public void testReturnIf() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt"); + doTest(fileName); + } + + @TestMetadata("returnInCatch.kt") + public void testReturnInCatch() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt"); + doTest(fileName); + } + + @TestMetadata("returnInFinally.kt") + public void testReturnInFinally() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt"); + doTest(fileName); + } + + @TestMetadata("returnInIfInFinally.kt") + public void testReturnInIfInFinally() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt"); + doTest(fileName); + } + + @TestMetadata("returnInParentheses.kt") + public void testReturnInParentheses() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt"); + doTest(fileName); + } + + @TestMetadata("returnInTry.kt") + public void testReturnInTry() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt"); + doTest(fileName); + } + + @TestMetadata("simpleBlock.kt") + public void testSimpleBlock() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt"); + doTest(fileName); + } + + @TestMetadata("simpleReturn.kt") + public void testSimpleReturn() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt"); + doTest(fileName); + } + + @TestMetadata("simpleReturnWithElse.kt") + public void testSimpleReturnWithElse() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt"); + doTest(fileName); + } + + @TestMetadata("sum.kt") + public void testSum() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt"); + doTest(fileName); + } + + @TestMetadata("tailCallInBlockInParentheses.kt") + public void testTailCallInBlockInParentheses() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt"); + doTest(fileName); + } + + @TestMetadata("tailCallInParentheses.kt") + public void testTailCallInParentheses() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt"); + doTest(fileName); + } + + @TestMetadata("tailRecursionInFinally.kt") + public void testTailRecursionInFinally() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt"); + doTest(fileName); + } + + @TestMetadata("thisReferences.kt") + public void testThisReferences() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt"); + doTest(fileName); + } + + @TestMetadata("unitBlocks.kt") + public void testUnitBlocks() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt"); + doTest(fileName); + } + + @TestMetadata("whenWithCondition.kt") + public void testWhenWithCondition() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt"); + doTest(fileName); + } + + @TestMetadata("whenWithInRange.kt") + public void testWhenWithInRange() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt"); + doTest(fileName); + } + + @TestMetadata("whenWithIs.kt") + public void testWhenWithIs() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt"); + doTest(fileName); + } + + @TestMetadata("whenWithoutCondition.kt") + public void testWhenWithoutCondition() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt"); + doTest(fileName); + } + } } } @@ -3193,7 +3497,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/functions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({Functions.Invoke.class, Functions.LocalFunctions.class, Functions.TailRecursion.class}) + @InnerTestClasses({Functions.Invoke.class, Functions.LocalFunctions.class}) @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { @@ -3448,7 +3752,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/functions/invoke") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({Invoke.OnObjects.class}) @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInvoke() throws Exception { @@ -3520,75 +3823,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt"); doTest(fileName); } - - @TestMetadata("compiler/testData/codegen/box/functions/invoke/onObjects") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class OnObjects extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInOnObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("invokeOnClassObject1.kt") - public void testInvokeOnClassObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnClassObject2.kt") - public void testInvokeOnClassObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnClassObjectOfNestedClass1.kt") - public void testInvokeOnClassObjectOfNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnClassObjectOfNestedClass2.kt") - public void testInvokeOnClassObjectOfNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnEnum1.kt") - public void testInvokeOnEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnEnum2.kt") - public void testInvokeOnEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnImportedEnum1.kt") - public void testInvokeOnImportedEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnImportedEnum2.kt") - public void testInvokeOnImportedEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnObject1.kt") - public void testInvokeOnObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.kt"); - doTest(fileName); - } - - @TestMetadata("invokeOnObject2.kt") - public void testInvokeOnObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.kt"); - doTest(fileName); - } - } } @TestMetadata("compiler/testData/codegen/box/functions/localFunctions") @@ -3677,231 +3911,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } } - - @TestMetadata("compiler/testData/codegen/box/functions/tailRecursion") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class TailRecursion extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInTailRecursion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("defaultArgs.kt") - public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.kt"); - doTest(fileName); - } - - @TestMetadata("extensionTailCall.kt") - public void testExtensionTailCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.kt"); - doTest(fileName); - } - - @TestMetadata("functionWithNoTails.kt") - public void testFunctionWithNoTails() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.kt"); - doTest(fileName); - } - - @TestMetadata("functionWithNonTailRecursions.kt") - public void testFunctionWithNonTailRecursions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.kt"); - doTest(fileName); - } - - @TestMetadata("functionWithoutAnnotation.kt") - public void testFunctionWithoutAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.kt"); - doTest(fileName); - } - - @TestMetadata("infixCall.kt") - public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/infixCall.kt"); - doTest(fileName); - } - - @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.kt"); - doTest(fileName); - } - - @TestMetadata("insideElvis.kt") - public void testInsideElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/insideElvis.kt"); - doTest(fileName); - } - - @TestMetadata("labeledThisReferences.kt") - public void testLabeledThisReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.kt"); - doTest(fileName); - } - - @TestMetadata("loops.kt") - public void testLoops() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/loops.kt"); - doTest(fileName); - } - - @TestMetadata("multilevelBlocks.kt") - public void testMultilevelBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.kt"); - doTest(fileName); - } - - @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.kt"); - doTest(fileName); - } - - @TestMetadata("realStringEscape.kt") - public void testRealStringEscape() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.kt"); - doTest(fileName); - } - - @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveCallInLambda.kt") - public void testRecursiveCallInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveCallInLocalFunction.kt") - public void testRecursiveCallInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.kt"); - doTest(fileName); - } - - @TestMetadata("recursiveInnerFunction.kt") - public void testRecursiveInnerFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.kt"); - doTest(fileName); - } - - @TestMetadata("returnIf.kt") - public void testReturnIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnIf.kt"); - doTest(fileName); - } - - @TestMetadata("returnInCatch.kt") - public void testReturnInCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.kt"); - doTest(fileName); - } - - @TestMetadata("returnInFinally.kt") - public void testReturnInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.kt"); - doTest(fileName); - } - - @TestMetadata("returnInIfInFinally.kt") - public void testReturnInIfInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.kt"); - doTest(fileName); - } - - @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.kt"); - doTest(fileName); - } - - @TestMetadata("returnInTry.kt") - public void testReturnInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInTry.kt"); - doTest(fileName); - } - - @TestMetadata("simpleBlock.kt") - public void testSimpleBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.kt"); - doTest(fileName); - } - - @TestMetadata("simpleReturn.kt") - public void testSimpleReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.kt"); - doTest(fileName); - } - - @TestMetadata("simpleReturnWithElse.kt") - public void testSimpleReturnWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.kt"); - doTest(fileName); - } - - @TestMetadata("sum.kt") - public void testSum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/sum.kt"); - doTest(fileName); - } - - @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.kt"); - doTest(fileName); - } - - @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.kt"); - doTest(fileName); - } - - @TestMetadata("tailRecursionInFinally.kt") - public void testTailRecursionInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.kt"); - doTest(fileName); - } - - @TestMetadata("thisReferences.kt") - public void testThisReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/thisReferences.kt"); - doTest(fileName); - } - - @TestMetadata("unitBlocks.kt") - public void testUnitBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.kt"); - doTest(fileName); - } - - @TestMetadata("whenWithCondition.kt") - public void testWhenWithCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.kt"); - doTest(fileName); - } - - @TestMetadata("whenWithInRange.kt") - public void testWhenWithInRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.kt"); - doTest(fileName); - } - - @TestMetadata("whenWithIs.kt") - public void testWhenWithIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.kt"); - doTest(fileName); - } - - @TestMetadata("whenWithoutCondition.kt") - public void testWhenWithoutCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.kt"); - doTest(fileName); - } - } } @TestMetadata("compiler/testData/codegen/box/innerNested") diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index 6b88c69cd2d..a368b846291 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -140,8 +140,6 @@ fun main(args: Array) { testClass(javaClass()) { model("diagnostics/tests") model("diagnostics/tests/script", extension = "kts") - model("codegen/box/functions/tailRecursion") - model("codegen/box/functions/invoke/onObjects") model("codegen/box/diagnostics") }