From a0071885bff6133439998f91074cd21383654ad3 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Wed, 5 Feb 2020 14:06:49 +0300
Subject: [PATCH] [NI-MIGRATE] Update type binding tests for NI

---
 .../binding/implicit/conflictingProjection.kt     |  6 +-----
 .../binding/implicit/conflictingProjection2.kt    | 10 +---------
 .../type/binding/implicit/errorWithProjection.kt  | 11 +----------
 .../type/binding/implicit/inProjection.kt         | 14 +++++---------
 compiler/testData/type/binding/implicit/list0.kt  |  2 +-
 compiler/testData/type/binding/implicit/list2.kt  | 15 +--------------
 .../type/binding/implicit/outProjection.kt        | 14 +++-----------
 7 files changed, 13 insertions(+), 59 deletions(-)

diff --git a/compiler/testData/type/binding/implicit/conflictingProjection.kt b/compiler/testData/type/binding/implicit/conflictingProjection.kt
index e4cb90f4e84..69f803554d9 100644
--- a/compiler/testData/type/binding/implicit/conflictingProjection.kt
+++ b/compiler/testData/type/binding/implicit/conflictingProjection.kt
@@ -3,9 +3,5 @@ fun <T> getT(): T = null!!
 val foo = getT<List<in Int>>()
 /*
 psi: val foo = getT<List<in Int>>()
-type: List<in Int>
-    typeParameter: <out E> defined in kotlin.collections.List
-    typeProjection: in Int
-    psi: val foo = getT<List<in Int>>()
-    type: Int
+type: [ERROR : Inconsistent type: List<in Int> (0 parameter has declared variance: out, but argument variance is in)]
 */
\ No newline at end of file
diff --git a/compiler/testData/type/binding/implicit/conflictingProjection2.kt b/compiler/testData/type/binding/implicit/conflictingProjection2.kt
index 237926519af..243efabe34e 100644
--- a/compiler/testData/type/binding/implicit/conflictingProjection2.kt
+++ b/compiler/testData/type/binding/implicit/conflictingProjection2.kt
@@ -3,13 +3,5 @@ fun <T> getT(): T = null!!
 val foo = getT<List<in List<Int>>>()
 /*
 psi: val foo = getT<List<in List<Int>>>()
-type: List<in List<Int>>
-    typeParameter: <out E> defined in kotlin.collections.List
-    typeProjection: in List<Int>
-    psi: val foo = getT<List<in List<Int>>>()
-    type: List<Int>
-        typeParameter: <out E> defined in kotlin.collections.List
-        typeProjection: Int
-        psi: val foo = getT<List<in List<Int>>>()
-        type: Int
+type: [ERROR : Inconsistent type: List<in List<Int>> (0 parameter has declared variance: out, but argument variance is in)]
 */
\ No newline at end of file
diff --git a/compiler/testData/type/binding/implicit/errorWithProjection.kt b/compiler/testData/type/binding/implicit/errorWithProjection.kt
index 0386e3f820e..c74b0105256 100644
--- a/compiler/testData/type/binding/implicit/errorWithProjection.kt
+++ b/compiler/testData/type/binding/implicit/errorWithProjection.kt
@@ -3,14 +3,5 @@ fun <T> getT(): T = null!!
 val foo = getT<List<in Int, out Int>>()
 /*
 psi: val foo = getT<List<in Int, out Int>>()
-type: [ERROR : List]<in Int, out Int>
-    typeParameter: null
-    typeProjection: in Int
-    psi: val foo = getT<List<in Int, out Int>>()
-    type: Int
-
-    typeParameter: null
-    typeProjection: out Int
-    psi: val foo = getT<List<in Int, out Int>>()
-    type: Int
+type: [ERROR : Type for getT<List<in Int, out Int>>()]
 */
\ No newline at end of file
diff --git a/compiler/testData/type/binding/implicit/inProjection.kt b/compiler/testData/type/binding/implicit/inProjection.kt
index 229b5c2176c..4341140bbc6 100644
--- a/compiler/testData/type/binding/implicit/inProjection.kt
+++ b/compiler/testData/type/binding/implicit/inProjection.kt
@@ -8,17 +8,13 @@ fun <T> getT(): T = null!!
 val foo = getT<Inv<in In<in Out<in Int>>>>()
 /*
 psi: val foo = getT<Inv<in In<in Out<in Int>>>>()
-type: Inv<in In<in Out<in Int>>>
+type: Inv<in In<[ERROR : Inconsistent type: Out<in Int> (0 parameter has declared variance: out, but argument variance is in)]>>
     typeParameter: <T> defined in Inv
-    typeProjection: in In<in Out<in Int>>
+    typeProjection: in In<[ERROR : Inconsistent type: Out<in Int> (0 parameter has declared variance: out, but argument variance is in)]>
     psi: val foo = getT<Inv<in In<in Out<in Int>>>>()
-    type: In<in Out<in Int>>
+    type: In<[ERROR : Inconsistent type: Out<in Int> (0 parameter has declared variance: out, but argument variance is in)]>
         typeParameter: <in I> defined in In
-        typeProjection: in Out<in Int>
+        typeProjection: [ERROR : Inconsistent type: Out<in Int> (0 parameter has declared variance: out, but argument variance is in)]
         psi: val foo = getT<Inv<in In<in Out<in Int>>>>()
-        type: Out<in Int>
-            typeParameter: <out O> defined in Out
-            typeProjection: in Int
-            psi: val foo = getT<Inv<in In<in Out<in Int>>>>()
-            type: Int
+        type: [ERROR : Inconsistent type: Out<in Int> (0 parameter has declared variance: out, but argument variance is in)]
 */
\ No newline at end of file
diff --git a/compiler/testData/type/binding/implicit/list0.kt b/compiler/testData/type/binding/implicit/list0.kt
index b737c67d08d..0ca9dcde8c4 100644
--- a/compiler/testData/type/binding/implicit/list0.kt
+++ b/compiler/testData/type/binding/implicit/list0.kt
@@ -3,5 +3,5 @@ fun <T> getT(): T = null!!
 val foo = getT<List>()
 /*
 psi: val foo = getT<List>()
-type: [ERROR : List]
+type: [ERROR : Type for getT<List>()]
 */
\ No newline at end of file
diff --git a/compiler/testData/type/binding/implicit/list2.kt b/compiler/testData/type/binding/implicit/list2.kt
index fb4b05fb7cf..2691c4eedb8 100644
--- a/compiler/testData/type/binding/implicit/list2.kt
+++ b/compiler/testData/type/binding/implicit/list2.kt
@@ -3,18 +3,5 @@ fun <T> getT(): T = null!!
 val foo = getT<List<String, List<Int>>>()
 /*
 psi: val foo = getT<List<String, List<Int>>>()
-type: [ERROR : List]<String, List<Int>>
-    typeParameter: null
-    typeProjection: String
-    psi: val foo = getT<List<String, List<Int>>>()
-    type: String
-
-    typeParameter: null
-    typeProjection: List<Int>
-    psi: val foo = getT<List<String, List<Int>>>()
-    type: List<Int>
-        typeParameter: <out E> defined in kotlin.collections.List
-        typeProjection: Int
-        psi: val foo = getT<List<String, List<Int>>>()
-        type: Int
+type: [ERROR : Type for getT<List<String, List<Int>>>()]
 */
\ No newline at end of file
diff --git a/compiler/testData/type/binding/implicit/outProjection.kt b/compiler/testData/type/binding/implicit/outProjection.kt
index 18150126dc5..6f90465f1a3 100644
--- a/compiler/testData/type/binding/implicit/outProjection.kt
+++ b/compiler/testData/type/binding/implicit/outProjection.kt
@@ -8,17 +8,9 @@ fun <T> getT(): T = null!!
 val foo = getT<Inv<out In<out Out<out Int>>>>()
 /*
 psi: val foo = getT<Inv<out In<out Out<out Int>>>>()
-type: Inv<out In<out Out<out Int>>>
+type: Inv<out [ERROR : Inconsistent type: In<out Out<out Int>> (0 parameter has declared variance: in, but argument variance is out)]>
     typeParameter: <T> defined in Inv
-    typeProjection: out In<out Out<out Int>>
+    typeProjection: out [ERROR : Inconsistent type: In<out Out<out Int>> (0 parameter has declared variance: in, but argument variance is out)]
     psi: val foo = getT<Inv<out In<out Out<out Int>>>>()
-    type: In<out Out<out Int>>
-        typeParameter: <in I> defined in In
-        typeProjection: out Out<out Int>
-        psi: val foo = getT<Inv<out In<out Out<out Int>>>>()
-        type: Out<out Int>
-            typeParameter: <out O> defined in Out
-            typeProjection: out Int
-            psi: val foo = getT<Inv<out In<out Out<out Int>>>>()
-            type: Int
+    type: [ERROR : Inconsistent type: In<out Out<out Int>> (0 parameter has declared variance: in, but argument variance is out)]
 */
\ No newline at end of file