From a218c1359f3701a75fc9dcf957c9b35ae7722723 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 3 Jul 2015 16:24:47 +0300 Subject: [PATCH] Adjust testData: JDK collections behave like non-platform in backend Some of that changes looks like regression and should be fixed soon --- .../codegen/box/platformTypes/primitives/identityEquals.kt | 2 +- .../boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt | 5 ++--- .../kotlin/codegen/GenerateNotNullAssertionsTest.java | 1 - .../tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/compiler/testData/codegen/box/platformTypes/primitives/identityEquals.kt b/compiler/testData/codegen/box/platformTypes/primitives/identityEquals.kt index ae9aefb1c64..a4ee0641f67 100644 --- a/compiler/testData/codegen/box/platformTypes/primitives/identityEquals.kt +++ b/compiler/testData/codegen/box/platformTypes/primitives/identityEquals.kt @@ -3,7 +3,7 @@ fun box(): String { l.add(1000) val x = l[0] === 1000 - if (x) return "Fail: $x" + if (!x) return "Fail: $x" val x1 = l[0] === 1 if (x1) return "Fail 1: $x" val x2 = l[0] === l[0] diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt index a459b553fe7..e2d11d5240c 100644 --- a/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt +++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt @@ -1,8 +1,7 @@ -import java.util.Arrays -import java.util.ArrayList +import java.util.* fun box(): String { - val a = ArrayList() + val a = ArrayList() as AbstractList a.add(null) try { val b: String = a[0] diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index d07adce460f..9f698b8c185 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -126,7 +126,6 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase { loadFile("notNullAssertions/arrayListGet.kt"); String text = generateToText(); - assertTrue(text.contains("checkExpressionValueIsNotNull")); assertTrue(text.contains("checkParameterIsNotNull")); } diff --git a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt index 3db2a8b12e6..9511fc38b80 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt @@ -37,7 +37,7 @@ fun genericClassCast() { val c = ArrayList() c.add(1) // EXPRESSION: c.get(0) - // RESULT: instance of java.lang.Integer(id=ID): Ljava/lang/Integer; + // RESULT: 1: I //Breakpoint! val b = 1 } @@ -46,7 +46,7 @@ fun genericClassCast() { val c = ArrayList() c.add("a") // EXPRESSION: c.get(0) - // RESULT: java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Integer: Ljava/lang/ClassCastException; + // RESULT: java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Number: Ljava/lang/ClassCastException; //Breakpoint! val b = 1 }