From 7dca4d2feec3eec6ca2691989fd20d459aeaaff1 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 3 Feb 2020 13:40:16 +0300
Subject: [PATCH] [FIR TEST] Update test data for purely implements case (NB:
 broken)

In this case Java super type arguments should be not null, not flexible
---
 .../arrayList.fir.kt                          |  8 ++---
 .../customClassMutableCollection.fir.kt       |  4 +--
 .../customClassMutableList.fir.kt             |  8 ++---
 .../purelyImplementedCollection/maps.fir.kt   | 36 +++++++++----------
 .../mapsWithNullableKey.fir.kt                | 12 +++----
 .../mapsWithNullableValues.fir.kt             | 16 ++++-----
 .../purelyImplementedCollection/sets.fir.kt   | 12 +++----
 7 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.fir.kt
index a8dd30d7c19..b2f9ec43367 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.fir.kt
@@ -6,12 +6,12 @@ fun bar(): String? = null
 
 fun foo() {
     var x = ArrayList<String>()
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(null)
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(bar())
+    x.add(null)
+    x.add(bar())
     x.add("")
 
-    <!INAPPLICABLE_CANDIDATE!>x[0] = null<!>
-    <!INAPPLICABLE_CANDIDATE!>x[0] = bar()<!>
+    x[0] = null
+    x[0] = bar()
     x[0] = ""
 
     val b1: MutableList<String?> = x
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.fir.kt
index 2891074371e..5bedf9d6c26 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.fir.kt
@@ -24,8 +24,8 @@ fun bar(): String? = null
 
 fun foo() {
     var x = A<String>()
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(null)
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(bar())
+    x.add(null)
+    x.add(bar())
     x.add("")
 
     val b1: Collection<String?> = x
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.fir.kt
index c04bf55ab36..6a4b798bea1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.fir.kt
@@ -24,12 +24,12 @@ fun bar(): String? = null
 
 fun foo() {
     var x = A<String>()
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(null)
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(bar())
+    x.add(null)
+    x.add(bar())
     x.add("")
 
-    <!INAPPLICABLE_CANDIDATE!>x[0] = null<!>
-    <!INAPPLICABLE_CANDIDATE!>x[0] = bar()<!>
+    x[0] = null
+    x[0] = bar()
     x[0] = ""
 
     val b1: MutableList<String?> = x
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.fir.kt
index 3a7b4aa1b9e..26697f2a424 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.fir.kt
@@ -10,14 +10,14 @@ val nullableInt: Int? = null
 
 fun hashMapTest() {
     var x: HashMap<String, Int> = HashMap<String, Int>()
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(null, null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>("", null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(bar(), 1)
+    x.put(null, null)
+    x.put("", null)
+    x.put(bar(), 1)
     x.put("", 1)
 
-    <!INAPPLICABLE_CANDIDATE!>x[null] = 1<!>
-    <!INAPPLICABLE_CANDIDATE!>x[bar()] = 1<!>
-    <!INAPPLICABLE_CANDIDATE!>x[""] = nullableInt<!>
+    x[null] = 1
+    x[bar()] = 1
+    x[""] = nullableInt
     x[""] = 1
 
     val b1: MutableMap<String, Int?> = x
@@ -34,14 +34,14 @@ fun hashMapTest() {
 
 fun treeMapTest() {
     var x: TreeMap<String, Int> = TreeMap<String, Int>()
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(null, null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>("", null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(bar(), 1)
+    x.put(null, null)
+    x.put("", null)
+    x.put(bar(), 1)
     x.put("", 1)
 
-    <!INAPPLICABLE_CANDIDATE!>x[null] = 1<!>
-    <!INAPPLICABLE_CANDIDATE!>x[bar()] = 1<!>
-    <!INAPPLICABLE_CANDIDATE!>x[""] = nullableInt<!>
+    x[null] = 1
+    x[bar()] = 1
+    x[""] = nullableInt
     x[""] = 1
 
     val b1: MutableMap<String, Int?> = x
@@ -58,14 +58,14 @@ fun treeMapTest() {
 
 fun concurrentHashMapTest() {
     var x: ConcurrentHashMap<String, Int> = ConcurrentHashMap<String, Int>()
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(null, null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>("", null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(bar(), 1)
+    x.put(null, null)
+    x.put("", null)
+    x.put(bar(), 1)
     x.put("", 1)
 
-    <!INAPPLICABLE_CANDIDATE!>x[null] = 1<!>
-    <!INAPPLICABLE_CANDIDATE!>x[bar()] = 1<!>
-    <!INAPPLICABLE_CANDIDATE!>x[""] = nullableInt<!>
+    x[null] = 1
+    x[bar()] = 1
+    x[""] = nullableInt
     x[""] = 1
 
     val b1: MutableMap<String, Int?> = x
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt
index f39322c50c4..d139896edca 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt
@@ -9,14 +9,14 @@ val nullableInt: Int? = null
 
 fun hashMapTest() {
     var x: HashMap<String?, Int> = HashMap<String?, Int>()
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(null, null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>("", null)
+    x.put(null, null)
+    x.put("", null)
     x.put(bar(), 1)
     x.put("", 1)
 
     x[null] = 1
     x[bar()] = 1
-    <!INAPPLICABLE_CANDIDATE!>x[""] = nullableInt<!>
+    x[""] = nullableInt
     x[""] = 1
 
     val b1: MutableMap<String?, Int?> = x
@@ -34,14 +34,14 @@ fun hashMapTest() {
 
 fun treeMapTest() {
     var x: TreeMap<String?, Int> = TreeMap<String?, Int>()
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(null, null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>("", null)
+    x.put(null, null)
+    x.put("", null)
     x.put(bar(), 1)
     x.put("", 1)
 
     x[null] = 1
     x[bar()] = 1
-    <!INAPPLICABLE_CANDIDATE!>x[""] = nullableInt<!>
+    x[""] = nullableInt
     x[""] = 1
 
     val b1: MutableMap<String?, Int?> = x
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.fir.kt
index 0e8996e0df5..f06efd6038e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.fir.kt
@@ -9,13 +9,13 @@ val nullableInt: Int? = null
 
 fun hashMapTest() {
     var x: HashMap<String, Int?> = HashMap<String, Int?>()
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(null, null)
+    x.put(null, null)
     x.put("", null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(bar(), 1)
+    x.put(bar(), 1)
     x.put("", 1)
 
-    <!INAPPLICABLE_CANDIDATE!>x[null] = 1<!>
-    <!INAPPLICABLE_CANDIDATE!>x[bar()] = 1<!>
+    x[null] = 1
+    x[bar()] = 1
     x[""] = nullableInt
     x[""] = 1
 
@@ -33,13 +33,13 @@ fun hashMapTest() {
 
 fun treeMapTest() {
     var x: TreeMap<String, Int?> = TreeMap<String, Int?>()
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(null, null)
+    x.put(null, null)
     x.put("", null)
-    x.<!INAPPLICABLE_CANDIDATE!>put<!>(bar(), 1)
+    x.put(bar(), 1)
     x.put("", 1)
 
-    <!INAPPLICABLE_CANDIDATE!>x[null] = 1<!>
-    <!INAPPLICABLE_CANDIDATE!>x[bar()] = 1<!>
+    x[null] = 1
+    x[bar()] = 1
     x[""] = nullableInt
     x[""] = 1
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.fir.kt
index 8e7624771c9..b50262fefeb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.fir.kt
@@ -8,8 +8,8 @@ fun bar(): String? = null
 
 fun fooHashSet() {
     var x = HashSet<String>()
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(null)
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(bar())
+    x.add(null)
+    x.add(bar())
     x.add("")
 
     val b1: MutableSet<String?> = x
@@ -22,8 +22,8 @@ fun fooHashSet() {
 
 fun fooTreeSet() {
     var x = TreeSet<String>()
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(null)
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(bar())
+    x.add(null)
+    x.add(bar())
     x.add("")
 
     val b1: MutableSet<String?> = x
@@ -36,8 +36,8 @@ fun fooTreeSet() {
 
 fun fooLinkedHashSet() {
     var x = LinkedHashSet<String>()
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(null)
-    x.<!INAPPLICABLE_CANDIDATE!>add<!>(bar())
+    x.add(null)
+    x.add(bar())
     x.add("")
 
     val b1: MutableSet<String?> = x