Add UtCustomModel (i.e. common parent of all framework specific models)

Author: IlyaMuravjov

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

@@ -727,7 +727,17 @@ class UtLambdaModel(
     }
 }
 
-object UtSpringContextModel : UtReferenceModel(
+/**
+ * Common parent of all framework-specific models (e.g. Spring-specific models)
+ */
+abstract class UtCustomModel(
+    val origin: UtCompositeModel? = null,
+    id: Int?,
+    classId: ClassId,
+    modelName: String = id.toString()
+) : UtReferenceModel(id, classId, modelName)
+
+object UtSpringContextModel : UtCustomModel(
     id = null,
     classId = SpringModelUtils.applicationContextClassId,
     modelName = "applicationContext"
@@ -746,15 +756,18 @@ data class SpringRepositoryId(
 )
 
 class UtSpringMockMvcResultActionsModel(
+    id: Int?,
     val status: Int,
     val errorMessage: String?,
     val contentAsString: String,
     val viewName: String?,
     // model for mvcResult.modelAndView?.model
     val model: UtModel?
     // TODO add headers and other data
-) : UtModel(
-    classId = SpringModelUtils.resultActionsClassId
+) : UtCustomModel(
+    classId = SpringModelUtils.resultActionsClassId,
+    id = id,
+    modelName = "mockMvcResultActions@$id"
 )
 
 /**

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/models/builders/SpringTestClassModelBuilder.kt

@@ -10,13 +10,13 @@ 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.UtCustomModel
 import org.utbot.framework.plugin.api.UtDirectSetFieldModel
 import org.utbot.framework.plugin.api.UtEnumConstantModel
 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.UtSpringContextModel
 import org.utbot.framework.plugin.api.UtStatementCallModel
 import org.utbot.framework.plugin.api.UtVoidModel
 import org.utbot.framework.plugin.api.isMockModel
@@ -109,8 +109,8 @@ class SpringTestClassModelBuilder(val context: CgContext): TestClassModelBuilder
             is UtPrimitiveModel,
             is UtClassRefModel,
             is UtVoidModel,
-            is UtEnumConstantModel,
-            is UtSpringContextModel -> {}
+            is UtEnumConstantModel -> {}
+            is UtCustomModel -> currentModel.origin?.let { collectRecursively(it, allModels) }
             is UtLambdaModel -> {
                 currentModel.capturedValues.forEach { collectRecursively(it, allModels) }
             }

utbot-framework/src/main/kotlin/org/utbot/framework/fields/ExecutionStateAnalyzer.kt

@@ -10,14 +10,14 @@ 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.UtCustomModel
 import org.utbot.framework.plugin.api.UtEnumConstantModel
 import org.utbot.framework.plugin.api.UtExecution
 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.UtReferenceModel
-import org.utbot.framework.plugin.api.UtSpringContextModel
 import org.utbot.framework.plugin.api.UtSymbolicExecution
 import org.utbot.framework.plugin.api.UtVoidModel
 import org.utbot.framework.util.UtModelVisitor
@@ -238,7 +238,7 @@ private class FieldStateVisitor : UtModelVisitor<FieldData>() {
         recordFieldState(data, element)
     }
 
-    override fun visit(element: UtSpringContextModel, data: FieldData) {
+    override fun visit(element: UtCustomModel, data: FieldData) {
         recordFieldState(data, element)
     }
 

utbot-framework/src/main/kotlin/org/utbot/framework/util/UtModelVisitor.kt

@@ -4,13 +4,13 @@ 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.UtCustomModel
 import org.utbot.framework.plugin.api.UtEnumConstantModel
 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.UtReferenceModel
-import org.utbot.framework.plugin.api.UtSpringContextModel
 import org.utbot.framework.plugin.api.UtVoidModel
 import java.util.Collections
 import java.util.IdentityHashMap
@@ -36,7 +36,7 @@ abstract class UtModelVisitor<D> {
             is UtAssembleModel -> visit(element, data)
             is UtCompositeModel -> visit(element, data)
             is UtLambdaModel -> visit(element, data)
-            is UtSpringContextModel -> visit(element, data)
+            is UtCustomModel -> visit(element, data)
         }
     }
 
@@ -46,7 +46,7 @@ abstract class UtModelVisitor<D> {
     protected abstract fun visit(element: UtAssembleModel, data: D)
     protected abstract fun visit(element: UtCompositeModel, data: D)
     protected abstract fun visit(element: UtLambdaModel, data: D)
-    protected abstract fun visit(element: UtSpringContextModel, data: D)
+    protected abstract fun visit(element: UtCustomModel, data: D)
 
     /**
      * Returns true when we can traverse the given model.

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/spring/UtMockMvcResultActionsModelConstructor.kt

@@ -29,6 +29,7 @@ class UtMockMvcResultActionsModelConstructor : UtCustomModelConstructor {
         val modelAndView = mvcResultGetModelAndViewMethodId.method.invoke(mvcResult)
 
         return UtSpringMockMvcResultActionsModel(
+            id = id,
             status = responseGetStatusMethodId.method.invoke(response) as Int,
             errorMessage = responseGetErrorMessageMethodId.method.invoke(response) as String?,
             contentAsString = responseGetContentAsStringMethodId.method.invoke(response) as String,