From 0deea6b83c54c2bf484b6d85272f91dabd0250b2 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 27 Mar 2014 03:06:59 +0400
Subject: [PATCH] Add test for obsolete issue

 #KT-1936 Obsolete
---
 .../testData/codegen/box/traits/kt1936.kt     | 23 +++++++++++++++++++
 .../BlackBoxCodegenTestGenerated.java         |  5 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 compiler/testData/codegen/box/traits/kt1936.kt

diff --git a/compiler/testData/codegen/box/traits/kt1936.kt b/compiler/testData/codegen/box/traits/kt1936.kt
new file mode 100644
index 00000000000..7361d996893
--- /dev/null
+++ b/compiler/testData/codegen/box/traits/kt1936.kt
@@ -0,0 +1,23 @@
+var result = "Fail"
+
+trait MyTrait
+{
+    var property : String
+    fun foo()  {
+        result = property
+    }
+}
+
+open class B(param : String) : MyTrait
+{
+    override var property : String = param
+    override fun foo() {
+        super.foo()
+    }
+}
+
+fun box(): String {
+    val b = B("OK")
+    b.foo()
+    return result
+}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
index d504ee07b17..36eba9bc1e2 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -5020,6 +5020,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest("compiler/testData/codegen/box/traits/inheritedVar.kt");
         }
         
+        @TestMetadata("kt1936.kt")
+        public void testKt1936() throws Exception {
+            doTest("compiler/testData/codegen/box/traits/kt1936.kt");
+        }
+        
         @TestMetadata("kt1936_1.kt")
         public void testKt1936_1() throws Exception {
             doTest("compiler/testData/codegen/box/traits/kt1936_1.kt");