From 1d5924d236db6010d554a7c005b3efabb056be8b Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Thu, 21 Jul 2016 13:11:20 +0300 Subject: [PATCH] 'superConstructorCall' test folder moved under 'innerNested' --- .../deepInnerHierarchy.kt | 0 .../deepLocalHierarchy.kt | 0 ...innerExtendsInnerViaSecondaryConstuctor.kt | 0 ...innerExtendsInnerWithProperOuterCapture.kt | 0 .../superConstructorCall/innerExtendsOuter.kt | 2 + .../superConstructorCall/kt11833_1.kt | 0 .../superConstructorCall/kt11833_2.kt | 0 .../localClassOuterDiffersFromInnerOuter.kt | 0 .../superConstructorCall/localExtendsInner.kt | 0 .../localExtendsLocalWithClosure.kt | 0 ...localWithClosureExtendsLocalWithClosure.kt | 0 .../objectExtendsClassDefaultArgument.kt | 0 .../objectExtendsClassVararg.kt | 0 .../objectExtendsInner.kt | 2 + .../objectExtendsInnerDefaultArgument.kt | 2 + ...jectExtendsInnerOfLocalVarargAndDefault.kt | 2 + .../objectExtendsInnerOfLocalWithCapture.kt | 2 + .../objectExtendsLocalCaptureInSuperCall.kt | 0 .../objectExtendsLocalWithClosure.kt | 0 .../objectOuterDiffersFromInnerOuter.kt | 0 .../codegen/BlackBoxCodegenTestGenerated.java | 258 +++++++++--------- .../semantics/InnerNestedTestGenerated.java | 129 +++++++++ 22 files changed, 268 insertions(+), 129 deletions(-) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/deepInnerHierarchy.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/deepLocalHierarchy.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/innerExtendsOuter.kt (95%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/kt11833_1.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/kt11833_2.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/localExtendsInner.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/localExtendsLocalWithClosure.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectExtendsClassDefaultArgument.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectExtendsClassVararg.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectExtendsInner.kt (89%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectExtendsInnerDefaultArgument.kt (90%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt (93%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt (92%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectExtendsLocalWithClosure.kt (100%) rename compiler/testData/codegen/box/{ => innerNested}/superConstructorCall/objectOuterDiffersFromInnerOuter.kt (100%) diff --git a/compiler/testData/codegen/box/superConstructorCall/deepInnerHierarchy.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/deepInnerHierarchy.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/deepInnerHierarchy.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/deepInnerHierarchy.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/deepLocalHierarchy.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/deepLocalHierarchy.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/innerExtendsOuter.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsOuter.kt similarity index 95% rename from compiler/testData/codegen/box/superConstructorCall/innerExtendsOuter.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsOuter.kt index 4b1d51c5ca8..8db3bfa10ca 100644 --- a/compiler/testData/codegen/box/superConstructorCall/innerExtendsOuter.kt +++ b/compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsOuter.kt @@ -1,3 +1,5 @@ +// TARGET_BACKEND: JVM + // When inner class extends its outer, there are two instances of the outer present in the inner: // the enclosing one and the one in the super call. // Here we test that symbols are resolved to the instance created via the super call. diff --git a/compiler/testData/codegen/box/superConstructorCall/kt11833_1.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_1.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/kt11833_1.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_1.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/kt11833_2.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_2.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/kt11833_2.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_2.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/localExtendsInner.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsInner.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/localExtendsInner.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsInner.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/localExtendsLocalWithClosure.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/localExtendsLocalWithClosure.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/objectExtendsClassDefaultArgument.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/objectExtendsClassDefaultArgument.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/objectExtendsClassVararg.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassVararg.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/objectExtendsClassVararg.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassVararg.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/objectExtendsInner.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInner.kt similarity index 89% rename from compiler/testData/codegen/box/superConstructorCall/objectExtendsInner.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInner.kt index f02f1d4edc1..ad017ba003b 100644 --- a/compiler/testData/codegen/box/superConstructorCall/objectExtendsInner.kt +++ b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInner.kt @@ -1,3 +1,5 @@ +// TARGET_BACKEND: JVM + class A { open inner class Inner(val result: String) diff --git a/compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerDefaultArgument.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.kt similarity index 90% rename from compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerDefaultArgument.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.kt index c94d6ab49ca..40e09dca327 100644 --- a/compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerDefaultArgument.kt +++ b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.kt @@ -1,3 +1,5 @@ +// TARGET_BACKEND: JVM + class A { open inner class Inner(val result: String = "OK", val int: Int) diff --git a/compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt similarity index 93% rename from compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt index eef3131ae2b..ad50318d5ca 100644 --- a/compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt +++ b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt @@ -1,3 +1,5 @@ +// TARGET_BACKEND: JVM + fun box(): String { val capture = "oh" diff --git a/compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt similarity index 92% rename from compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt index b4fb7a47cee..c89eff1edab 100644 --- a/compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt +++ b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt @@ -1,3 +1,5 @@ +// TARGET_BACKEND: JVM + fun box(): String { class Local { open inner class Inner(val s: String) { diff --git a/compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalWithClosure.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalWithClosure.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalWithClosure.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalWithClosure.kt diff --git a/compiler/testData/codegen/box/superConstructorCall/objectOuterDiffersFromInnerOuter.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.kt similarity index 100% rename from compiler/testData/codegen/box/superConstructorCall/objectOuterDiffersFromInnerOuter.kt rename to compiler/testData/codegen/box/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 68911f1e1f2..b272fd5442d 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -7398,6 +7398,135 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/protectedNestedClassFromJava.kt"); doTest(fileName); } + + @TestMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SuperConstructorCall extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInSuperConstructorCall() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/innerNested/superConstructorCall"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("deepInnerHierarchy.kt") + public void testDeepInnerHierarchy() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/deepInnerHierarchy.kt"); + doTest(fileName); + } + + @TestMetadata("deepLocalHierarchy.kt") + public void testDeepLocalHierarchy() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt"); + doTest(fileName); + } + + @TestMetadata("innerExtendsInnerViaSecondaryConstuctor.kt") + public void testInnerExtendsInnerViaSecondaryConstuctor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt"); + doTest(fileName); + } + + @TestMetadata("innerExtendsInnerWithProperOuterCapture.kt") + public void testInnerExtendsInnerWithProperOuterCapture() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt"); + doTest(fileName); + } + + @TestMetadata("innerExtendsOuter.kt") + public void testInnerExtendsOuter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsOuter.kt"); + doTest(fileName); + } + + @TestMetadata("kt11833_1.kt") + public void testKt11833_1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_1.kt"); + doTest(fileName); + } + + @TestMetadata("kt11833_2.kt") + public void testKt11833_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_2.kt"); + doTest(fileName); + } + + @TestMetadata("localClassOuterDiffersFromInnerOuter.kt") + public void testLocalClassOuterDiffersFromInnerOuter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt"); + doTest(fileName); + } + + @TestMetadata("localExtendsInner.kt") + public void testLocalExtendsInner() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsInner.kt"); + doTest(fileName); + } + + @TestMetadata("localExtendsLocalWithClosure.kt") + public void testLocalExtendsLocalWithClosure() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt"); + doTest(fileName); + } + + @TestMetadata("localWithClosureExtendsLocalWithClosure.kt") + public void testLocalWithClosureExtendsLocalWithClosure() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsClassDefaultArgument.kt") + public void testObjectExtendsClassDefaultArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsClassVararg.kt") + public void testObjectExtendsClassVararg() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassVararg.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsInner.kt") + public void testObjectExtendsInner() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInner.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsInnerDefaultArgument.kt") + public void testObjectExtendsInnerDefaultArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsInnerOfLocalVarargAndDefault.kt") + public void testObjectExtendsInnerOfLocalVarargAndDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsInnerOfLocalWithCapture.kt") + public void testObjectExtendsInnerOfLocalWithCapture() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsLocalCaptureInSuperCall.kt") + public void testObjectExtendsLocalCaptureInSuperCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsLocalWithClosure.kt") + public void testObjectExtendsLocalWithClosure() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalWithClosure.kt"); + doTest(fileName); + } + + @TestMetadata("objectOuterDiffersFromInnerOuter.kt") + public void testObjectOuterDiffersFromInnerOuter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.kt"); + doTest(fileName); + } + } } @TestMetadata("compiler/testData/codegen/box/instructions") @@ -14315,135 +14444,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @TestMetadata("compiler/testData/codegen/box/superConstructorCall") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class SuperConstructorCall extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInSuperConstructorCall() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/superConstructorCall"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("deepInnerHierarchy.kt") - public void testDeepInnerHierarchy() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/deepInnerHierarchy.kt"); - doTest(fileName); - } - - @TestMetadata("deepLocalHierarchy.kt") - public void testDeepLocalHierarchy() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/deepLocalHierarchy.kt"); - doTest(fileName); - } - - @TestMetadata("innerExtendsInnerViaSecondaryConstuctor.kt") - public void testInnerExtendsInnerViaSecondaryConstuctor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt"); - doTest(fileName); - } - - @TestMetadata("innerExtendsInnerWithProperOuterCapture.kt") - public void testInnerExtendsInnerWithProperOuterCapture() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt"); - doTest(fileName); - } - - @TestMetadata("innerExtendsOuter.kt") - public void testInnerExtendsOuter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/innerExtendsOuter.kt"); - doTest(fileName); - } - - @TestMetadata("kt11833_1.kt") - public void testKt11833_1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/kt11833_1.kt"); - doTest(fileName); - } - - @TestMetadata("kt11833_2.kt") - public void testKt11833_2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/kt11833_2.kt"); - doTest(fileName); - } - - @TestMetadata("localClassOuterDiffersFromInnerOuter.kt") - public void testLocalClassOuterDiffersFromInnerOuter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt"); - doTest(fileName); - } - - @TestMetadata("localExtendsInner.kt") - public void testLocalExtendsInner() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localExtendsInner.kt"); - doTest(fileName); - } - - @TestMetadata("localExtendsLocalWithClosure.kt") - public void testLocalExtendsLocalWithClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localExtendsLocalWithClosure.kt"); - doTest(fileName); - } - - @TestMetadata("localWithClosureExtendsLocalWithClosure.kt") - public void testLocalWithClosureExtendsLocalWithClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsClassDefaultArgument.kt") - public void testObjectExtendsClassDefaultArgument() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassDefaultArgument.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsClassVararg.kt") - public void testObjectExtendsClassVararg() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassVararg.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsInner.kt") - public void testObjectExtendsInner() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInner.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsInnerDefaultArgument.kt") - public void testObjectExtendsInnerDefaultArgument() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerDefaultArgument.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsInnerOfLocalVarargAndDefault.kt") - public void testObjectExtendsInnerOfLocalVarargAndDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsInnerOfLocalWithCapture.kt") - public void testObjectExtendsInnerOfLocalWithCapture() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsLocalCaptureInSuperCall.kt") - public void testObjectExtendsLocalCaptureInSuperCall() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt"); - doTest(fileName); - } - - @TestMetadata("objectExtendsLocalWithClosure.kt") - public void testObjectExtendsLocalWithClosure() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalWithClosure.kt"); - doTest(fileName); - } - - @TestMetadata("objectOuterDiffersFromInnerOuter.kt") - public void testObjectOuterDiffersFromInnerOuter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectOuterDiffersFromInnerOuter.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/box/synchronized") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java index dd9cc2c7670..477c1ff87ae 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InnerNestedTestGenerated.java @@ -172,4 +172,133 @@ public class InnerNestedTestGenerated extends AbstractInnerNestedTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedSimple.kt"); doTest(fileName); } + + @TestMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SuperConstructorCall extends AbstractInnerNestedTest { + @TestMetadata("innerExtendsOuter.kt") + public void ignoredInnerExtendsOuter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsOuter.kt"); + doTest(fileName); + } + + @TestMetadata("localExtendsInner.kt") + public void ignoredLocalExtendsInner() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsInner.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsInner.kt") + public void ignoredObjectExtendsInner() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInner.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsInnerDefaultArgument.kt") + public void ignoredObjectExtendsInnerDefaultArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerDefaultArgument.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsInnerOfLocalVarargAndDefault.kt") + public void ignoredObjectExtendsInnerOfLocalVarargAndDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsInnerOfLocalWithCapture.kt") + public void ignoredObjectExtendsInnerOfLocalWithCapture() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt"); + doTest(fileName); + } + + public void testAllFilesPresentInSuperConstructorCall() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/innerNested/superConstructorCall"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("deepInnerHierarchy.kt") + public void testDeepInnerHierarchy() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/deepInnerHierarchy.kt"); + doTest(fileName); + } + + @TestMetadata("deepLocalHierarchy.kt") + public void testDeepLocalHierarchy() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt"); + doTest(fileName); + } + + @TestMetadata("innerExtendsInnerViaSecondaryConstuctor.kt") + public void testInnerExtendsInnerViaSecondaryConstuctor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerViaSecondaryConstuctor.kt"); + doTest(fileName); + } + + @TestMetadata("innerExtendsInnerWithProperOuterCapture.kt") + public void testInnerExtendsInnerWithProperOuterCapture() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/innerExtendsInnerWithProperOuterCapture.kt"); + doTest(fileName); + } + + @TestMetadata("kt11833_1.kt") + public void testKt11833_1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_1.kt"); + doTest(fileName); + } + + @TestMetadata("kt11833_2.kt") + public void testKt11833_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/kt11833_2.kt"); + doTest(fileName); + } + + @TestMetadata("localClassOuterDiffersFromInnerOuter.kt") + public void testLocalClassOuterDiffersFromInnerOuter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt"); + doTest(fileName); + } + + @TestMetadata("localExtendsLocalWithClosure.kt") + public void testLocalExtendsLocalWithClosure() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt"); + doTest(fileName); + } + + @TestMetadata("localWithClosureExtendsLocalWithClosure.kt") + public void testLocalWithClosureExtendsLocalWithClosure() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsClassDefaultArgument.kt") + public void testObjectExtendsClassDefaultArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassDefaultArgument.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsClassVararg.kt") + public void testObjectExtendsClassVararg() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsClassVararg.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsLocalCaptureInSuperCall.kt") + public void testObjectExtendsLocalCaptureInSuperCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt"); + doTest(fileName); + } + + @TestMetadata("objectExtendsLocalWithClosure.kt") + public void testObjectExtendsLocalWithClosure() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectExtendsLocalWithClosure.kt"); + doTest(fileName); + } + + @TestMetadata("objectOuterDiffersFromInnerOuter.kt") + public void testObjectOuterDiffersFromInnerOuter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/superConstructorCall/objectOuterDiffersFromInnerOuter.kt"); + doTest(fileName); + } + } }