FIR: Adjust analysis test data after changes in how we load Java types

Especially, it's about types based on type parameters

analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt

@@ -0,0 +1,24 @@
+KtSuccessCallInfo:
+  call = KtSimpleFunctionCall:
+    isImplicitInvoke = false
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = null
+      signature = KtFunctionLikeSignature:
+        receiverType = null
+        returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
+        symbol = java/util/Comparator(function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>): java.util.Comparator<T>
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = function
+            receiverType = null
+            returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+            symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+        ]
+    argumentMapping = {
+      {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
+        name = function
+        receiverType = null
+        returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+        symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>)
+    }

analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt

@@ -7,18 +7,18 @@ KtSuccessCallInfo:
       signature = KtFunctionLikeSignature:
         receiverType = null
         returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
-        symbol = java/util/Comparator(function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>): java.util.Comparator<T>
+        symbol = java/util/Comparator(function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>): java.util.Comparator<T>
         valueParameters = [
           KtVariableLikeSignature:
             name = function
             receiverType = null
             returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
-            symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+            symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
         ]
     argumentMapping = {
       {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
         name = function
         receiverType = null
         returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
-        symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>)
+        symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>)
     }

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt

@@ -0,0 +1,25 @@
+KtApplicableCallCandidateInfo:
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = false
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = null
+      signature = KtFunctionLikeSignature:
+        receiverType = null
+        returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
+        symbol = java/util/Comparator(function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>): java.util.Comparator<T>
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = function
+            receiverType = null
+            returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+            symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+        ]
+    argumentMapping = {
+      {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
+        name = function
+        receiverType = null
+        returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+        symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>)
+    }
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt

@@ -7,19 +7,19 @@ KtApplicableCallCandidateInfo:
       signature = KtFunctionLikeSignature:
         receiverType = null
         returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
-        symbol = java/util/Comparator(function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>): java.util.Comparator<T>
+        symbol = java/util/Comparator(function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>): java.util.Comparator<T>
         valueParameters = [
           KtVariableLikeSignature:
             name = function
             receiverType = null
             returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
-            symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+            symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
         ]
     argumentMapping = {
       {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
         name = function
         receiverType = null
         returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
-        symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>)
+        symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>)
     }
   isInBestCandidates = true