Consider dynamically created mocks when pre minimizing fuzzer output …

…and properly initialize @mock fields  (#2569)

* Consider dynamically created mocks when pre minimizing fuzzer output

* Clear already initialized field models after constructing class fields

utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt

@@ -516,7 +516,7 @@ class UtBotSymbolicEngine(
                 trieNode = descr.tracer.add(coveredInstructions)
 
                 val earlierStateBeforeSize = coverageToMinStateBeforeSize[trieNode]
-                val curStateBeforeSize = stateBefore.calculateSize()
+                val curStateBeforeSize = concreteExecutionResult.stateBefore.calculateSize()
 
                 if (earlierStateBeforeSize == null || curStateBeforeSize < earlierStateBeforeSize)
                     coverageToMinStateBeforeSize[trieNode] = curStateBeforeSize

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgAbstractSpringTestClassConstructor.kt

@@ -31,6 +31,10 @@ abstract class CgAbstractSpringTestClassConstructor(context: CgContext) :
             fields += constructClassFields(testClassModel)
             clearUnwantedVariableModels()
 
+            // constructClassFields may mark fields as initialized, while they are in
+            // fact not initialized, so we clearAlreadyInitializedFieldModels()
+            variableConstructor.clearAlreadyInitializedFieldModels()
+
             constructAdditionalTestMethods()?.let { methodRegions += it }
 
             for ((testSetIndex, testSet) in testClassModel.methodTestSets.withIndex()) {

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgSpringVariableConstructor.kt

@@ -14,6 +14,10 @@ class CgSpringVariableConstructor(context: CgContext) : CgVariableConstructor(co
 
     private val fieldManagerFacade = ClassFieldManagerFacade(context)
 
+    fun clearAlreadyInitializedFieldModels() {
+        fieldManagerFacade.clearAlreadyInitializedModels()
+    }
+
     override fun getOrCreateVariable(model: UtModel, name: String?): CgValue {
         val variable = fieldManagerFacade.constructVariableForField(model)
 

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/fieldmanager/ClassFieldManagerFacade.kt

@@ -11,6 +11,10 @@ class ClassFieldManagerFacade(context: CgContext) : CgContextOwner by context {
 
     private val alreadyInitializedModels = mutableSetOf<UtModelWrapper>()
 
+    fun clearAlreadyInitializedModels() {
+        alreadyInitializedModels.clear()
+    }
+
     fun constructVariableForField(model: UtModel): CgValue? {
         relevantFieldManagers.forEach { manager ->
             val alreadyCreatedVariable = manager.findCgValueByModel(model, manager.annotatedModels)