DeepMapper for models is used

UnitTestBot · EgorkaKulikov · Nov 9, 2023 · Oct 28, 2023 · Oct 30, 2023 · Oct 31, 2023
commit 5935d7bf0413c852b8c987b0ee84ce8ca0fabf31
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/mapper/Utils.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/mapper/Utils.kt
@@ -5,13 +5,16 @@ import org.utbot.framework.plugin.api.UtDirectGetFieldModel
 import org.utbot.framework.plugin.api.UtDirectSetFieldModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
 import org.utbot.framework.plugin.api.UtExecution
+import org.utbot.framework.plugin.api.UtExecutionResult
+import org.utbot.framework.plugin.api.UtExecutionSuccess
 import org.utbot.framework.plugin.api.UtInstrumentation
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtNewInstanceInstrumentation
 import org.utbot.framework.plugin.api.UtReferenceModel
 import org.utbot.framework.plugin.api.UtStatementCallModel
 import org.utbot.framework.plugin.api.UtStatementModel
 import org.utbot.framework.plugin.api.UtStaticMethodInstrumentation
+import org.utbot.framework.plugin.api.isSuccess
 
 inline fun <reified T : UtModel> T.mapPreservingType(mapper: UtModelMapper): T =
     mapper.map(this, T::class.java)
@@ -54,6 +57,14 @@ fun EnvironmentModels.mapModels(mapper: UtModelMapper) = EnvironmentModels(
     executableToCall = executableToCall,
 )
 
+fun UtExecutionResult.mapModelIfExists(mapper: UtModelMapper) = if (this.isSuccess) {
+    val successResult = this as UtExecutionSuccess
+    UtExecutionSuccess(successResult.model.map(mapper))
+} else {
+    this
+}
+
+
 fun UtInstrumentation.mapModels(mapper: UtModelMapper) = when (this) {
     is UtNewInstanceInstrumentation -> copy(instances = instances.mapModels(mapper))
     is UtStaticMethodInstrumentation -> copy(values = values.mapModels(mapper))

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
@@ -30,6 +30,8 @@ import org.utbot.framework.plugin.api.UtExecutionSuccess
 import org.utbot.framework.plugin.api.UtExplicitlyThrownException
 import org.utbot.framework.plugin.api.UtImplicitlyThrownException
 import org.utbot.framework.plugin.api.UtInstrumentation
+import org.utbot.framework.plugin.api.mapper.UtModelDeepMapper
+import org.utbot.framework.plugin.api.mapper.mapStateBeforeModels
 import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.framework.plugin.api.util.utContext
 
@@ -50,16 +52,18 @@ class JcToUtExecutionConverter(
         val modelConverter = JcToUtModelConverter(instToModelCache)
 
         val coverage = convertCoverage(getTrace(jcExecution.uTestExecutionResult), jcExecution.method.enclosingType.jcClass)
-        val instrumentation = emptyList<UtInstrumentation>() // TODO usvm-sbft: fill up instrumentation with data from UTest
+        // TODO usvm-sbft: fill up instrumentation with data from UTest
+        val instrumentation = emptyList<UtInstrumentation>()
 
-        return when (val executionResult = jcExecution.uTestExecutionResult) {
+        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),
                 result = UtExecutionSuccess(modelConverter.convert(executionResult.result)),
                 coverage = coverage,
                 instrumentation = instrumentation,
             )
+
             is UTestExecutionExceptionResult -> toUserRaisedException(executionResult.cause)?.let { exception ->
                 UtUsvmExecution(
                     stateBefore = convertState(executionResult.initialState, jcExecution.method, modelConverter),
@@ -73,6 +77,7 @@ class JcToUtExecutionConverter(
                     instrumentation = instrumentation,
                 )
             }
+
             is UTestExecutionInitFailedResult -> {
                 toUserRaisedException(executionResult.cause)?.let { e ->
                     logger.warn(e) { "Execution failed before method under test call" }
@@ -91,7 +96,15 @@ class JcToUtExecutionConverter(
                 // TODO usvm-sbft
                 null
             }
-        }
+        } ?: return null
+
+        return utUsvmExecution.mapModels(UtModelDeepMapper {
+            instToModelCache[
+                toValueConverter.cache.getValue(
+                    utModelConstructor.cache.getValue(it)
+                ).origin
+            ] ?: it
+        })
         // TODO usvm-sbft: deep map UtExecution to substitute models build from UTest
     }
 

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
@@ -15,6 +15,8 @@ import org.utbot.framework.plugin.api.UtLambdaModel
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtNullModel
 import org.utbot.framework.plugin.api.UtPrimitiveModel
+import org.utbot.framework.plugin.api.mapper.UtModelDeepMapper
+import org.utbot.framework.plugin.api.mapper.map
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.objectClassId
@@ -41,27 +43,13 @@ class JcToUtModelConverter(
 
     fun convert(valueDescriptor: UTestValueDescriptor?): UtModel {
         // TODO usvm-sbft: ask why `UTestExecutionSuccessResult.result` is nullable
-        //WTF, how can it happen? but null can be passed here
         if (valueDescriptor == null) {
             return UtNullModel(objectClassId)
         }
 
         val concreteValue = toValueConverter.buildObjectFromDescriptor(valueDescriptor)
         val objectType = valueDescriptor.type.toJavaClass(classLoader).id
 
-        val missingMocksModel = utModelConstructor.construct(concreteValue, objectType)
-
-        return when (missingMocksModel) {
-            is UtNullModel,
-            is UtPrimitiveModel,
-            is UtClassRefModel,
-            is UtEnumConstantModel,
-            is UtLambdaModel -> missingMocksModel
-            is UtCompositeModel,
-            is UtArrayModel,
-            is UtAssembleModel -> instToModelCache[valueDescriptor.origin] ?: missingMocksModel
-            is UtCustomModel -> error("Custom models are not supported in Contest")
-            else -> error("The type of $missingMocksModel is not supported in Contest")
-        }
+        return utModelConstructor.construct(concreteValue, objectType)
     }
 }
diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/UtUsvmExecution.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/UtUsvmExecution.kt
@@ -42,6 +42,26 @@ class UtUsvmExecution(
         summary,
         testMethodName,
         displayName,
-        instrumentation
+        instrumentation,
+    )
+
+    fun copy(
+        stateBefore: EnvironmentModels = this.stateBefore,
+        stateAfter: EnvironmentModels = this.stateAfter,
+        result: UtExecutionResult = this.result,
+        coverage: Coverage? = this.coverage,
+        summary: List<DocStatement>? = this.summary,
+        testMethodName: String? = this.testMethodName,
+        displayName: String? = this.displayName,
+        instrumentation: List<UtInstrumentation> = this.instrumentation,
+    ) = UtUsvmExecution(
+        stateBefore,
+        stateAfter,
+        result,
+        coverage,
+        summary,
+        testMethodName,
+        displayName,
+        instrumentation,
     )
 }
diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/Utils.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/Utils.kt
@@ -0,0 +1,16 @@
+package org.utbot.contest.usvm
+
+import org.utbot.framework.plugin.api.mapper.UtModelMapper
+import org.utbot.framework.plugin.api.mapper.mapModelIfExists
+import org.utbot.framework.plugin.api.mapper.mapModels
+
+fun UtUsvmExecution.mapModels(mapper: UtModelMapper) = copy(
+    stateBefore = stateBefore.mapModels(mapper),
+    stateAfter = stateAfter.mapModels(mapper),
+    result = result.mapModelIfExists(mapper),
+    coverage = this.coverage,
+    summary = this.summary,
+    testMethodName = this.testMethodName,
+    displayName = this.displayName,
+    instrumentation = instrumentation.map { it.mapModels(mapper) },
+)