Provide stateBefore for concrete execution result

Author: sofurihafe

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

@@ -735,6 +735,7 @@ sealed class UtStatementCallModel(
     override val instance: UtReferenceModel?,
     open val statement: StatementId,
     open val params: List<UtModel>,
+    var thrownConcreteException: ClassId? = null
 ): UtStatementModel(instance) {
     override fun toString() = withToStringThreadLocalReentrancyGuard {
         buildString {

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

@@ -22,6 +22,7 @@ private fun UtConcreteExecutionResult.updateWithAssembleModels(
         (result as? UtExecutionSuccess)?.model?.let { UtExecutionSuccess(toAssemble(it)) } ?: result
 
     return UtConcreteExecutionResult(
+        stateBefore,
         resolvedStateAfter,
         resolvedResult,
         coverage,

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/SimpleUtExecutionInstrumentation.kt

@@ -99,6 +99,7 @@ class SimpleUtExecutionInstrumentation(
                     }
 
                     UtConcreteExecutionResult(
+                        parameters.stateBefore,
                         stateAfter,
                         executionResult,
                         coverage,

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtExecutionInstrumentation.kt

@@ -23,6 +23,7 @@ data class UtConcreteExecutionData(
 )
 
 data class UtConcreteExecutionResult(
+    val stateBefore: EnvironmentModels,
     val stateAfter: EnvironmentModels,
     val result: UtExecutionResult,
     val coverage: Coverage,

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/constructors/InstrumentationContextAwareValueConstructor.kt

@@ -47,6 +47,7 @@ import org.utbot.instrumentation.instrumentation.execution.mock.MockController
 import org.utbot.instrumentation.process.runSandbox
 import java.lang.reflect.Modifier
 import java.util.*
+import org.utbot.framework.plugin.api.util.id
 import kotlin.reflect.KClass
 
 /**
@@ -321,7 +322,7 @@ class InstrumentationContextAwareValueConstructor(
         constructedObjects[assembleModel]?.let { return it }
 
         val instantiationExecutableCall = assembleModel.instantiationCall
-        val result = updateWithStatementCallModel(instantiationExecutableCall)
+        val result = updateWithStatementCallModel(instantiationExecutableCall).getOrThrow()
 
         // Executions that get `null` in a complicated way (e.g. like this: `new Pair(null, null).getFirst()`)
         // are only produced by fuzzer and are considered undesirable because fuzzer can also produce simpler
@@ -381,26 +382,34 @@ class InstrumentationContextAwareValueConstructor(
      *
      * @return the result of [callModel] invocation
      */
-    private fun updateWithStatementCallModel(callModel: UtStatementCallModel): Any? {
-        when (callModel) {
-            is UtExecutableCallModel -> {
-                val executable = callModel.executable
-                val instanceValue = callModel.instance?.let { value(it) }
-                val params = callModel.params.map { value(it) }
-
-                return when (executable) {
-                    is MethodId -> executable.call(params, instanceValue)
-                    is ConstructorId -> executable.call(params)
+    private fun updateWithStatementCallModel(callModel: UtStatementCallModel): Result<*> =
+        runCatching {
+            when (callModel) {
+                is UtExecutableCallModel -> {
+                    val executable = callModel.executable
+                    val instanceValue = callModel.instance?.let { value(it) }
+                    val params = callModel.params.map { value(it) }
+
+                    when (executable) {
+                        is MethodId -> executable.call(params, instanceValue)
+                        is ConstructorId -> executable.call(params)
+                    }
                 }
-            }
-            is UtDirectGetFieldModel -> {
-                val fieldAccess = callModel.fieldAccess
-                val instanceValue = value(callModel.instance)
 
-                return fieldAccess.get(instanceValue)
+                is UtDirectGetFieldModel -> {
+                    val fieldAccess = callModel.fieldAccess
+                    val instanceValue = value(callModel.instance)
+
+                    fieldAccess.get(instanceValue)
+                }
             }
         }
-    }
+            .also { result ->
+                result
+                    .exceptionOrNull()
+                    ?.let { callModel.thrownConcreteException = it.javaClass.id }
+            }
+
 
     /**
      * Updates instance with [UtDirectSetFieldModel] execution.

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/phases/InvocationPhase.kt

@@ -18,7 +18,7 @@ class InvocationPhase(
     override fun wrapError(e: Throwable): ExecutionPhaseException {
         val message = this.javaClass.simpleName
         return when(e) {
-            is TimeoutException ->  ExecutionPhaseStop(message, UtConcreteExecutionResult(MissingState, UtTimeoutException(e), Coverage()))
+            is TimeoutException ->  ExecutionPhaseStop(message, UtConcreteExecutionResult(MissingState, MissingState, UtTimeoutException(e), Coverage()))
             else -> ExecutionPhaseError(message, e)
         }
     }

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/phases/ModelConstructionPhase.kt

@@ -25,7 +25,7 @@ class ModelConstructionPhase(
         return when (e) {
             is TimeoutException -> ExecutionPhaseStop(
                 message,
-                UtConcreteExecutionResult(MissingState, UtTimeoutException(e), Coverage())
+                UtConcreteExecutionResult(MissingState, MissingState, UtTimeoutException(e), Coverage())
             )
 
             else -> ExecutionPhaseError(message, e)

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/phases/PhasesController.kt

@@ -43,6 +43,7 @@ class PhasesController(
         } catch (e: ExecutionPhaseError) {
             if (e.cause.cause is AccessControlException) {
                 return UtConcreteExecutionResult(
+                    MissingState,
                     MissingState,
                     UtSandboxFailure(e.cause.cause!!),
                     Coverage()

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/phases/StatisticsCollectionPhase.kt

@@ -22,7 +22,7 @@ class StatisticsCollectionPhase(
         return when (e) {
             is TimeoutException -> ExecutionPhaseStop(
                 message,
-                UtConcreteExecutionResult(MissingState, UtTimeoutException(e), Coverage())
+                UtConcreteExecutionResult(MissingState, MissingState, UtTimeoutException(e), Coverage())
             )
 
             else -> ExecutionPhaseError(message, e)

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/phases/ValueConstructionPhase.kt

@@ -27,6 +27,7 @@ class ValueConstructionPhase(
     override fun wrapError(e: Throwable): ExecutionPhaseException = ExecutionPhaseStop(
         phase = this.javaClass.simpleName,
         result = UtConcreteExecutionResult(
+            stateBefore = MissingState,
             stateAfter = MissingState,
             result = when(e) {
                 is TimeoutException -> UtTimeoutException(e)