From 0e21ac8ed2907edd85e31f2400fa34d22060fb9f Mon Sep 17 00:00:00 2001
From: "simon.ogorodnik" <simon.ogorodnik@jetbrains.com>
Date: Tue, 7 Apr 2020 00:49:03 +0300
Subject: [PATCH] [FIR] Apply BAD testData changes after type parameters
 support

---
 .../callableReference/adaptedReferences/inlineDefault.kt  | 1 +
 .../tests/generics/innerClasses/innerTP.fir.kt            | 6 +++---
 .../tests/generics/innerClasses/qualifiedOuter.fir.kt     | 2 +-
 .../diagnostics/tests/generics/innerClasses/simple.fir.kt | 6 +++---
 .../tests/generics/innerClasses/simpleIn.fir.fail         | 2 --
 .../tests/generics/innerClasses/simpleIn.fir.kt           | 8 ++++----
 .../typealias/typeAliasConstructorCrazyProjections.fir.kt | 4 ++--
 .../typealias/typeAliasConstructorForProjection.fir.kt    | 6 +++---
 8 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.fir.fail

diff --git a/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt
index c9c2d198a1a..8e21a8de238 100644
--- a/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt
+++ b/compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt
@@ -1,3 +1,4 @@
+// IGNORE_BACKEND_FIR: JVM_IR
 // !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
index 0246b13ea9f..1d6143f5f48 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
@@ -34,9 +34,9 @@ fun main() {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<CharSequence>.Inner<CharSequence>>(outer.bar())
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<CharSequence>.Inner<CharSequence>>(outer.Inner())
 
-    outer.set(outer.bar())
-    outer.set(outer.Inner())
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.bar())
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.Inner())
 
     val x: Outer<String>.Inner<String> = factoryString()
-    outer.set(x)
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(x)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
index e365762a123..890f42ddd21 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
@@ -9,7 +9,7 @@ class Outer<T> {
         x.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Inner>() }
         x.checkType { _<Outer<String>.Inner>() }
         z.checkType { _<Inner>() }
-        z.checkType { _<Outer<T>.Inner>() }
+        z.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<T>.Inner>() }
 
         inner = x
     }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/simple.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/simple.fir.kt
index 50641cc1111..5376811625e 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/simple.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/simple.fir.kt
@@ -28,9 +28,9 @@ fun main() {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<CharSequence>.Inner>(outer.bar())
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<CharSequence>.Inner>(outer.Inner())
 
-    outer.set(outer.bar())
-    outer.set(outer.Inner())
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.bar())
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.Inner())
 
     val x: Outer<String>.Inner = factoryString()
-    outer.set(x)
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(x)
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.fir.fail b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.fir.fail
deleted file mode 100644
index 4f77a424ff8..00000000000
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.fir.fail
+++ /dev/null
@@ -1,2 +0,0 @@
-Failures detected in FirBodyResolveTransformerAdapter, file: /simpleIn.fir.kt
-Cause: java.lang.RuntimeException: While resolving call R|<local>/outer|.set#(R?C|/infer|<R|kotlin/Any|>(String()))
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.fir.kt
index e0180d525c0..641be62ce66 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.fir.kt
@@ -28,13 +28,13 @@ fun main() {
     checkSubtype<Outer<String>.Inner>(outer.bar())
     checkSubtype<Outer<String>.Inner>(outer.Inner())
 
-    outer.set(outer.bar())
-    outer.set(outer.Inner())
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.bar())
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.Inner())
 
     val x: Outer<String>.Inner = factoryString()
-    outer.set(x)
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(x)
     val y: Outer<CharSequence>.Inner = infer<CharSequence>("")
-    outer.set(y)
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(y)
 
     outer.set(infer<Any>(""))
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
index ef5ecb51b5b..a62fe72bb32 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
@@ -11,6 +11,6 @@ fun <T> listOf(): List<T> = null!!
 // Unresolved reference is ok here:
 // we can't create a substituted signature for type alias constructor
 // since it has 'out' type projection in 'in' position.
-val test1 = <!UNRESOLVED_REFERENCE!>BOutIn<!>(listOf(), null!!)
+val test1 = BOutIn(listOf(), null!!)
 
-val test2 = <!UNRESOLVED_REFERENCE!>BInIn<!>(listOf(), null!!)
\ No newline at end of file
+val test2 = BInIn(listOf(), null!!)
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
index b708007b8f7..5c6582cd83e 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
@@ -8,8 +8,8 @@ typealias CIn = C<in Int>
 typealias COut = C<out Int>
 typealias CT<T> = C<T>
 
-val test1 = <!UNRESOLVED_REFERENCE!>CStar<!>()
-val test2 = <!UNRESOLVED_REFERENCE!>CIn<!>()
-val test3 = <!UNRESOLVED_REFERENCE!>COut<!>()
+val test1 = CStar()
+val test2 = CIn()
+val test3 = COut()
 val test4 = CT<*>()
 val test5 = CT<CT<*>>()
\ No newline at end of file