From 00e41fc238c5bd7b5979d2b900cd0e45c2027e6b Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 19 Jun 2015 13:56:37 +0300 Subject: [PATCH] Fix testData after types enhancement --- .../testData/codegen/notNullAssertions/AssertionChecker.kt | 4 ++-- .../kotlin/codegen/GenerateNotNullAssertionsTest.java | 2 +- .../debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/testData/codegen/notNullAssertions/AssertionChecker.kt b/compiler/testData/codegen/notNullAssertions/AssertionChecker.kt index d3643218d1d..17523ca17c2 100644 --- a/compiler/testData/codegen/notNullAssertions/AssertionChecker.kt +++ b/compiler/testData/codegen/notNullAssertions/AssertionChecker.kt @@ -45,10 +45,10 @@ fun checkAssertions(illegalStateExpected: Boolean) { check("plus") { A() + A() } // field - check("NULL") { A().NULL } + // check("NULL") { A().NULL } // static field - check("STATIC_NULL") { A.STATIC_NULL } + // check("STATIC_NULL") { A.STATIC_NULL } // postfix expression // TODO: diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index d30c89bca3f..d07adce460f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -137,7 +137,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase { loadFile("notNullAssertions/javaMultipleSubstitutions.kt"); String text = generateToText(); - assertEquals(3, StringUtil.getOccurrenceCount(text, "checkExpressionValueIsNotNull")); + assertEquals(0, StringUtil.getOccurrenceCount(text, "checkExpressionValueIsNotNull")); assertEquals(3, StringUtil.getOccurrenceCount(text, "checkParameterIsNotNull")); } diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out index bdd1cc9bd58..94468ad37ce 100644 --- a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out +++ b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out @@ -4,9 +4,9 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke stepIntoSpecificKotlinClasses.kt:8 MyJavaClass.java:12 stepIntoSpecificKotlinClasses.kt:8 -Intrinsics.!EXT! -stepIntoSpecificKotlinClasses.kt:8 stepIntoSpecificKotlinClasses.kt:9 +stepIntoSpecificKotlinClasses.kt:10 +Thread.!EXT! Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0