Supporting arrays classId in Contests (#2680)

* Try to get classId from arrays with JacoDb

* Fix a bug

* Add primitive arrays to a list

Author: EgorkaKulikov

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/ContestUsvm.kt

@@ -221,6 +221,7 @@ fun runUsvmGeneration(
                         try {
                             JcToUtExecutionConverter(
                                 jcExecution = it,
+                                jcClasspath = jcDbContainer.cp,
                                 idGenerator = idGenerator,
                                 instructionIdProvider = instructionIdProvider,
                                 utilMethodProvider = codeGenerator.context.utilMethodProvider

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/ConverterUtils.kt

@@ -2,10 +2,12 @@ package org.utbot.contest.usvm
 
 import org.jacodb.analysis.library.analyzers.thisInstance
 import org.jacodb.api.JcClassOrInterface
+import org.jacodb.api.JcClasspath
 import org.jacodb.api.JcField
 import org.jacodb.api.JcMethod
 import org.jacodb.api.JcType
 import org.jacodb.api.TypeName
+import org.jacodb.api.ext.findClassOrNull
 import org.usvm.instrumentation.testcase.api.UTestInst
 import org.usvm.instrumentation.testcase.descriptor.UTestObjectDescriptor
 import org.usvm.instrumentation.testcase.descriptor.UTestValueDescriptor
@@ -21,15 +23,17 @@ import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.framework.plugin.api.util.utContext
 
-fun JcMethod.toExecutableId(): ExecutableId {
+fun JcMethod.toExecutableId(classpath: JcClasspath): ExecutableId {
     val type = this.thisInstance.type.classId
-    val parameters = this.parameters.map { it.type.classId }
+    val parameters = this.parameters.map { it.type.findClassId(classpath) }
 
     if (isConstructor) {
         return ConstructorId(type, parameters)
     }
 
-    return MethodId(type, this.name, this.returnType.classId, parameters)
+    val returnClassId = this.returnType.findClassId(classpath)
+
+    return MethodId(type, this.name, returnClassId, parameters)
 }
 
 val JcType?.classId: ClassId
@@ -39,9 +43,9 @@ val JcType?.classId: ClassId
 val JcClassOrInterface.classId: ClassId
     get() = this.toJavaClass(utContext.classLoader).id
 
-//TODO usvm-sbft: incorrectly converts types of com.google.common.util.concurrent.AtomicDoubleArray.<init> parameters
-val TypeName.classId: ClassId
-    get() = ClassId(this.typeName)
+fun TypeName.findClassId(classpath: JcClasspath): ClassId =
+    classpath.findTypeOrNull(this.typeName)?.classId
+        ?: error("Can not construct classId for $this")
 
 val JcField.fieldId: FieldId
     get() = toJavaField(utContext.classLoader)!!.fieldId

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtExecutionConverter.kt

@@ -2,6 +2,7 @@ package org.utbot.contest.usvm
 
 import mu.KotlinLogging
 import org.jacodb.api.JcClassOrInterface
+import org.jacodb.api.JcClasspath
 import org.jacodb.api.JcTypedMethod
 import org.jacodb.api.cfg.JcInst
 import org.jacodb.api.ext.jcdbSignature
@@ -36,6 +37,7 @@ private val logger = KotlinLogging.logger {}
 
 class JcToUtExecutionConverter(
     private val jcExecution: JcExecution,
+    private val jcClasspath: JcClasspath,
     private val idGenerator: IdGenerator<Int>,
     private val instructionIdProvider: InstructionIdProvider,
     utilMethodProvider: UtilMethodProvider,
@@ -45,10 +47,10 @@ class JcToUtExecutionConverter(
     private var jcToUtModelConverter: JcToUtModelConverter
 
     init {
-        val instToModelConverter = UTestInst2UtModelConverter(idGenerator, utilMethodProvider)
+        val instToModelConverter = UTestInst2UtModelConverter(idGenerator, jcClasspath, utilMethodProvider)
 
         instToModelConverter.processUTest(jcExecution.uTest)
-        jcToUtModelConverter = JcToUtModelConverter(idGenerator, instToModelConverter)
+        jcToUtModelConverter = JcToUtModelConverter(idGenerator, jcClasspath, instToModelConverter)
     }
 
     fun convert(): UtExecution? {
@@ -129,7 +131,7 @@ class JcToUtExecutionConverter(
             .associate { (jcField, uTestDescr) ->
                 jcField.fieldId to modelConverter.convert(uTestDescr)
             }
-        val executableId: ExecutableId = method.method.toExecutableId()
+        val executableId: ExecutableId = method.method.toExecutableId(jcClasspath)
         return EnvironmentModels(thisInstance, parameters, statics, executableId)
     }
 

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtModelConverter.kt

@@ -1,5 +1,6 @@
 package org.utbot.contest.usvm
 
+import org.jacodb.api.JcClasspath
 import org.usvm.instrumentation.testcase.api.UTestExpression
 import org.usvm.instrumentation.testcase.descriptor.UTestArrayDescriptor
 import org.usvm.instrumentation.testcase.descriptor.UTestClassDescriptor
@@ -27,6 +28,7 @@ import java.lang.Throwable
 
 class JcToUtModelConverter(
     private val idGenerator: IdGenerator<Int>,
+    private val jcClasspath: JcClasspath,
     private val instToUtModelConverter: UTestInst2UtModelConverter,
 ) {
     private val descriptorToModelCache = mutableMapOf<UTestValueDescriptor, UtModel>()
@@ -57,7 +59,7 @@ class JcToUtModelConverter(
                 fields += valueDescriptor.fields
                     .entries
                     .associate { (jcField, fieldDescr) ->
-                        val fieldId = FieldId(jcField.type.classId, jcField.name)
+                        val fieldId = FieldId(jcField.type.findClassId(jcClasspath), jcField.name)
                         val fieldModel = convert(fieldDescr)
                         fieldId to fieldModel
                     }

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/UTestInst2UtModelConverter.kt

@@ -1,5 +1,6 @@
 package org.utbot.contest.usvm
 
+import org.jacodb.api.JcClasspath
 import org.usvm.instrumentation.testcase.UTest
 import org.usvm.instrumentation.testcase.api.UTestAllocateMemoryCall
 import org.usvm.instrumentation.testcase.api.UTestArithmeticExpression
@@ -50,6 +51,7 @@ import org.utbot.fuzzer.IdGenerator
 
 class UTestInst2UtModelConverter(
     private val idGenerator: IdGenerator<Int>,
+    private val jcClasspath: JcClasspath,
     private val utilMethodProvider: UtilMethodProvider,
 ) {
     private val exprToModelCache = mutableMapOf<UTestExpression, UtModel>()
@@ -101,7 +103,7 @@ class UTestInst2UtModelConverter(
                 val instanceModel = processExpr(instanceExpr)
                 require(instanceModel is UtAssembleModel)
 
-                val fieldType = uTestInst.field.type.classId
+                val fieldType = uTestInst.field.type.findClassId(jcClasspath)
                 val fieldName = uTestInst.field.name
                 val setValueModel = processExpr(uTestInst.value)
 
@@ -147,7 +149,7 @@ class UTestInst2UtModelConverter(
             is UTestConstructorCall -> {
                 val constructorCall = UtExecutableCallModel(
                     instance = null,
-                    executable = uTestExpr.method.toExecutableId(),
+                    executable = uTestExpr.method.toExecutableId(jcClasspath),
                     params = uTestExpr.args.map { arg ->
                         processExpr(arg)
                     },
@@ -167,7 +169,7 @@ class UTestInst2UtModelConverter(
 
                 val methodCall = UtExecutableCallModel(
                     instance = instanceModel,
-                    executable = uTestExpr.method.toExecutableId(),
+                    executable = uTestExpr.method.toExecutableId(jcClasspath),
                     params = uTestExpr.args.map { arg -> processExpr(arg) },
                 )
 
@@ -188,7 +190,7 @@ class UTestInst2UtModelConverter(
                     modelName = "",
                     instantiationCall = UtExecutableCallModel(
                         instance = null,
-                        executable = uTestExpr.method.toExecutableId(),
+                        executable = uTestExpr.method.toExecutableId(jcClasspath),
                         params = uTestExpr.args.map { arg -> processExpr(arg) },
                     ),
                 )
@@ -234,7 +236,7 @@ class UTestInst2UtModelConverter(
                     executable = utilMethodProvider.getFieldValueMethodId,
                     params = listOf(
                         instanceModel,
-                        UtPrimitiveModel(uTestExpr.field.type.classId.name),
+                        UtPrimitiveModel(uTestExpr.field.type),
                         UtPrimitiveModel(uTestExpr.field.name),
                     ),
                 )
@@ -252,7 +254,7 @@ class UTestInst2UtModelConverter(
                     instance = null,
                     executable = utilMethodProvider.getStaticFieldValueMethodId,
                     params = listOf(
-                        UtPrimitiveModel(uTestExpr.field.type.classId.name),
+                        UtPrimitiveModel(uTestExpr.field.type),
                         UtPrimitiveModel(uTestExpr.field.name),
                     ),
                 )
@@ -287,7 +289,7 @@ class UTestInst2UtModelConverter(
                 mocks += uTestExpr.methods
                     .entries
                     .associate { (jcMethod, uTestExprs) ->
-                        val executableId: ExecutableId = jcMethod.toExecutableId()
+                        val executableId: ExecutableId = jcMethod.toExecutableId(jcClasspath)
                         val models = uTestExprs.map { expr ->
                             processExpr(expr)
                         }

utbot-junit-contest/src/main/resources/classes/samples/list

@@ -19,5 +19,6 @@ org.utbot.examples.wrappers.DoubleWrapper
 org.utbot.examples.wrappers.CharacterWrapper
 org.utbot.examples.wrappers.ByteWrapper
 org.utbot.examples.wrappers.BooleanWrapper
+org.utbot.examples.arrays.PrimitiveArrays