From a286c475e4496701553c37b4d12b9600fd14e974 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 30 Jul 2012 19:17:31 +0400
Subject: [PATCH] test for KT-1939  #KT-1939 fixed

---
 compiler/testData/codegen/regressions/kt1939.kt      | 12 ++++++++++++
 .../jetbrains/jet/codegen/BridgeMethodGenTest.java   |  5 +++++
 2 files changed, 17 insertions(+)
 create mode 100644 compiler/testData/codegen/regressions/kt1939.kt

diff --git a/compiler/testData/codegen/regressions/kt1939.kt b/compiler/testData/codegen/regressions/kt1939.kt
new file mode 100644
index 00000000000..81cc023ddaa
--- /dev/null
+++ b/compiler/testData/codegen/regressions/kt1939.kt
@@ -0,0 +1,12 @@
+abstract class Foo<T> {
+    fun hello(id: T) = "Hi $id"
+}
+
+trait Tr {
+    fun hello(s : String)
+}
+
+class Bar: Foo<String>(), Tr {
+}
+
+fun box(): String = if (Bar().hello("Reg") == "Hi Reg") "OK" else "Fail"
diff --git a/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
index a337f0c97d3..5cd4c0dceef 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
@@ -134,4 +134,9 @@ public class BridgeMethodGenTest extends CodegenTestCase {
         createEnvironmentWithFullJdk();
         blackBoxFile("regressions/kt2498.kt");
     }
+
+    public void testKt1939() {
+        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
+        blackBoxFile("regressions/kt1939.kt");
+    }
 }