From a2e2545e3f1346576736d8fe8d2da33f3c2e0026 Mon Sep 17 00:00:00 2001
From: pyos <pyos@google.com>
Date: Mon, 30 Aug 2021 10:27:15 +0200
Subject: [PATCH] FIR: update loadJava tests

---
 .../typeQualifierDefault/OverridingDefaultQualifier.fir.txt   | 4 ++--
 .../compiledJava/annotations/ClassObjectArrayInParam.fir.txt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
index 0487ac00836..d49cc5ab9eb 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
@@ -28,11 +28,11 @@
     @R|FieldsAreNullable|() public open inner class C : R|kotlin/Any| {
         public open field field: R|kotlin/String?|
 
-        public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+        public open fun foo(x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|@EnhancedNullability kotlin/String|
 
         @R|NullableApi|() public open fun foobar(x: R|kotlin/String?|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String?|
 
-        public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
+        public open fun bar(): R|@EnhancedNullability kotlin/String|
 
         @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
index a8f23ba89dc..5f30432753f 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
@@ -5,7 +5,7 @@ public open class ClassObjectArrayInParam : R|kotlin/Any| {
         public constructor(vararg value: R|kotlin/Array<kotlin/reflect/KClass<*>>|): R|test/ClassObjectArrayInParam.Anno|
 
     }
-    @R|test/ClassObjectArrayInParam.Anno|(<implicitArrayOf>(<getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam, test/ClassObjectArrayInParam?>|)), <getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam.Nested, test/ClassObjectArrayInParam.Nested?>|)), <getClass>(<getClass>(R|ft<kotlin/String, kotlin/String?>|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ERROR CLASS: Unexpected JavaType: JavaArrayTypeImpl: PsiType:String[][]|)), <getClass>(<getClass>(R|ERROR CLASS: Unexpected JavaType: JavaArrayTypeImpl: PsiType:int[][]|)), <getClass>(<getClass>(R|kotlin/Unit|)))) public open class Nested : R|kotlin/Any| {
+    @R|test/ClassObjectArrayInParam.Anno|(<implicitArrayOf>(<getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam, test/ClassObjectArrayInParam?>|)), <getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam.Nested, test/ClassObjectArrayInParam.Nested?>|)), <getClass>(<getClass>(R|ft<kotlin/String, kotlin/String?>|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/IntArray, kotlin/IntArray?>>, kotlin/Array<out ft<kotlin/IntArray, kotlin/IntArray?>>?>|)), <getClass>(<getClass>(R|kotlin/Unit|)))) public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/ClassObjectArrayInParam.Nested|
 
     }