Fix: ValueConstructor and MockValueConstructor

Author: sergeypospelov

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

@@ -62,14 +62,12 @@ class ValueConstructor {
 
     // TODO: JIRA:1379 -- replace UtReferenceModel with Int
     private val constructedObjects = HashMap<UtReferenceModel, Any?>()
-    private val resultsCache = HashMap<UtReferenceModel, Any>()
     private val mockInfo = mutableListOf<MockInfo>()
     private var mockTarget: MockTarget? = null
     private var mockCounter = 0
 
     private fun clearState() {
         constructedObjects.clear()
-        resultsCache.clear()
         mockInfo.clear()
         mockTarget = null
         mockCounter = 0
@@ -337,7 +335,7 @@ class ValueConstructor {
             }
         }
 
-        return resultsCache[assembleModel]
+        return constructedObjects[assembleModel]
             ?: error("Can't assemble model: $assembleModel")
     }
 
@@ -375,7 +373,7 @@ class ValueConstructor {
         assembleModel: UtAssembleModel,
     ) {
         val executable = callModel.executable
-        val instanceValue = resultsCache[callModel.instance]
+        val instanceValue = callModel.instance?.let { value(it) }
         val params = callModel.params.map { value(it) }
 
         val result = when (executable) {
@@ -386,7 +384,6 @@ class ValueConstructor {
         // Ignore result if returnId is null. Otherwise add it to instance cache.
         callModel.returnValue?.let {
             checkNotNull(result) { "Tracked instance can't be null for call $executable in model $assembleModel" }
-            resultsCache[it] = result
 
             //If statement is final instantiating, add result to constructed objects cache
             if (callModel == assembleModel.finalInstantiationModel) {
@@ -400,7 +397,7 @@ class ValueConstructor {
      */
     private fun updateWithDirectSetFieldModel(directSetterModel: UtDirectSetFieldModel) {
         val instanceModel = directSetterModel.instance
-        val instance = resultsCache[instanceModel] ?: error("Model $instanceModel is not instantiated")
+        val instance = constructedObjects[instanceModel] ?: error("Model $instanceModel is not instantiated")
 
         val instanceClassId = instanceModel.classId
         val fieldModel = directSetterModel.fieldModel

utbot-framework/src/main/kotlin/org/utbot/framework/assemble/AssembleModelGenerator.kt

@@ -2,7 +2,6 @@ package org.utbot.framework.assemble
 
 import org.utbot.common.isPrivate
 import org.utbot.common.isPublic
-import org.utbot.common.packageName
 import org.utbot.engine.ResolvedExecution
 import org.utbot.engine.ResolvedModels
 import org.utbot.framework.UtSettings

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MockValueConstructor.kt

@@ -79,7 +79,6 @@ class MockValueConstructor(
 
     // TODO: JIRA:1379 -- replace UtReferenceModel with Int
     private val constructedObjects = HashMap<UtReferenceModel, Any>()
-    private val resultsCache = HashMap<UtReferenceModel, Any>()
     private val mockInfo = mutableListOf<MockInfo>()
     private var mockTarget: MockTarget? = null
     private var mockCounter = 0
@@ -366,7 +365,7 @@ class MockValueConstructor(
             }
         }
 
-        return resultsCache[assembleModel] ?: error("Can't assemble model: $assembleModel")
+        return constructedObjects[assembleModel] ?: error("Can't assemble model: $assembleModel")
     }
 
     private fun constructFromLambdaModel(lambdaModel: UtLambdaModel): Any {
@@ -406,7 +405,7 @@ class MockValueConstructor(
         assembleModel: UtAssembleModel,
     ) {
         val executable = callModel.executable
-        val instanceValue = resultsCache[callModel.instance]
+        val instanceValue = callModel.instance?.let { value(it) }
         val params = callModel.params.map { value(it) }
 
         val result = when (executable) {
@@ -417,7 +416,6 @@ class MockValueConstructor(
         // Ignore result if returnId is null. Otherwise add it to instance cache.
         callModel.returnValue?.let {
             checkNotNull(result) { "Tracked instance can't be null for call $executable in model $assembleModel" }
-            resultsCache[it] = result
 
             //If statement is final instantiating, add result to constructed objects cache
             if (callModel == assembleModel.finalInstantiationModel) {
@@ -431,7 +429,7 @@ class MockValueConstructor(
      */
     private fun updateWithDirectSetFieldModel(directSetterModel: UtDirectSetFieldModel) {
         val instanceModel = directSetterModel.instance
-        val instance = resultsCache[instanceModel] ?: error("Model $instanceModel is not instantiated")
+        val instance = value(instanceModel)
 
         val instanceClassId = instanceModel.classId
         val fieldModel = directSetterModel.fieldModel

utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/DateConstantModelProvider.kt

@@ -142,7 +142,6 @@ class DateConstantModelProvider(
             "$dateFormatParse#" + id.hex(),
             instantiationChain
         ).apply {
-            instantiationChain += simpleDateFormatModel.allStatementsChain
             instantiationChain += UtExecutableCallModel(
                 simpleDateFormatModel, dateFormatParse, listOf(UtPrimitiveModel(dateString)), returnValue = this
             )