Rework type parameters for some class ids

Earlier type parameters were hardcoded in the class name, simple name, etc. Then they were removed from names completely, but that lead to compilation errors for Kotlin, where type parameters must always be specified. So, this commit adds type parameters, but instead of writing them into names, we add them as a separate property 'typeParameters' of BuiltinClassId.

Author: ArsenHD

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

@@ -753,6 +753,7 @@ open class ClassId @JvmOverloads constructor(
  */
 class BuiltinClassId(
     name: String,
+    elementClassId: ClassId? = null,
     override val canonicalName: String,
     override val simpleName: String,
     // by default we assume that the class is not a member class
@@ -769,6 +770,7 @@ class BuiltinClassId(
     override val isInner: Boolean = false,
     override val isNested: Boolean = false,
     override val isSynthetic: Boolean = false,
+    override val typeParameters: TypeParameters = TypeParameters(),
     override val allMethods: Sequence<MethodId> = emptySequence(),
     override val allConstructors: Sequence<ConstructorId> = emptySequence(),
     override val outerClass: Class<*>? = null,
@@ -777,7 +779,7 @@ class BuiltinClassId(
             -1, 0 -> ""
             else -> canonicalName.substring(0, index)
         },
-) : ClassId(name = name, isNullable = isNullable) {
+) : ClassId(name = name, isNullable = isNullable, elementClassId = elementClassId) {
     init {
         BUILTIN_CLASSES_BY_NAMES[name] = this
     }

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt

@@ -1282,9 +1282,16 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
             }
 
             if (containsFailureExecution) {
+                val classClassId = Class::class.id
                 val expectedException = CgParameterDeclaration(
                     parameter = declareParameter(
-                        type = Class::class.id,
+                        type = BuiltinClassId(
+                            name = classClassId.name,
+                            simpleName = classClassId.simpleName,
+                            canonicalName = classClassId.canonicalName,
+                            packageName = classClassId.packageName,
+                            typeParameters = TypeParameters(listOf(Throwable::class.java.id))
+                        ),
                         name = nameGenerator.variableName(expectedErrorVarName)
                     ),
                     // exceptions are always reference type
@@ -1492,16 +1499,37 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
      */
     private val argListClassId: ClassId
         get() = when (testFramework) {
-            Junit5 -> java.util.ArrayList::class.id
-            TestNg -> BuiltinClassId(
-                name = Array<Array<Any?>?>::class.java.name,
-                simpleName = when (codegenLanguage) {
-                    CodegenLanguage.JAVA -> "Object[][]"
-                    CodegenLanguage.KOTLIN -> "Array<Array<Any?>?>"
-                },
-                canonicalName = Array<Array<Any?>?>::class.java.canonicalName,
-                packageName = Array<Array<Any?>?>::class.java.packageName,
-            )
+            Junit5 -> {
+                val arrayListId = java.util.ArrayList::class.id
+                BuiltinClassId(
+                    name = arrayListId.name,
+                    simpleName = arrayListId.simpleName,
+                    canonicalName = arrayListId.canonicalName,
+                    packageName = arrayListId.packageName,
+                    elementClassId = argumentsClassId,
+                    typeParameters = TypeParameters(listOf(argumentsClassId))
+                )
+            }
+            TestNg -> {
+                val outerArrayId = Array<Array<Any?>?>::class.id
+                val innerArrayId = BuiltinClassId(
+                    name = objectArrayClassId.name,
+                    simpleName = objectArrayClassId.simpleName,
+                    canonicalName = objectArrayClassId.canonicalName,
+                    packageName = objectArrayClassId.packageName,
+                    elementClassId = objectClassId,
+                    typeParameters = TypeParameters(listOf(objectClassId))
+                )
+
+                BuiltinClassId(
+                    name = outerArrayId.name,
+                    simpleName = outerArrayId.simpleName,
+                    canonicalName = outerArrayId.canonicalName,
+                    packageName = outerArrayId.packageName,
+                    elementClassId = innerArrayId,
+                    typeParameters = TypeParameters(listOf(innerArrayId))
+                )
+            }
             Junit4 -> error("Parameterized tests are not supported for JUnit4")
         }
 

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt

@@ -310,8 +310,7 @@ internal class CgKotlinRenderer(context: CgContext, printer: CgPrinter = CgPrint
     }
 
     override fun renderMethodSignature(element: CgParameterizedTestDataProviderMethod) {
-        val returnType =
-            if (element.returnType.simpleName == "Array<Array<Any?>?>") "Array<Array<Any?>?>" else "${element.returnType}"
+        val returnType = getKotlinClassString(element.returnType)
         println("fun ${element.name}(): $returnType")
     }
 
@@ -467,7 +466,15 @@ internal class CgKotlinRenderer(context: CgContext, printer: CgPrinter = CgPrint
                 else -> {
                     // we cannot access kClass for BuiltinClassId
                     // we cannot use simple name here because this class can be not imported
-                    if (id is BuiltinClassId) id.name else id.kClass.id.asString()
+                    val typeParameters = id.typeParameters.parameters
+                        .map { getKotlinClassString(it) }
+                        .joinToString(", ")
+                    val rawTypeName = if (id is BuiltinClassId) id.name else id.kClass.id.asString()
+                    if (typeParameters.isEmpty()) {
+                        rawTypeName
+                    } else {
+                        "$rawTypeName<$typeParameters>"
+                    }
                 }
             }
         }