Make it working correct on IntExamples.max

UnitTestBot · EgorkaKulikov · Nov 9, 2023 · Oct 28, 2023 · Oct 30, 2023 · Oct 31, 2023
commit a31d6b1ce6c0dbb3a9a59854fc08dfb4df8cd010
diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtExecutionConverter.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtExecutionConverter.kt
@@ -42,13 +42,13 @@ class JcToUtExecutionConverter(
 ) {
     private val toValueConverter = Descriptor2ValueConverter(utContext.classLoader)
 
-    private var modelConverter: JcToUtModelConverter
+    private var jcToUtModelConverter: JcToUtModelConverter
 
     init {
         val instToModelConverter = UTestInst2UtModelConverter(idGenerator, utilMethodProvider)
-        val uTestProcessResult = instToModelConverter.processUTest(jcExecution.uTest)
 
-        modelConverter = JcToUtModelConverter(idGenerator, uTestProcessResult)
+        instToModelConverter.processUTest(jcExecution.uTest)
+        jcToUtModelConverter = JcToUtModelConverter(idGenerator, instToModelConverter)
     }
 
     fun convert(): UtExecution? {
@@ -58,17 +58,17 @@ class JcToUtExecutionConverter(
 
         val utUsvmExecution: UtUsvmExecution = when (val executionResult = jcExecution.uTestExecutionResult) {
             is UTestExecutionSuccessResult -> UtUsvmExecution(
-                stateBefore = convertState(executionResult.initialState, jcExecution.method, modelConverter),
-                stateAfter = convertState(executionResult.resultState, jcExecution.method, modelConverter),
+                stateBefore = convertState(executionResult.initialState, jcExecution.method, jcToUtModelConverter),
+                stateAfter = convertState(executionResult.resultState, jcExecution.method, jcToUtModelConverter),
                 // TODO usvm-sbft: ask why `UTestExecutionSuccessResult.result` is nullable
-                result = UtExecutionSuccess(executionResult.result?.let { modelConverter.convert(it) } ?: UtVoidModel),
+                result = UtExecutionSuccess(executionResult.result?.let { jcToUtModelConverter.convert(it) } ?: UtVoidModel),
                 coverage = coverage,
                 instrumentation = instrumentation,
             )
             is UTestExecutionExceptionResult -> {
                 UtUsvmExecution(
-                    stateBefore = convertState(executionResult.initialState, jcExecution.method, modelConverter),
-                    stateAfter = convertState(executionResult.resultState, jcExecution.method, modelConverter),
+                    stateBefore = convertState(executionResult.initialState, jcExecution.method, jcToUtModelConverter),
+                    stateAfter = convertState(executionResult.resultState, jcExecution.method, jcToUtModelConverter),
                     result = createExecutionFailureResult(
                         executionResult.cause,
                         jcExecution.method,

diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtModelConverter.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtModelConverter.kt
@@ -12,11 +12,9 @@ import org.usvm.instrumentation.testcase.descriptor.UTestRefDescriptor
 import org.usvm.instrumentation.testcase.descriptor.UTestValueDescriptor
 import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.UtArrayModel
-import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtClassRefModel
 import org.utbot.framework.plugin.api.UtCompositeModel
 import org.utbot.framework.plugin.api.UtEnumConstantModel
-import org.utbot.framework.plugin.api.UtExecutableCallModel
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtNullModel
 import org.utbot.framework.plugin.api.UtPrimitiveModel
@@ -28,29 +26,14 @@ import org.utbot.fuzzer.IdGenerator
 
 class JcToUtModelConverter(
     private val idGenerator: IdGenerator<Int>,
-    uTestProcessResult: UTestProcessResult,
+    private val instToUtModelConverter: UTestInst2UtModelConverter,
 ) {
     private val descriptorToModelCache = mutableMapOf<UTestValueDescriptor, UtModel>()
     private val refIdToDescriptorCache = mutableMapOf<Int, UTestValueDescriptor>()
 
-    private val exprToModelCache = uTestProcessResult.exprToModelCache
-    private val instantiationCallToAssembleModelCache = uTestProcessResult.instantiationCallToAssembleModelCache
-
     fun convert(valueDescriptor: UTestValueDescriptor): UtModel = descriptorToModelCache.getOrPut(valueDescriptor) {
-        valueDescriptor.origin?.let {
-            val alreadyCreatedModel = exprToModelCache.getValue(it as UTestExpression)
-
-            if (alreadyCreatedModel is UtAssembleModel ) {
-                val instantiationCall = alreadyCreatedModel.instantiationCall
-                if (instantiationCall is UtExecutableCallModel)  {
-                    val instantiatedWithCallModel = instantiationCallToAssembleModelCache.getValue(instantiationCall)
-                    val modificationsChain = (instantiatedWithCallModel.modificationsChain as MutableList)
-
-                    modificationsChain.remove(alreadyCreatedModel.instantiationCall)
-                }
-            }
-
-            return alreadyCreatedModel
+        valueDescriptor.origin?.let { originExpr ->
+            return instToUtModelConverter.findModelByInst(originExpr as UTestExpression)
         }
 
         if (valueDescriptor is UTestRefDescriptor)

diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/UTestInst2UtModelConverter.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/UTestInst2UtModelConverter.kt
@@ -48,28 +48,37 @@ import org.utbot.framework.plugin.api.util.classClassId
 import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.fuzzer.IdGenerator
 
-data class UTestProcessResult(
-    val exprToModelCache: Map<UTestExpression, UtModel>,
-    val instantiationCallToAssembleModelCache: Map<UtExecutableCallModel, UtAssembleModel>,
-    val instrumentations: List<UtInstrumentation>,
-    )
-
 class UTestInst2UtModelConverter(
     private val idGenerator: IdGenerator<Int>,
     private val utilMethodProvider: UtilMethodProvider,
 ) {
     private val exprToModelCache = mutableMapOf<UTestExpression, UtModel>()
-    private val instantiationCallToAssembleModelCache = mutableMapOf<UtExecutableCallModel, UtAssembleModel>()
     private val instrumentations = mutableListOf<UtInstrumentation>()
 
-    fun processUTest(uTest: UTest): UTestProcessResult {
+    fun processUTest(uTest: UTest) {
         exprToModelCache.clear()
         instrumentations.clear()
 
         uTest.initStatements.forEach { uInst -> processInst(uInst) }
-        processInst(uTest.callMethodExpression)
+        removeInstantiationCallFromThisInstanceModificationChain(processExpr(uTest.callMethodExpression))
+    }
 
-        return UTestProcessResult(exprToModelCache, instantiationCallToAssembleModelCache, instrumentations)
+    fun findModelByInst(expr: UTestExpression): UtModel {
+        val alreadyCreatedModel = exprToModelCache.getValue(expr)
+        removeInstantiationCallFromThisInstanceModificationChain(alreadyCreatedModel)
+        return alreadyCreatedModel
+    }
+
+    private fun removeInstantiationCallFromThisInstanceModificationChain(model: UtModel) {
+        if (model is UtAssembleModel) {
+            val instantiationCall = model.instantiationCall
+            if (instantiationCall is UtExecutableCallModel) {
+                val instanceModel = instantiationCall.instance as? UtAssembleModel
+                instanceModel?.let {
+                    (it.modificationsChain as MutableList).remove(instantiationCall)
+                }
+            }
+        }
     }
 
     private fun processInst(uTestInst: UTestInst) {
@@ -136,8 +145,6 @@ class UTestInst2UtModelConverter(
                     instantiationCall = createInstanceCall,
                 )
 
-                instantiationCallToAssembleModelCache[createInstanceCall] = newModel
-
                 newModel
             }
 
@@ -157,8 +164,6 @@ class UTestInst2UtModelConverter(
                     instantiationCall = constructorCall,
                 )
 
-                instantiationCallToAssembleModelCache[constructorCall] = newModel
-
                 newModel
             }
 
@@ -183,8 +188,6 @@ class UTestInst2UtModelConverter(
                     instantiationCall = methodCall,
                 )
 
-                instantiationCallToAssembleModelCache[methodCall] = newModel
-
                 newModel
             }
 
@@ -240,8 +243,6 @@ class UTestInst2UtModelConverter(
                     instantiationCall = getFieldCall,
                 )
 
-                instantiationCallToAssembleModelCache[getFieldCall] = newModel
-
                 newModel
             }
 
@@ -262,8 +263,6 @@ class UTestInst2UtModelConverter(
                     instantiationCall = getStaticFieldCall,
                 )
 
-                instantiationCallToAssembleModelCache[getStaticFieldCall] = newModel
-
                 newModel
             }