From 06550a6d3176e19d08945e011539904e2c8cb18f Mon Sep 17 00:00:00 2001
From: Pavel Kirpichenkov <pavel.kirpichenkov@jetbrains.com>
Date: Thu, 23 Jan 2020 11:48:03 +0300
Subject: [PATCH] [NI] Actualize spec tests, affected by KT-35668

Update test data, remove obsolete 'UNEXPECTED BEHAVIOUR'
---
 .../testData/diagnostics/notLinked/dfa/neg/11.kt  |  3 +--
 .../testData/diagnostics/notLinked/dfa/pos/33.kt  |  1 -
 .../testData/diagnostics/notLinked/dfa/pos/36.kt  |  8 ++------
 .../testData/diagnostics/notLinked/dfa/pos/6.kt   | 15 ++++++---------
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/11.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/11.kt
index caeaef4566f..8ada03801dd 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/11.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/11.kt
@@ -53,8 +53,7 @@ fun case_4() {
 
 /*
  * TESTCASE NUMBER: 5
- * UNEXPECTED BEHAVIOUR
- * ISSUES: KT-35668, KT-35668
+ * ISSUES: KT-35668
  */
 fun case_5() {
     var x: Int? = null
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/33.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/33.kt
index 19c57b0dc3c..2a9a477ccde 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/33.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/33.kt
@@ -83,7 +83,6 @@ fun case_5() {
 
 /*
  * TESTCASE NUMBER: 6
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-35668
  */
 fun case_6() {
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/36.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/36.kt
index edb03a263bf..cc6edbbf63a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/36.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/36.kt
@@ -82,7 +82,6 @@ fun case_5(x: Any?) {
 
 /*
  * TESTCASE NUMBER: 6
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-35668
  */
 fun case_6(x: Any?) {
@@ -96,7 +95,6 @@ fun case_6(x: Any?) {
 
 /*
  * TESTCASE NUMBER: 7
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-35668
  */
 fun case_7(x: Any?, z: Any) {
@@ -110,7 +108,6 @@ fun case_7(x: Any?, z: Any) {
 
 /*
  * TESTCASE NUMBER: 8
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-35668
  */
 fun case_8(x: Any?, z: Any) {
@@ -132,15 +129,14 @@ fun case_9(x: Any?, z: Any) {
 
 /*
  * TESTCASE NUMBER: 6
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-35668
  */
 fun case_10(x: Any?, z: Any, b: Boolean?) {
-    var y = x ?: when (b) {
+    var y = x ?: <!DEBUG_INFO_IMPLICIT_EXHAUSTIVE!>when (b) {
         true -> null!!
         false -> return
         null -> throw Exception()
-    }
+    }<!>
     z === y || if (b == true) return else if (<!IMPLICIT_BOXING_IN_IDENTITY_EQUALS!>b === false<!>) null!! else throw Exception()
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>x<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/6.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/6.kt
index 2afd19582b8..127c106a50c 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/6.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/6.kt
@@ -330,8 +330,7 @@ val case_17 = if (nullableIntProperty === <!DEBUG_INFO_CONSTANT!>implicitNullabl
 
 /*
  * TESTCASE NUMBER: 18
- * UNEXPECTED BEHAVIOUR
- * ISSUES: KT-35668, KT-35668
+ * ISSUES: KT-35668
  */
 fun case_18(a: DeepObject.A.B.C.D.E.F.G.J?, b: Boolean) {
     val x = null
@@ -1178,7 +1177,6 @@ fun case_65(x: Any?, z: Nothing?) {
 
 /*
  * TESTCASE NUMBER: 66
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-35668
  */
 fun case_66(x: Any?, z1: Nothing?, z2: Nothing?, b: Boolean) {
@@ -1244,7 +1242,6 @@ fun case_68(x: Any?, z: Nothing?) {
 
 /*
  * TESTCASE NUMBER: 69
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-35668
  */
 fun case_69(x: Any?, z: Nothing?) {
@@ -1328,12 +1325,12 @@ fun case_72(t: Any?, z1: Nothing?) {
     var z2 = null
 
     if (t is Interface1? && t != <!DEBUG_INFO_CONSTANT!>z1<!> ?: <!DEBUG_INFO_CONSTANT!>z2<!> && t is Interface2?) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1? & Interface2? & kotlin.Any?")!>t<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1? & Interface2? & kotlin.Any?")!>t<!><!UNSAFE_CALL!>.<!>itest1()
-        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1? & Interface2? & kotlin.Any?")!>t<!><!UNSAFE_CALL!>.<!>itest2()
-        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1? & Interface2? & kotlin.Any?")!>t<!><!UNSAFE_CALL!>.<!>itest()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & Interface2 & kotlin.Any & kotlin.Any?")!>t<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest2()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
 
-        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1? & Interface2? & kotlin.Any?")!>t<!>.let { <!DEBUG_INFO_EXPRESSION_TYPE("{Any? & Interface1? & Interface2?}")!>it<!><!UNSAFE_CALL!>.<!>itest1(); <!DEBUG_INFO_EXPRESSION_TYPE("{Any? & Interface1? & Interface2?}")!>it<!><!UNSAFE_CALL!>.<!>itest2() }
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.let { <!DEBUG_INFO_EXPRESSION_TYPE("{Any & Interface1 & Interface2}")!>it<!>.itest1(); <!DEBUG_INFO_EXPRESSION_TYPE("{Any & Interface1 & Interface2}")!>it<!>.itest2() }
     }
 }