From 4f0cf2f91895edce97b8effc0ac5bbc4777379d8 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 Mar 2015 19:14:18 +0100 Subject: [PATCH 1/4] regression test for obsolete issue KT-4142 --- .../codegen/boxWithStdlib/regressions/kt4142.kt | 16 ++++++++++++++++ .../BlackBoxWithStdlibCodegenTestGenerated.java | 6 ++++++ 2 files changed, 22 insertions(+) create mode 100644 compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt new file mode 100644 index 00000000000..e02b05f37bb --- /dev/null +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt @@ -0,0 +1,16 @@ +open class B { + val name: String + get() = "OK" +} + +trait A { + val name: String +} + +class C : B(), A { + +} + +fun box(): String { + return C().name +} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index f8012c0beb4..03411563816 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -3062,6 +3062,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode doTestWithStdlib(fileName); } + @TestMetadata("kt4142.kt") + public void testKt4142() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("kt4262.kt") public void testKt4262() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt"); From 9d229ad27133c88ddf6d1b77eafa3b9f78655480 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 Mar 2015 20:49:53 +0100 Subject: [PATCH 2/4] regression test for KT-4259 --- .../testData/codegen/boxWithStdlib/regressions/kt4259.kt | 6 ++++++ .../generated/BlackBoxWithStdlibCodegenTestGenerated.java | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt new file mode 100644 index 00000000000..7d609780d22 --- /dev/null +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt @@ -0,0 +1,6 @@ +fun box(): String { + val s: String? = "a" + val o: Char? = s?.charAt(0) + val c: Any? = o?.javaClass + return if (c != null) "OK" else "fail" +} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 03411563816..8d54ed47114 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -3068,6 +3068,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode doTestWithStdlib(fileName); } + @TestMetadata("kt4259.kt") + public void testKt4259() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("kt4262.kt") public void testKt4262() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt"); From f6093274abaee08a4b476ec819d07526297317fb Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 Mar 2015 20:59:56 +0100 Subject: [PATCH 3/4] regression test for KT-5395 --- .../codegen/boxWithStdlib/regressions/kt5395.kt | 13 +++++++++++++ .../BlackBoxWithStdlibCodegenTestGenerated.java | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt new file mode 100644 index 00000000000..11bb02ddf09 --- /dev/null +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt @@ -0,0 +1,13 @@ +class D { + companion object { + protected val F: String = "OK" + } + + inner class E { + fun foo() = F + } +} + +fun box(): String { + return D().E().foo() +} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 8d54ed47114..c9a30a0ac39 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -3104,6 +3104,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode doTestWithStdlib(fileName); } + @TestMetadata("kt5395.kt") + public void testKt5395() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("kt6434.kt") public void testKt6434() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt"); From 0467bba7a67988fed1777ddfa1756de5b9af144c Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 Mar 2015 21:05:23 +0100 Subject: [PATCH 4/4] regression test for KT-5953 --- .../codegen/boxWithStdlib/regressions/kt5953.kt | 11 +++++++++++ .../BlackBoxWithStdlibCodegenTestGenerated.java | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 compiler/testData/codegen/boxWithStdlib/regressions/kt5953.kt diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt5953.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt5953.kt new file mode 100644 index 00000000000..c18c893f441 --- /dev/null +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt5953.kt @@ -0,0 +1,11 @@ +fun box(): String { + val res = (1..3).map { it -> + if (it == 1) + 2 + }; + + var result = "" + for (i in res) + result += " " + return if (result == " ") "OK" else result +} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index c9a30a0ac39..4fb92146512 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -3110,6 +3110,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode doTestWithStdlib(fileName); } + @TestMetadata("kt5953.kt") + public void testKt5953() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5953.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("kt6434.kt") public void testKt6434() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt");