From 1a03850951776fa460f32caaefdf4562b6af8c4b Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 11 Jan 2013 15:58:13 +0400
Subject: [PATCH] A test for K-J-K inheritance with generics

---
 .../tests/j+k/KJKInheritanceGeneric.kt          | 17 +++++++++++++++++
 .../checkers/JetDiagnosticsTestGenerated.java   |  5 +++++
 2 files changed, 22 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt

diff --git a/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt b/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt
new file mode 100644
index 00000000000..2c184f5e70d
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt
@@ -0,0 +1,17 @@
+// FILE: K1.kt
+open class KFirst<T: java.io.Serializable>() {
+    fun foo(t: T): T = t
+}
+
+// FILE: J1.java
+public class J1 extends KFirst<Integer> {
+    void baz() {}
+}
+
+// FILE: K2.kt
+class K2: J1() {
+    fun bar() {
+        foo(1)
+        baz()
+    }
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 253659217d2..c0d5e31029b 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -2406,6 +2406,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 doTest("compiler/testData/diagnostics/tests/j+k/KJKInheritance.kt");
             }
             
+            @TestMetadata("KJKInheritanceGeneric.kt")
+            public void testKJKInheritanceGeneric() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt");
+            }
+            
             @TestMetadata("kt1402.kt")
             public void testKt1402() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/j+k/kt1402.kt");