From 6e6be7c9534051a65264a1c4a147da3fe7749a07 Mon Sep 17 00:00:00 2001
From: "Denis.Zharkov" <denis.zharkov@jetbrains.com>
Date: Tue, 7 Sep 2021 13:13:21 +0300
Subject: [PATCH] FIR: Adjust test data

Currently, we've got two places where NO_COMPANION_OBJECT is reported
and they perform it kind of differently
---
 .../resolve/expresssions/classifierAccessFromCompanion.fir.txt  | 2 +-
 compiler/testData/diagnostics/tests/ResolveToJava.fir.kt        | 2 +-
 compiler/testData/diagnostics/tests/objects/kt5527.fir.kt       | 2 +-
 .../diagnostics/testsWithStdLib/inference/kt1558.fir.kt         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.fir.txt
index 44a42109dee..96ce52c79eb 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.fir.txt
@@ -23,7 +23,7 @@ FILE: classifierAccessFromCompanion.kt
                 super<R|kotlin/Any|>()
             }
 
-            public final val f: R|kotlin/Unit| = R|kotlin/Unit|
+            public final val f: R|kotlin/Unit| = Q|Factory.Function|
                 public get(): R|kotlin/Unit|
 
             public final val x: R|Factory.Function.Default| = Q|Factory.Function.Default|
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt b/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
index bdaf6a08449..20c9a9e4cbf 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
@@ -29,7 +29,7 @@ fun test(l : java.util.List<Int>) {
   checkSubtype<Set<Int>?>(Collections.singleton<Int>(1))
   Collections.singleton<Int>(<!ARGUMENT_TYPE_MISMATCH!>1.0<!>)
 
-  <!NO_COMPANION_OBJECT!>List<!><Int>
+  <!NO_COMPANION_OBJECT!>List<Int><!>
 
 
   val o = "sdf" as Object
diff --git a/compiler/testData/diagnostics/tests/objects/kt5527.fir.kt b/compiler/testData/diagnostics/tests/objects/kt5527.fir.kt
index 87e02797099..e0730b2dce0 100644
--- a/compiler/testData/diagnostics/tests/objects/kt5527.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt5527.fir.kt
@@ -9,7 +9,7 @@ fun foo() {
     val i1: Int = <!INITIALIZER_TYPE_MISMATCH!>Boo<!>
     val i2: Int = <!INITIALIZER_TYPE_MISMATCH!>A.Boo<!>
     useInt(<!ARGUMENT_TYPE_MISMATCH!>Boo<!>)
-    useInt(A.<!ARGUMENT_TYPE_MISMATCH!>Boo<!>)
+    useInt(<!ARGUMENT_TYPE_MISMATCH!>A.Boo<!>)
 }
 fun bar() {
     val i1: Int = <!INITIALIZER_TYPE_MISMATCH!>Unit<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
index b9c0dab49af..bd473f38329 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
@@ -10,7 +10,7 @@ fun <T : Any> T?.sure() : T = this!!
 fun <E> List<*>.toArray(ar: Array<E>): Array<E> = ar
 
 fun testArrays(ci: List<Int?>, cii: List<Int?>?) {
-    val c1: Array<Int?> = cii.sure().toArray(<!ARGUMENT_TYPE_MISMATCH, NO_COMPANION_OBJECT!>Array<!><Int?>)
+    val c1: Array<Int?> = cii.sure().toArray(<!ARGUMENT_TYPE_MISMATCH, NO_COMPANION_OBJECT!>Array<Int?><!>)
 
     val c2: Array<Int?> = ci.toArray(Array<Int?>(<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>)<!>)