From bfdba9cebc2c42100654f8e3eccb07f65b558534 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Thu, 19 Apr 2012 14:08:50 +0400 Subject: [PATCH] test for inner class of generic class inheriting another generic class actually fixed in Idea in 4afdd61d8dcb846994166ed8f30a7515e9661d56. Thanks, Max! --- .../readJavaBinaryClass/InnerClassesInGeneric.java | 12 ++++++++++++ .../readJavaBinaryClass/InnerClassesInGeneric.kt | 11 +++++++++++ .../readJavaBinaryClass/InnerClassesInGeneric.txt | 13 +++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java create mode 100644 compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt create mode 100644 compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java new file mode 100644 index 00000000000..f322543204f --- /dev/null +++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java @@ -0,0 +1,12 @@ +package test; + +interface Trait

{ +} + +class Outer { + class Inner { + } + + class Inner2 extends Inner implements Trait

{ + } +} diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt new file mode 100644 index 00000000000..f7aecfe1b5a --- /dev/null +++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt @@ -0,0 +1,11 @@ +package test + +trait Trait + +open class Outer() { + open class Inner() { + } + + open class Inner2() : Inner(), Trait

{ + } +} diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt new file mode 100644 index 00000000000..e662ea177e8 --- /dev/null +++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt @@ -0,0 +1,13 @@ +namespace test + +open class test.Outer : jet.Any { + final /*constructor*/ fun (): test.Outer + open class test.Outer.Inner : jet.Any { + final /*constructor*/ fun (): test.Outer.Inner + } + open class test.Outer.Inner2 : test.Outer.Inner, test.Trait

{ + final /*constructor*/ fun (): test.Outer.Inner2 + } +} +abstract trait test.Trait : jet.Any { +}