Only mocks accessible from thisInstance require per-class variable

Author: EgorkaKulikov

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

@@ -10,7 +10,6 @@ import org.utbot.framework.plugin.api.UtCompositeModel
 import org.utbot.framework.plugin.api.UtDirectSetFieldModel
 import org.utbot.framework.plugin.api.UtEnumConstantModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
-import org.utbot.framework.plugin.api.UtExecutionSuccess
 import org.utbot.framework.plugin.api.UtLambdaModel
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtNullModel
@@ -37,35 +36,21 @@ class SpringTestClassModelBuilder: TestClassModelBuilder() {
         testSets: List<CgMethodTestSet>,
     ): Pair<Map<ClassId, Set<UtModel>>, Map<ClassId, Set<UtModel>>> {
         val thisInstances = mutableSetOf<UtModel>()
-        val allModelsInExecution = mutableListOf<UtModel>()
+        val thisInstancesDependentModels = mutableSetOf<UtModel>()
 
         for (testSet in testSets) {
             for (execution in testSet.executions) {
-                execution.stateBefore.thisInstance?.let {
-                    allModelsInExecution += it
-                    thisInstances += it
-                }
-
-                execution.stateAfter.thisInstance?.let {
-                    allModelsInExecution += it
-                    thisInstances += it
-                }
-
-                allModelsInExecution += execution.stateBefore.parameters
-                allModelsInExecution += execution.stateAfter.parameters
-
-                (execution.result as? UtExecutionSuccess)?.model?.let { allModelsInExecution += it }
+                execution.stateBefore.thisInstance?.let { thisInstances += it }
+                execution.stateAfter.thisInstance?.let { thisInstances += it }
             }
         }
 
-        val allConstructedModels = mutableSetOf<UtModel>()
-        allModelsInExecution.forEach { model -> collectRecursively(model, allConstructedModels) }
+        thisInstances.forEach { model -> collectRecursively(model, thisInstancesDependentModels) }
 
-        val mockedModels =
-            allConstructedModels
-                .filterTo(mutableSetOf()) { it.isMockModel() && it !in thisInstances }
+        val dependentMockModels =
+            thisInstancesDependentModels.filterTo(mutableSetOf()) { it.isMockModel() && it !in thisInstances }
 
-        return thisInstances.groupByClassId() to mockedModels.groupByClassId()
+        return thisInstances.groupByClassId() to dependentMockModels.groupByClassId()
     }
 
     private fun Set<UtModel>.groupByClassId(): Map<ClassId, Set<UtModel>> {