From 454f0aaa15e57fd45e298d86980fc1249872dcb9 Mon Sep 17 00:00:00 2001
From: Alex Tkachman <alex.tkachman@gmail.com>
Date: Sat, 4 Aug 2012 21:20:28 +0300
Subject: [PATCH] KT-1936 codegen tests for issue which in fact frontend one

---
 compiler/testData/codegen/regressions/kt1936_1.kt | 13 +++++++++++++
 compiler/testData/codegen/regressions/kt1936_2.kt | 15 +++++++++++++++
 .../org/jetbrains/jet/codegen/TraitsTest.java     |  8 ++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 compiler/testData/codegen/regressions/kt1936_1.kt
 create mode 100644 compiler/testData/codegen/regressions/kt1936_2.kt

diff --git a/compiler/testData/codegen/regressions/kt1936_1.kt b/compiler/testData/codegen/regressions/kt1936_1.kt
new file mode 100644
index 00000000000..b79da2cf44e
--- /dev/null
+++ b/compiler/testData/codegen/regressions/kt1936_1.kt
@@ -0,0 +1,13 @@
+trait MyTrait
+{
+    var property : String
+    fun foo() = property
+}
+
+open class B(param : String) : MyTrait
+{
+    override var property : String = param
+    override fun foo() = super.foo()
+}
+
+fun box()= B("OK").foo()
diff --git a/compiler/testData/codegen/regressions/kt1936_2.kt b/compiler/testData/codegen/regressions/kt1936_2.kt
new file mode 100644
index 00000000000..d892033bb6b
--- /dev/null
+++ b/compiler/testData/codegen/regressions/kt1936_2.kt
@@ -0,0 +1,15 @@
+open class MyClass(param : String) {
+    var propterty = param
+}
+
+trait MyTrait : MyClass
+{
+    fun foo()  = propterty
+}
+
+open class B(param : String) : MyTrait, MyClass(param)
+{
+    override fun foo() = super<MyTrait>.foo()
+}
+
+fun box()= B("OK").foo()
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java b/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
index ee92351ded4..17ab1a4ec47 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
@@ -76,4 +76,12 @@ public class TraitsTest extends CodegenTestCase {
     public void testFinalMethod() throws Exception {
         blackBoxFile("traits/finalMethod.jet");
     }
+
+    public void testKt1936_1() throws Exception {
+        blackBoxFile("regressions/kt1936_1.kt");
+    }
+
+    public void testKt1936_2() throws Exception {
+        blackBoxFile("regressions/kt1936_2.kt");
+    }
 }