From 947c9fb1bfaaf4680f3c498b7689f9a80f2a6949 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 8 Jul 2014 19:08:39 +0400 Subject: [PATCH] Minor, rename "inner" -> "nested" in tests --- ...InnerClass.A.kt => DoublyNestedClass.A.kt} | 0 ...InnerClass.B.kt => DoublyNestedClass.B.kt} | 0 .../{InnerClass.A.kt => NestedClass.A.kt} | 0 .../{InnerClass.B.kt => NestedClass.B.kt} | 0 .../{InnerEnum.A.kt => NestedEnum.A.kt} | 0 .../{InnerEnum.B.kt => NestedEnum.B.kt} | 0 .../{InnerObject.A.kt => NestedObject.A.kt} | 0 .../{InnerObject.B.kt => NestedObject.B.kt} | 0 ...mpileKotlinAgainstKotlinTestGenerated.java | 40 +++++++++---------- 9 files changed, 20 insertions(+), 20 deletions(-) rename compiler/testData/compileKotlinAgainstKotlin/{InnerInnerClass.A.kt => DoublyNestedClass.A.kt} (100%) rename compiler/testData/compileKotlinAgainstKotlin/{InnerInnerClass.B.kt => DoublyNestedClass.B.kt} (100%) rename compiler/testData/compileKotlinAgainstKotlin/{InnerClass.A.kt => NestedClass.A.kt} (100%) rename compiler/testData/compileKotlinAgainstKotlin/{InnerClass.B.kt => NestedClass.B.kt} (100%) rename compiler/testData/compileKotlinAgainstKotlin/{InnerEnum.A.kt => NestedEnum.A.kt} (100%) rename compiler/testData/compileKotlinAgainstKotlin/{InnerEnum.B.kt => NestedEnum.B.kt} (100%) rename compiler/testData/compileKotlinAgainstKotlin/{InnerObject.A.kt => NestedObject.A.kt} (100%) rename compiler/testData/compileKotlinAgainstKotlin/{InnerObject.B.kt => NestedObject.B.kt} (100%) diff --git a/compiler/testData/compileKotlinAgainstKotlin/InnerInnerClass.A.kt b/compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/InnerInnerClass.A.kt rename to compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/InnerInnerClass.B.kt b/compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.B.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/InnerInnerClass.B.kt rename to compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.B.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/InnerClass.A.kt b/compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/InnerClass.A.kt rename to compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/InnerClass.B.kt b/compiler/testData/compileKotlinAgainstKotlin/NestedClass.B.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/InnerClass.B.kt rename to compiler/testData/compileKotlinAgainstKotlin/NestedClass.B.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/InnerEnum.A.kt b/compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/InnerEnum.A.kt rename to compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/InnerEnum.B.kt b/compiler/testData/compileKotlinAgainstKotlin/NestedEnum.B.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/InnerEnum.B.kt rename to compiler/testData/compileKotlinAgainstKotlin/NestedEnum.B.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/InnerObject.A.kt b/compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/InnerObject.A.kt rename to compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/InnerObject.B.kt b/compiler/testData/compileKotlinAgainstKotlin/NestedObject.B.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/InnerObject.B.kt rename to compiler/testData/compileKotlinAgainstKotlin/NestedObject.B.kt diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java index aa7a31d4f0c..01ee4047466 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java @@ -56,6 +56,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl doTest("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt"); } + @TestMetadata("DoublyNestedClass.A.kt") + public void testDoublyNestedClass() throws Exception { + doTest("compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt"); + } + @TestMetadata("Enum.A.kt") public void testEnum() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt"); @@ -71,36 +76,31 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl doTest("compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.A.kt"); } - @TestMetadata("InnerClass.A.kt") - public void testInnerClass() throws Exception { - doTest("compiler/testData/compileKotlinAgainstKotlin/InnerClass.A.kt"); - } - @TestMetadata("InnerClassConstructor.A.kt") public void testInnerClassConstructor() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/InnerClassConstructor.A.kt"); } - @TestMetadata("InnerEnum.A.kt") - public void testInnerEnum() throws Exception { - doTest("compiler/testData/compileKotlinAgainstKotlin/InnerEnum.A.kt"); - } - - @TestMetadata("InnerInnerClass.A.kt") - public void testInnerInnerClass() throws Exception { - doTest("compiler/testData/compileKotlinAgainstKotlin/InnerInnerClass.A.kt"); - } - - @TestMetadata("InnerObject.A.kt") - public void testInnerObject() throws Exception { - doTest("compiler/testData/compileKotlinAgainstKotlin/InnerObject.A.kt"); - } - @TestMetadata("KotlinPropertyAsAnnotationParameter.A.kt") public void testKotlinPropertyAsAnnotationParameter() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/KotlinPropertyAsAnnotationParameter.A.kt"); } + @TestMetadata("NestedClass.A.kt") + public void testNestedClass() throws Exception { + doTest("compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt"); + } + + @TestMetadata("NestedEnum.A.kt") + public void testNestedEnum() throws Exception { + doTest("compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt"); + } + + @TestMetadata("NestedObject.A.kt") + public void testNestedObject() throws Exception { + doTest("compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt"); + } + @TestMetadata("PlatformNames.A.kt") public void testPlatformNames() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt");