From cba99a1e67a204c8631ad821e5eef060dc405358 Mon Sep 17 00:00:00 2001 From: "victor.petukhov" Date: Tue, 11 Sep 2018 13:52:40 +0300 Subject: [PATCH] Move test to negatives after fix KT-26382 --- .../contracts/analysis/smartcasts/neg/4.kt | 25 +++++++++++++++++++ .../contracts/analysis/smartcasts/neg/4.txt | 7 ++++++ .../contracts/analysis/smartcasts/pos/4.kt | 25 ------------------- .../contracts/analysis/smartcasts/pos/4.txt | 7 ------ 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.kt index 2a53f560662..b5687201f39 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.kt @@ -123,6 +123,15 @@ fun T.case_10(): Boolean? { return if (this@case_10 == null) true else null } +fun T.case_11_1(): Boolean? { + contract { returns(null) implies (this@case_11_1 != null) } + return if (this@case_11_1 != null) null else true +} +fun T.case_11_2(): Boolean? { + contract { returns(null) implies (this@case_11_2 != null) } + return if (this@case_11_2 != null) null else true +} + // FILE: usages.kt import contracts.* @@ -190,3 +199,19 @@ fun case_10(value_1: Number?) { println(value_1.toByte()) } } + +/* + ISSUES: KT-26382 + */ +fun case_11(value_1: Number?, value_2: Number?) { + if (value_1?.case_11_1() == null) { + println(value_1.toByte()) + } else { + println(value_1.toByte()) + } + if (value_2?.case_11_2() != null) { + println(value_2.toByte()) + } else { + println(value_2.toByte()) + } +} diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.txt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.txt index aad9d6d3771..780b85588d3 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.txt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.txt @@ -2,6 +2,7 @@ package public fun case_1(/*0*/ value_1: kotlin.Any?): kotlin.Unit public fun case_10(/*0*/ value_1: kotlin.Number?): kotlin.Unit +public fun case_11(/*0*/ value_1: kotlin.Number?, /*1*/ value_2: kotlin.Number?): kotlin.Unit public fun case_2(/*0*/ value_1: kotlin.Number): kotlin.Unit public fun case_3(/*0*/ value_1: kotlin.String?, /*1*/ value_2: kotlin.String?): kotlin.Unit public fun case_4(/*0*/ value_1: kotlin.String?, /*1*/ value_2: kotlin.String?): kotlin.Unit @@ -18,6 +19,12 @@ package contracts { public fun T.case_10(): kotlin.Boolean? Returns(NOT_NULL) -> == null + public fun T.case_11_1(): kotlin.Boolean? + Returns(NULL) -> != null + + public fun T.case_11_2(): kotlin.Boolean? + Returns(NULL) -> != null + public fun T.case_2(): kotlin.Unit Returns(WILDCARD) -> !is Int diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.kt index 593c6d11b9e..1efd9d04262 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.kt @@ -150,15 +150,6 @@ fun T.case_9_2(): Boolean? { return if (this@case_9_2 != null) null else true } -fun T.case_10_1(): Boolean? { - contract { returns(null) implies (this@case_10_1 != null) } - return if (this@case_10_1 != null) null else true -} -fun T.case_10_2(): Boolean? { - contract { returns(null) implies (this@case_10_2 != null) } - return if (this@case_10_2 != null) null else true -} - // FILE: usages.kt import contracts.* @@ -247,19 +238,3 @@ fun case_9(value_1: Number?) { if (value_1?.case_9_1() != null) println(value_1.toByte()) if (value_1?.case_9_2() != null) println(value_1.toByte()) } - -/* - ISSUES: KT-26382 - */ -fun case_10(value_1: Number?, value_2: Number?) { - if (value_1?.case_10_1() == null) { - println(value_1.toByte()) - } else { - println(value_1.toByte()) - } - if (value_2?.case_10_2() != null) { - println(value_2.toByte()) - } else { - println(value_2.toByte()) - } -} diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.txt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.txt index 98908b86e86..dd86efe89fb 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.txt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.txt @@ -1,7 +1,6 @@ package public fun case_1(/*0*/ value_1: kotlin.Any?): kotlin.Unit -public fun case_10(/*0*/ value_1: kotlin.Number?, /*1*/ value_2: kotlin.Number?): kotlin.Unit public fun case_2(/*0*/ value_1: kotlin.Number): kotlin.Unit public fun case_3(/*0*/ value_1: kotlin.String?, /*1*/ value_2: kotlin.String?): kotlin.Unit public fun case_4(/*0*/ value_1: kotlin.String?, /*1*/ value_2: kotlin.String?): kotlin.Unit @@ -15,12 +14,6 @@ package contracts { public fun T.case_1(): kotlin.Unit Returns(WILDCARD) -> is String - public fun T.case_10_1(): kotlin.Boolean? - Returns(NULL) -> != null - - public fun T.case_10_2(): kotlin.Boolean? - Returns(NULL) -> != null - public fun T.case_2(): kotlin.Unit Returns(WILDCARD) -> is Int