From cf1a70a28ed82d9b1499ec1bbb253c8916b6c611 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 15 Oct 2013 22:37:13 +0400 Subject: [PATCH] Minor, group tests related to synthetic methods for properties --- .../Class.kt} | 0 .../Class.txt} | 0 .../ClassObject.kt} | 0 .../ClassObject.txt} | 0 .../ExtensionsWithSameNameClass.kt} | 0 .../ExtensionsWithSameNameClass.txt} | 0 .../ExtensionsWithSameNamePackage.kt} | 0 .../ExtensionsWithSameNamePackage.txt} | 0 .../TopLevel.kt} | 0 .../TopLevel.txt} | 0 .../LoadCompiledKotlinTestGenerated.java | 61 +++++++++++-------- ...esolveNamespaceComparingTestGenerated.java | 61 +++++++++++-------- 12 files changed, 70 insertions(+), 52 deletions(-) rename compiler/testData/loadKotlin/annotations/{classMembers/PropertyNoField.kt => propertiesWithoutBackingFields/Class.kt} (100%) rename compiler/testData/loadKotlin/annotations/{classMembers/PropertyNoField.txt => propertiesWithoutBackingFields/Class.txt} (100%) rename compiler/testData/loadKotlin/annotations/{classMembers/ClassObjectPropertyNoField.kt => propertiesWithoutBackingFields/ClassObject.kt} (100%) rename compiler/testData/loadKotlin/annotations/{classMembers/ClassObjectPropertyNoField.txt => propertiesWithoutBackingFields/ClassObject.txt} (100%) rename compiler/testData/loadKotlin/annotations/{classMembers/ExtensionPropertiesWithSameNameNoField.kt => propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt} (100%) rename compiler/testData/loadKotlin/annotations/{classMembers/ExtensionPropertiesWithSameNameNoField.txt => propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt} (100%) rename compiler/testData/loadKotlin/annotations/{packageMembers/ExtensionPropertiesWithSameNameNoField.kt => propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt} (100%) rename compiler/testData/loadKotlin/annotations/{packageMembers/ExtensionPropertiesWithSameNameNoField.txt => propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt} (100%) rename compiler/testData/loadKotlin/annotations/{packageMembers/PropertyNoField.kt => propertiesWithoutBackingFields/TopLevel.kt} (100%) rename compiler/testData/loadKotlin/annotations/{packageMembers/PropertyNoField.txt => propertiesWithoutBackingFields/TopLevel.txt} (100%) diff --git a/compiler/testData/loadKotlin/annotations/classMembers/PropertyNoField.kt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Class.kt similarity index 100% rename from compiler/testData/loadKotlin/annotations/classMembers/PropertyNoField.kt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Class.kt diff --git a/compiler/testData/loadKotlin/annotations/classMembers/PropertyNoField.txt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Class.txt similarity index 100% rename from compiler/testData/loadKotlin/annotations/classMembers/PropertyNoField.txt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Class.txt diff --git a/compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyNoField.kt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt similarity index 100% rename from compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyNoField.kt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt diff --git a/compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyNoField.txt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt similarity index 100% rename from compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyNoField.txt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt diff --git a/compiler/testData/loadKotlin/annotations/classMembers/ExtensionPropertiesWithSameNameNoField.kt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt similarity index 100% rename from compiler/testData/loadKotlin/annotations/classMembers/ExtensionPropertiesWithSameNameNoField.kt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt diff --git a/compiler/testData/loadKotlin/annotations/classMembers/ExtensionPropertiesWithSameNameNoField.txt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt similarity index 100% rename from compiler/testData/loadKotlin/annotations/classMembers/ExtensionPropertiesWithSameNameNoField.txt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt diff --git a/compiler/testData/loadKotlin/annotations/packageMembers/ExtensionPropertiesWithSameNameNoField.kt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt similarity index 100% rename from compiler/testData/loadKotlin/annotations/packageMembers/ExtensionPropertiesWithSameNameNoField.kt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt diff --git a/compiler/testData/loadKotlin/annotations/packageMembers/ExtensionPropertiesWithSameNameNoField.txt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt similarity index 100% rename from compiler/testData/loadKotlin/annotations/packageMembers/ExtensionPropertiesWithSameNameNoField.txt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt diff --git a/compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.kt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt similarity index 100% rename from compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.kt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt diff --git a/compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.txt b/compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt similarity index 100% rename from compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.txt rename to compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java index 29b585aee36..e18bf6ec87f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java @@ -38,7 +38,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT } @TestMetadata("compiler/testData/loadKotlin/annotations") - @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class}) + @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.PropertiesWithoutBackingFields.class}) public static class Annotations extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -55,11 +55,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); } - @TestMetadata("ClassObjectPropertyNoField.kt") - public void testClassObjectPropertyNoField() throws Exception { - doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyNoField.kt"); - } - @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/DelegatedProperty.kt"); @@ -70,11 +65,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/EnumArgument.kt"); } - @TestMetadata("ExtensionPropertiesWithSameNameNoField.kt") - public void testExtensionPropertiesWithSameNameNoField() throws Exception { - doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/ExtensionPropertiesWithSameNameNoField.kt"); - } - @TestMetadata("Function.kt") public void testFunction() throws Exception { doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/Function.kt"); @@ -90,11 +80,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/PropertyField.kt"); } - @TestMetadata("PropertyNoField.kt") - public void testPropertyNoField() throws Exception { - doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/PropertyNoField.kt"); - } - @TestMetadata("Setter.kt") public void testSetter() throws Exception { doTestWithAccessors("compiler/testData/loadKotlin/annotations/classMembers/Setter.kt"); @@ -176,11 +161,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/EnumArgument.kt"); } - @TestMetadata("ExtensionPropertiesWithSameNameNoField.kt") - public void testExtensionPropertiesWithSameNameNoField() throws Exception { - doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/ExtensionPropertiesWithSameNameNoField.kt"); - } - @TestMetadata("Function.kt") public void testFunction() throws Exception { doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/Function.kt"); @@ -196,11 +176,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.kt"); } - @TestMetadata("PropertyNoField.kt") - public void testPropertyNoField() throws Exception { - doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.kt"); - } - @TestMetadata("Setter.kt") public void testSetter() throws Exception { doTestWithAccessors("compiler/testData/loadKotlin/annotations/packageMembers/Setter.kt"); @@ -208,12 +183,46 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT } + @TestMetadata("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields") + public static class PropertiesWithoutBackingFields extends AbstractLoadCompiledKotlinTest { + public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("Class.kt") + public void testClass() throws Exception { + doTestWithAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); + } + + @TestMetadata("ClassObject.kt") + public void testClassObject() throws Exception { + doTestWithAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); + } + + @TestMetadata("ExtensionsWithSameNameClass.kt") + public void testExtensionsWithSameNameClass() throws Exception { + doTestWithAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); + } + + @TestMetadata("ExtensionsWithSameNamePackage.kt") + public void testExtensionsWithSameNamePackage() throws Exception { + doTestWithAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); + } + + @TestMetadata("TopLevel.kt") + public void testTopLevel() throws Exception { + doTestWithAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); + } + + } + public static Test innerSuite() { TestSuite suite = new TestSuite("Annotations"); suite.addTestSuite(Annotations.class); suite.addTestSuite(ClassMembers.class); suite.addTestSuite(Classes.class); suite.addTestSuite(PackageMembers.class); + suite.addTestSuite(PropertiesWithoutBackingFields.class); return suite; } } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index 828f47b90ae..990e9161d12 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -40,7 +40,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadKotlin/annotations") - @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class}) + @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.PropertiesWithoutBackingFields.class}) public static class Annotations extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -57,11 +57,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); } - @TestMetadata("ClassObjectPropertyNoField.kt") - public void testClassObjectPropertyNoField() throws Exception { - doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyNoField.kt"); - } - @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/DelegatedProperty.kt"); @@ -72,11 +67,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/EnumArgument.kt"); } - @TestMetadata("ExtensionPropertiesWithSameNameNoField.kt") - public void testExtensionPropertiesWithSameNameNoField() throws Exception { - doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/ExtensionPropertiesWithSameNameNoField.kt"); - } - @TestMetadata("Function.kt") public void testFunction() throws Exception { doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/Function.kt"); @@ -92,11 +82,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/PropertyField.kt"); } - @TestMetadata("PropertyNoField.kt") - public void testPropertyNoField() throws Exception { - doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/PropertyNoField.kt"); - } - @TestMetadata("Setter.kt") public void testSetter() throws Exception { doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/classMembers/Setter.kt"); @@ -178,11 +163,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/EnumArgument.kt"); } - @TestMetadata("ExtensionPropertiesWithSameNameNoField.kt") - public void testExtensionPropertiesWithSameNameNoField() throws Exception { - doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/ExtensionPropertiesWithSameNameNoField.kt"); - } - @TestMetadata("Function.kt") public void testFunction() throws Exception { doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/Function.kt"); @@ -198,11 +178,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.kt"); } - @TestMetadata("PropertyNoField.kt") - public void testPropertyNoField() throws Exception { - doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/PropertyNoField.kt"); - } - @TestMetadata("Setter.kt") public void testSetter() throws Exception { doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/packageMembers/Setter.kt"); @@ -210,12 +185,46 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } + @TestMetadata("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields") + public static class PropertiesWithoutBackingFields extends AbstractLazyResolveNamespaceComparingTest { + public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("Class.kt") + public void testClass() throws Exception { + doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); + } + + @TestMetadata("ClassObject.kt") + public void testClassObject() throws Exception { + doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); + } + + @TestMetadata("ExtensionsWithSameNameClass.kt") + public void testExtensionsWithSameNameClass() throws Exception { + doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); + } + + @TestMetadata("ExtensionsWithSameNamePackage.kt") + public void testExtensionsWithSameNamePackage() throws Exception { + doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); + } + + @TestMetadata("TopLevel.kt") + public void testTopLevel() throws Exception { + doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); + } + + } + public static Test innerSuite() { TestSuite suite = new TestSuite("Annotations"); suite.addTestSuite(Annotations.class); suite.addTestSuite(ClassMembers.class); suite.addTestSuite(Classes.class); suite.addTestSuite(PackageMembers.class); + suite.addTestSuite(PropertiesWithoutBackingFields.class); return suite; } }