Tests for renamed fields

2013-06-07 14:54:07 +04:00
parent aec6deae9f
commit 76d4dcef7f
21 changed files with 312 additions and 19 deletions
@@ -0,0 +1,16 @@
+class Test(val prop: String) {
+
+  class object {
+    public val prop : String = "CO";
+  }
+
+}
+
+
+fun box() : String {
+  val obj = Test("OK");
+
+  if (Test.prop != "CO") return "fail1";
+
+  return obj.prop;
+}
@@ -0,0 +1,26 @@
+public open class TestDelegate<T: Any>(private val initializer: () -> T) {
+    private volatile var value: T? = null
+
+    public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        if (value == null) {
+            value = initializer()
+        }
+        return value!!
+    }
+
+    public open fun set(thisRef: Any?, desc: PropertyMetadata, svalue : T) {
+        value = svalue
+    }
+}
+
+class A {}
+class B {}
+
+public val A.s: String by TestDelegate( {"OK2"})
+public val B.s: String by TestDelegate( {"OK"})
+
+fun box() : String {
+  if (A().s != "OK2") return "fail1"
+
+  return B().s
+}
@@ -0,0 +1,14 @@
+public class MPair<out A> (
+        public val first: A
+) {
+    fun equals(o: Any?): Boolean {
+        val t = o as MPair<*>
+        return first == t.first
+    }
+}
+
+fun box(): String {
+   val a = MPair("O")
+   a.equals(a)
+   return "OK"
+}
@@ -0,0 +1,18 @@
+class A { }
+class B { }
+
+public val A.prop: Int = 0;
+public val B.prop: String = "1111";
+public val prop: Double = 0.1;
+
+public fun doTest() : String {
+    if (A().prop != 0) return "fail1"
+    if (B().prop != "1111") return "fail2"
+    if (prop != 0.1) return "fail3"
+
+    return "OK"
+}
+
+fun box() : String {
+  return doTest()
+}
@@ -0,0 +1,22 @@
+class A { }
+class B { }
+
+class Test {
+
+  public val A.prop: Int = 0;
+  public val B.prop: String = "1111";
+  public val prop: Double = 0.1;
+
+  public fun doTest() : String {
+      if (A().prop != 0) return "fail1"
+      if (B().prop != "1111") return "fail2"
+      if (prop != 0.1) return "fail3"
+
+      return "OK"
+  }
+}
+
+
+fun box() : String {
+  return Test().doTest()
+}
@@ -1,4 +1,4 @@
-class staticProperty {
+class staticClassProperty {

    public static void main(String[] args) {
        int i = Test.valProp;
@@ -1,8 +1,6 @@
-class staticProperty {
+class staticTraitProperty {

    public static void main(String[] args) {
        int i = Test.valProp;
-        int j = Test.varProp;
-        Test.varProp = 100;
    }
 }
@@ -2,8 +2,6 @@ trait Test {

  class object {
    public val valProp: Int = 10
-
-    public var varProp: Int = 10
  }

 }
@@ -5,9 +5,9 @@ class Test {
 }

 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test, prop
+// TESTED_OBJECTS: Test, prop$ext
 // FLAGS: ACC_FINAL, ACC_STATIC, ACC_PRIVATE

 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test$object, prop
+// TESTED_OBJECTS: Test$object, prop$ext
 // ABSENT: TRUE
@@ -5,9 +5,9 @@ class Test {
 }

 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test, prop
+// TESTED_OBJECTS: Test, prop$ext
 // FLAGS: ACC_STATIC, ACC_PRIVATE

 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test$object, prop
+// TESTED_OBJECTS: Test$object, prop$ext
 // ABSENT: TRUE
@@ -0,0 +1,16 @@
+class Test(val prop: String) {
+
+  class object {
+    public val prop : String = "CO";
+  }
+
+}
+
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$1
+// FLAGS: ACC_PRIVATE, ACC_FINAL
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
@@ -0,0 +1,31 @@
+public open class TestDelegate<T: Any>(private val initializer: () -> T) {
+    private volatile var value: T? = null
+
+    public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        if (value == null) {
+            value = initializer()
+        }
+        return value!!
+    }
+
+    public open fun set(thisRef: Any?, desc: PropertyMetadata, svalue : T) {
+        value = svalue
+    }
+}
+
+class Test {
+
+  public val prop: Int by TestDelegate({10})
+
+  class object {
+    public var prop: Int by TestDelegate({10})
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$delegate$1
+// FLAGS: ACC_PRIVATE, ACC_FINAL
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$delegate
+// FLAGS: ACC_STATIC, ACC_PRIVATE, ACC_FINAL
@@ -0,0 +1,31 @@
+public open class TestDelegate<T: Any>(private val initializer: () -> T) {
+    private volatile var value: T? = null
+
+    public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        if (value == null) {
+            value = initializer()
+        }
+        return value!!
+    }
+
+    public open fun set(thisRef: Any?, desc: PropertyMetadata, svalue : T) {
+        value = svalue
+    }
+}
+
+class Test {
+
+  public var prop: String = ""
+
+  class object {
+    public var prop: Int by TestDelegate({10})
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_PRIVATE
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$delegate
+// FLAGS: ACC_STATIC, ACC_PRIVATE, ACC_FINAL
@@ -0,0 +1,18 @@
+class A { }
+class B { }
+
+class Test {
+
+  class object {
+    public val A.prop: Int = 0;
+    public val B.prop: Int = 0;
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$ext
+// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$ext$1
+// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
@@ -0,0 +1,16 @@
+class Test {
+
+  public val prop: Int = 0;
+
+  class object {
+    public var Test.prop: Int = 0;
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_PRIVATE, ACC_FINAL
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$ext
+// FLAGS: ACC_STATIC, ACC_PRIVATE
@@ -0,0 +1,16 @@
+class Test {
+
+  public var prop: Int = 0;
+
+  class object {
+    public val prop: Int = 0;
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop$1
+// FLAGS: ACC_PRIVATE
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
@@ -5,9 +5,9 @@ trait Test {
 }

 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test, prop
+// TESTED_OBJECTS: Test, prop$ext
 // ABSENT: TRUE

 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test$object, prop
+// TESTED_OBJECTS: Test$object, prop$ext
 // FLAGS: ACC_FINAL, ACC_PRIVATE
@@ -5,9 +5,9 @@ trait Test {
 }

 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test, prop
+// TESTED_OBJECTS: Test, prop$ext
 // ABSENT: TRUE

 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: Test$object, prop
+// TESTED_OBJECTS: Test$object, prop$ext
 // FLAGS: ACC_PRIVATE
@@ -105,7 +105,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
            int expectedAccess = getExpectedFlags(testedObject.textData);

            if (isObjectExists) {
-                assertEquals("Wrong access flag \n" + factory.asText(className), expectedAccess, classVisitor.getAccess());
+                assertEquals("Wrong access flag for " + testedObject + " \n" + factory.asText(className), expectedAccess, classVisitor.getAccess());
            }
        }
    }
@@ -473,7 +473,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
        }
        
        @TestMetadata("compiler/testData/writeFlags/property/classObject")
-        @InnerTestClasses({ClassObject.Class.class, ClassObject.Trait.class})
+        @InnerTestClasses({ClassObject.Class.class, ClassObject.Rename.class, ClassObject.Trait.class})
        public static class ClassObject extends AbstractWriteFlagsTest {
            public void testAllFilesPresentInClassObject() throws Exception {
                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/property/classObject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -582,6 +582,44 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                
            }
            
+            @TestMetadata("compiler/testData/writeFlags/property/classObject/rename")
+            public static class Rename extends AbstractWriteFlagsTest {
+                public void testAllFilesPresentInRename() throws Exception {
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/property/classObject/rename"), Pattern.compile("^(.+)\\.kt$"), true);
+                }
+                
+                @TestMetadata("constructorAndClassObject.kt")
+                public void testConstructorAndClassObject() throws Exception {
+                    doTest("compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt");
+                }
+                
+                @TestMetadata("delegatedAndDelegated.kt")
+                public void testDelegatedAndDelegated() throws Exception {
+                    doTest("compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt");
+                }
+                
+                @TestMetadata("delegatedAndProperty.kt")
+                public void testDelegatedAndProperty() throws Exception {
+                    doTest("compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt");
+                }
+                
+                @TestMetadata("extensionAndExtension.kt")
+                public void testExtensionAndExtension() throws Exception {
+                    doTest("compiler/testData/writeFlags/property/classObject/rename/extensionAndExtension.kt");
+                }
+                
+                @TestMetadata("extensionAndProperty.kt")
+                public void testExtensionAndProperty() throws Exception {
+                    doTest("compiler/testData/writeFlags/property/classObject/rename/extensionAndProperty.kt");
+                }
+                
+                @TestMetadata("propertyAndProperty.kt")
+                public void testPropertyAndProperty() throws Exception {
+                    doTest("compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt");
+                }
+                
+            }
+            
            @TestMetadata("compiler/testData/writeFlags/property/classObject/trait")
            public static class Trait extends AbstractWriteFlagsTest {
                public void testAllFilesPresentInTrait() throws Exception {
@@ -689,6 +727,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                TestSuite suite = new TestSuite("ClassObject");
                suite.addTestSuite(ClassObject.class);
                suite.addTestSuite(Class.class);
+                suite.addTestSuite(Rename.class);
                suite.addTestSuite(Trait.class);
                return suite;
            }
@@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/box")
-@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Namespace.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.Sam.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class})
+@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Namespace.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.Sam.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class})
 public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
    public void testAllFilesPresentInBox() throws Exception {
        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1551,8 +1551,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                doTest("compiler/testData/codegen/box/defaultArguments/constructor/kt2852.kt");
            }
            
-        }
-        
+            }
+            
        @TestMetadata("compiler/testData/codegen/box/defaultArguments/function")
        public static class Function extends AbstractBlackBoxCodegenTest {
            public void testAllFilesPresentInFunction() throws Exception {
@@ -2038,6 +2038,39 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
        
    }
    
+    @TestMetadata("compiler/testData/codegen/box/fieldRename")
+    public static class FieldRename extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInFieldRename() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/fieldRename"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("constructorAndClassObject.kt")
+        public void testConstructorAndClassObject() throws Exception {
+            doTest("compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt");
+        }
+        
+        @TestMetadata("delegates.kt")
+        public void testDelegates() throws Exception {
+            doTest("compiler/testData/codegen/box/fieldRename/delegates.kt");
+        }
+        
+        @TestMetadata("genericPropertyWithItself.kt")
+        public void testGenericPropertyWithItself() throws Exception {
+            doTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt");
+        }
+        
+        @TestMetadata("inNamespace.kt")
+        public void testInNamespace() throws Exception {
+            doTest("compiler/testData/codegen/box/fieldRename/inNamespace.kt");
+        }
+        
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            doTest("compiler/testData/codegen/box/fieldRename/simple.kt");
+        }
+        
+    }
+    
    @TestMetadata("compiler/testData/codegen/box/functions")
    @InnerTestClasses({Functions.LocalFunctions.class})
    public static class Functions extends AbstractBlackBoxCodegenTest {
@@ -4093,6 +4126,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
        suite.addTestSuite(ExclExcl.class);
        suite.addTestSuite(ExtensionFunctions.class);
        suite.addTestSuite(ExtensionProperties.class);
+        suite.addTestSuite(FieldRename.class);
        suite.addTest(Functions.innerSuite());
        suite.addTestSuite(InnerNested.class);
        suite.addTest(Instructions.innerSuite());