From 4cba600268dc9d3085f6460971173dd23910a3ba Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 14 Jul 2017 09:23:01 +0300 Subject: [PATCH] Minor: some more evaluation order tests for 'boxed == primitive' --- .../boxedEqPrimitiveEvaluationOrder.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/boxedEqPrimitiveEvaluationOrder.kt b/compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/boxedEqPrimitiveEvaluationOrder.kt index 0a8975e6127..5fd58629899 100644 --- a/compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/boxedEqPrimitiveEvaluationOrder.kt +++ b/compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/boxedEqPrimitiveEvaluationOrder.kt @@ -20,10 +20,15 @@ inline fun evaluateAndCheckOrder(marker: String, expectedValue: Boolean, expecte val nn: Int? = null fun box(): String { - evaluateAndCheckOrder("1", true, "ab") { a(1) == b(1) } - evaluateAndCheckOrder("2", true, "ab") { a(1) != b(2) } - evaluateAndCheckOrder("3", true, "ab") { !(a(1) == b(2)) } - evaluateAndCheckOrder("4", true, "ab") { !(a(1) != b(1)) } + evaluateAndCheckOrder("1 == 1", true, "ab") { a(1) == b(1) } + evaluateAndCheckOrder("1 == 2", false, "ab") { a(1) == b(2) } + evaluateAndCheckOrder("1 != 1", false, "ab") { a(1) != b(1) } + evaluateAndCheckOrder("1 != 2", true, "ab") { a(1) != b(2) } + + evaluateAndCheckOrder("!(1 == 2)", true, "ab") { !(a(1) == b(2)) } + evaluateAndCheckOrder("!(1 == 1)", false, "ab") { !(a(1) == b(1)) } + evaluateAndCheckOrder("!(1 != 2)", false, "ab") { !(a(1) != b(2)) } + evaluateAndCheckOrder("!(1 != 1)", true, "ab") { !(a(1) != b(1)) } evaluateAndCheckOrder("null == 1", false, "a") { nn == a(1) } evaluateAndCheckOrder("null != 1", true, "a") { nn != a(1) }