Apply review fixes

Author: EgorkaKulikov

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

@@ -56,16 +56,13 @@ class JcToUtExecutionConverter(
     private val toValueConverter = Descriptor2ValueConverter(utContext.classLoader)
 
     private var jcToUtModelConverter: JcToUtModelConverter
-    private var instrumentation: List<UtInstrumentation>
+    private var uTestProcessResult: UTestAnalysisResult
 
     init {
-        val instToModelConverter = UTestInstToUtModelConverter(idGenerator, jcClasspath, utilMethodProvider)
-
-        instToModelConverter.processUTest(jcExecution.uTest).also {
-            instrumentation = instToModelConverter.findInstrumentations()
-        }
-
+        val instToModelConverter = UTestInstToUtModelConverter(jcExecution.uTest, jcClasspath, idGenerator, utilMethodProvider)
         jcToUtModelConverter = JcToUtModelConverter(idGenerator, jcClasspath, instToModelConverter)
+
+        uTestProcessResult = instToModelConverter.processUTest()
     }
 
     fun convert(): UtExecution? {
@@ -80,7 +77,7 @@ class JcToUtExecutionConverter(
                     jcToUtModelConverter.convert(it, EnvironmentStateKind.FINAL)
                 } ?: UtVoidModel),
                 coverage = coverage,
-                instrumentation = instrumentation,
+                instrumentation = uTestProcessResult.instrumentation,
             )
             is UTestExecutionExceptionResult -> {
                 UtUsvmExecution(
@@ -91,7 +88,7 @@ class JcToUtExecutionConverter(
                         jcExecution.method,
                     ),
                     coverage = coverage,
-                    instrumentation = instrumentation,
+                    instrumentation = uTestProcessResult.instrumentation,
                 )
             }
 

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

@@ -34,7 +34,6 @@ import org.usvm.instrumentation.testcase.api.UTestShortExpression
 import org.usvm.instrumentation.testcase.api.UTestStaticMethodCall
 import org.usvm.instrumentation.testcase.api.UTestStringExpression
 import org.utbot.framework.codegen.domain.builtin.UtilMethodProvider
-import org.utbot.framework.plugin.api.ConstructorId
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.MethodId
@@ -54,19 +53,19 @@ import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.fuzzer.IdGenerator
 
 class UTestInstToUtModelConverter(
-    private val idGenerator: IdGenerator<Int>,
+    private val uTest: UTest,
     private val jcClasspath: JcClasspath,
+    private val idGenerator: IdGenerator<Int>,
     private val utilMethodProvider: UtilMethodProvider,
 ) {
     private val exprToModelCache = mutableMapOf<UTestExpression, UtModel>()
     private val instrumentations = mutableListOf<UtInstrumentation>()
 
-    fun processUTest(uTest: UTest) {
-        exprToModelCache.clear()
-        instrumentations.clear()
-
+    fun processUTest(): UTestAnalysisResult {
         uTest.initStatements.forEach { uInst -> processInst(uInst) }
         removeInstantiationCallFromThisInstanceModificationChain(processExpr(uTest.callMethodExpression))
+
+        return UTestAnalysisResult(instrumentations)
     }
 
     fun findModelByInst(expr: UTestExpression): UtModel {
@@ -75,8 +74,6 @@ class UTestInstToUtModelConverter(
         return alreadyCreatedModel
     }
 
-    fun findInstrumentations(): List<UtInstrumentation> = instrumentations
-
     private fun removeInstantiationCallFromThisInstanceModificationChain(model: UtModel) {
         if (model is UtAssembleModel) {
             val instantiationCall = model.instantiationCall
@@ -307,11 +304,11 @@ class UTestInstToUtModelConverter(
             }
 
             is UTestGlobalMock -> {
-                // Daniil said that we can miss [type] and [fields] when converting to [UtInstrumentation]
                 val methodsToExprs = uTestExpr.methods.entries
+                val initMethodExprs = methodsToExprs.filter { it.key.isConstructor }
+                val otherMethodsExprs = methodsToExprs.minus(initMethodExprs.toSet())
 
-                methodsToExprs
-                    .filter { it.key is MethodId }
+                otherMethodsExprs
                     .forEach { (jcMethod, uTestExprs) ->
                         val methodId = jcMethod.toExecutableId(jcClasspath) as MethodId
                         val valueModels = uTestExprs.map { expr -> processExpr(expr) }
@@ -323,15 +320,15 @@ class UTestInstToUtModelConverter(
                         instrumentations += methodInstrumentation
                     }
 
-                methodsToExprs
-                    .filter { it.key is ConstructorId }
+                initMethodExprs
                     .forEach { (jcMethod, uTestExprs) ->
                         val valueModels = uTestExprs.map { expr -> processExpr(expr) }
                         val methodInstrumentation = UtNewInstanceInstrumentation(
-                            // TODO usvm-sbft looking at [Traverser] ln 1682, this classId does not seem correct
                             classId = jcMethod.enclosingClass.classId,
                             instances = valueModels,
-                            callSites = setOf(jcMethod.enclosingClass.classId),
+                            // [UTestGlobalMock] does not have an equivalent of [callSites],
+                            // but it is used only in UtBot instrumentation. We use USVM one, so it is not a problem.
+                            callSites = emptySet(),
                             )
 
                         instrumentations += methodInstrumentation
@@ -355,4 +352,8 @@ class UTestInstToUtModelConverter(
             is UTestArrayLengthExpression -> error("This expression type is not supported")
         }
     }
-}
+}
+
+data class UTestAnalysisResult(
+    val instrumentation: List<UtInstrumentation>,
+)