Update tests

Author: Mr3zee

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/AbstractBoxTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package kotlinx.rpc.codegen.test.runners
@@ -36,7 +36,7 @@ open class AbstractBoxTest : BaseTestRunner(), RunnerWithTargetBackendForTestGen
     override val targetBackend: TargetBackend
         get() = TargetBackend.JVM_IR
 
-    override fun TestConfigurationBuilder.configuration() {
+    override fun configure(builder: TestConfigurationBuilder) = with(builder) {
         configureFirParser(FirParser.LightTree)
 
         defaultDirectives {

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/AbstractDiagnosticTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package kotlinx.rpc.codegen.test.runners
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathP
 import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
 
 abstract class AbstractDiagnosticTest : BaseTestRunner() {
-    override fun TestConfigurationBuilder.configuration() {
+    override fun configure(builder: TestConfigurationBuilder) = with(builder) {
         commonFirWithPluginFrontendConfiguration()
         configureFirParser(FirParser.LightTree)
     }

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/BaseTestRunner.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package kotlinx.rpc.codegen.test.runners
@@ -8,11 +8,11 @@ import kotlinx.rpc.codegen.test.services.ExtensionRegistrarConfigurator
 import kotlinx.rpc.codegen.test.services.RpcCompileClasspathProvider
 import kotlinx.rpc.codegen.test.services.RpcRuntimeClasspathProvider
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.configuration.baseFirDiagnosticTestConfiguration
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
 import org.jetbrains.kotlin.test.initIdeaConfiguration
 import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
-import org.jetbrains.kotlin.test.runners.baseFirDiagnosticTestConfiguration
 import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
 import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
 import org.junit.jupiter.api.BeforeAll

tests/compiler-plugin-tests/src/testData/box/customParameterTypes.fir.ir.txt

@@ -287,7 +287,7 @@ FILE fqName:<root> fileName:/fields.kt
         CONSTRUCTOR visibility:private <> () returnType:<root>.BoxService.$rpcServiceStub.Companion [primary]
           BLOCK_BODY
             DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-            INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[kotlinx.rpc.codegen.FirRpcServiceStubCompanionObject] OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlinx.rpc.descriptor.RpcServiceDescriptor<<root>.BoxService>]'
+            INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[kotlinx.rpc.codegen.FirRpcServiceStubCompanionObject] OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlinx.rpc.descriptor.RpcServiceDescriptor<<root>.BoxService>]' type=kotlin.Unit
         FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
           overridden:
             public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlinx.rpc.descriptor.RpcServiceDescriptor
@@ -345,7 +345,7 @@ FILE fqName:<root> fileName:/fields.kt
         VALUE_PARAMETER name:__rpc_client index:1 type:kotlinx.rpc.RpcClient
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[kotlinx.rpc.codegen.RpcGeneratedStubKey] CLASS name:$rpcServiceStub modality:FINAL visibility:public superTypes:[<root>.BoxService]'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[kotlinx.rpc.codegen.RpcGeneratedStubKey] CLASS name:$rpcServiceStub modality:FINAL visibility:public superTypes:[<root>.BoxService]' type=kotlin.Unit
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.BoxService
@@ -417,7 +417,7 @@ FILE fqName:<root> fileName:/fields.kt
                                   $receiver: CALL 'public abstract fun <get-plainFlow> (): kotlinx.coroutines.flow.Flow<kotlin.String> declared in <root>.BoxService' type=kotlinx.coroutines.flow.Flow<kotlin.String> origin=GET_PROPERTY
                                     $this: CALL 'public final fun withService <T> (): T of kotlinx.rpc.withService declared in kotlinx.rpc' type=<root>.BoxService origin=null
                                       <T>: <root>.BoxService
-                                      $receiver: GET_OBJECT 'CLASS OBJECT name:TestRpcClient modality:FINAL visibility:public superTypes:[kotlinx.rpc.RpcClient]' type=kotlinx.rpc.codegen.test.TestRpcClient
+                                      $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:TestRpcClient modality:FINAL visibility:public superTypes:[kotlinx.rpc.RpcClient]' type=kotlinx.rpc.codegen.test.TestRpcClient
                               VAR name:sharedFlow type:kotlin.collections.List<kotlin.String> [val]
                                 CALL 'public final fun toList <T> (destination: kotlin.collections.MutableList<T of kotlinx.coroutines.flow.toList>): kotlin.collections.List<T of kotlinx.coroutines.flow.toList> declared in kotlinx.coroutines.flow' type=kotlin.collections.List<kotlin.String> origin=null
                                   <T>: kotlin.String
@@ -426,14 +426,14 @@ FILE fqName:<root> fileName:/fields.kt
                                     $receiver: CALL 'public abstract fun <get-sharedFlow> (): kotlinx.coroutines.flow.SharedFlow<kotlin.String> declared in <root>.BoxService' type=kotlinx.coroutines.flow.SharedFlow<kotlin.String> origin=GET_PROPERTY
                                       $this: CALL 'public final fun withService <T> (): T of kotlinx.rpc.withService declared in kotlinx.rpc' type=<root>.BoxService origin=null
                                         <T>: <root>.BoxService
-                                        $receiver: GET_OBJECT 'CLASS OBJECT name:TestRpcClient modality:FINAL visibility:public superTypes:[kotlinx.rpc.RpcClient]' type=kotlinx.rpc.codegen.test.TestRpcClient
+                                        $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:TestRpcClient modality:FINAL visibility:public superTypes:[kotlinx.rpc.RpcClient]' type=kotlinx.rpc.codegen.test.TestRpcClient
                                     count: CONST Int type=kotlin.Int value=1
                               VAR name:stateFlow type:kotlin.String [val]
                                 CALL 'public abstract fun <get-value> (): T of kotlinx.coroutines.flow.StateFlow declared in kotlinx.coroutines.flow.StateFlow' type=kotlin.String origin=GET_PROPERTY
                                   $this: CALL 'public abstract fun <get-stateFlow> (): kotlinx.coroutines.flow.StateFlow<kotlin.String> declared in <root>.BoxService' type=kotlinx.coroutines.flow.StateFlow<kotlin.String> origin=GET_PROPERTY
                                     $this: CALL 'public final fun withService <T> (): T of kotlinx.rpc.withService declared in kotlinx.rpc' type=<root>.BoxService origin=null
                                       <T>: <root>.BoxService
-                                      $receiver: GET_OBJECT 'CLASS OBJECT name:TestRpcClient modality:FINAL visibility:public superTypes:[kotlinx.rpc.RpcClient]' type=kotlinx.rpc.codegen.test.TestRpcClient
+                                      $receiver: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:TestRpcClient modality:FINAL visibility:public superTypes:[kotlinx.rpc.RpcClient]' type=kotlinx.rpc.codegen.test.TestRpcClient
                               VAR name:failures type:kotlin.collections.MutableList<kotlin.String> [val]
                                 CALL 'public final fun mutableListOf <T> (): kotlin.collections.MutableList<T of kotlin.collections.mutableListOf> declared in kotlin.collections' type=kotlin.collections.MutableList<kotlin.String> origin=null
                                   <T>: kotlin.String
@@ -459,13 +459,13 @@ FILE fqName:<root> fileName:/fields.kt
                                     BLOCK type=kotlin.Boolean origin=null
                                       CALL 'public abstract fun add (element: E of kotlin.collections.MutableList): kotlin.Boolean declared in kotlin.collections.MutableList' type=kotlin.Boolean origin=null
                                         $this: GET_VAR 'val failures: kotlin.collections.MutableList<kotlin.String> declared in <root>.box.<anonymous>.<anonymous>' type=kotlin.collections.MutableList<kotlin.String> origin=null
-                                        element: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUS
-                                          $this: STRING_CONCATENATION type=kotlin.String
+                                        element: STRING_CONCATENATION type=kotlin.String
+                                          STRING_CONCATENATION type=kotlin.String
                                             CONST String type=kotlin.String value="plainFlow.size = "
                                             CALL 'public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.List' type=kotlin.Int origin=GET_PROPERTY
                                               $this: GET_VAR 'val plainFlow: kotlin.collections.List<kotlin.String> declared in <root>.box.<anonymous>.<anonymous>' type=kotlin.collections.List<kotlin.String> origin=null
                                             CONST String type=kotlin.String value=" (expected 1), "
-                                          other: STRING_CONCATENATION type=kotlin.String
+                                          STRING_CONCATENATION type=kotlin.String
                                             CONST String type=kotlin.String value="plainFlow[0] = \""
                                             CALL 'public final fun getOrNull <T> (index: kotlin.Int): T of kotlin.collections.getOrNull? declared in kotlin.collections' type=kotlin.String? origin=null
                                               <T>: kotlin.String
@@ -494,13 +494,13 @@ FILE fqName:<root> fileName:/fields.kt
                                     BLOCK type=kotlin.Boolean origin=null
                                       CALL 'public abstract fun add (element: E of kotlin.collections.MutableList): kotlin.Boolean declared in kotlin.collections.MutableList' type=kotlin.Boolean origin=null
                                         $this: GET_VAR 'val failures: kotlin.collections.MutableList<kotlin.String> declared in <root>.box.<anonymous>.<anonymous>' type=kotlin.collections.MutableList<kotlin.String> origin=null
-                                        element: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUS
-                                          $this: STRING_CONCATENATION type=kotlin.String
+                                        element: STRING_CONCATENATION type=kotlin.String
+                                          STRING_CONCATENATION type=kotlin.String
                                             CONST String type=kotlin.String value="sharedFlow.size = "
                                             CALL 'public abstract fun <get-size> (): kotlin.Int declared in kotlin.collections.List' type=kotlin.Int origin=GET_PROPERTY
                                               $this: GET_VAR 'val sharedFlow: kotlin.collections.List<kotlin.String> declared in <root>.box.<anonymous>.<anonymous>' type=kotlin.collections.List<kotlin.String> origin=null
                                             CONST String type=kotlin.String value=" (expected 1), "
-                                          other: STRING_CONCATENATION type=kotlin.String
+                                          STRING_CONCATENATION type=kotlin.String
                                             CONST String type=kotlin.String value="sharedFlow[0] = \""
                                             CALL 'public final fun getOrNull <T> (index: kotlin.Int): T of kotlin.collections.getOrNull? declared in kotlin.collections' type=kotlin.String? origin=null
                                               <T>: kotlin.String

tests/compiler-plugin-tests/src/testData/box/fields.fir.ir.txt

@@ -25,13 +25,13 @@ FILE: fields.kt
                 lval failures: R|kotlin/collections/MutableList<kotlin/String>| = R|kotlin/collections/mutableListOf|<R|kotlin/String|>()
                 when () {
                     !=(R|<local>/plainFlow|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|, Int(1)) || !=(R|<local>/plainFlow|.R|SubstitutionOverride<kotlin/collections/List.get: R|kotlin/String|>|(Int(0)), String(registerPlainFlowField_42)) ->  {
-                        R|<local>/failures|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(<strcat>(String(plainFlow.size = ), R|<local>/plainFlow|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|, String( (expected 1), )).R|kotlin/String.plus|(<strcat>(String(plainFlow[0] = ), String("), R|<local>/plainFlow|.R|kotlin/collections/getOrNull|<R|kotlin/String|>(Int(0)), String("), String( (expected ), String("), String(registerPlainFlowField_42), String("), String()))))
+                        R|<local>/failures|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(<strcat>(<strcat>(String(plainFlow.size = ), R|<local>/plainFlow|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|, String( (expected 1), )), <strcat>(String(plainFlow[0] = ), String("), R|<local>/plainFlow|.R|kotlin/collections/getOrNull|<R|kotlin/String|>(Int(0)), String("), String( (expected ), String("), String(registerPlainFlowField_42), String("), String()))))
                     }
                 }
 
                 when () {
                     !=(R|<local>/sharedFlow|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|, Int(1)) || !=(R|<local>/sharedFlow|.R|SubstitutionOverride<kotlin/collections/List.get: R|kotlin/String|>|(Int(0)), String(registerSharedFlowField_42)) ->  {
-                        R|<local>/failures|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(<strcat>(String(sharedFlow.size = ), R|<local>/sharedFlow|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|, String( (expected 1), )).R|kotlin/String.plus|(<strcat>(String(sharedFlow[0] = ), String("), R|<local>/sharedFlow|.R|kotlin/collections/getOrNull|<R|kotlin/String|>(Int(0)), String("), String( (expected ), String("), String(registerSharedFlowField_42), String("), String()))))
+                        R|<local>/failures|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(<strcat>(<strcat>(String(sharedFlow.size = ), R|<local>/sharedFlow|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|, String( (expected 1), )), <strcat>(String(sharedFlow[0] = ), String("), R|<local>/sharedFlow|.R|kotlin/collections/getOrNull|<R|kotlin/String|>(Int(0)), String("), String( (expected ), String("), String(registerSharedFlowField_42), String("), String()))))
                     }
                 }