Wrap failing method in try-catch block

Author: sofurihafe

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

@@ -478,7 +478,7 @@ class UtBotSymbolicEngine(
 
             emit(
                 UtFuzzedExecution(
-                    stateBefore = stateBefore,
+                    stateBefore = concreteExecutionResult.stateBefore,
                     stateAfter = concreteExecutionResult.stateAfter,
                     result = concreteExecutionResult.result,
                     coverage = concreteExecutionResult.coverage,

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

@@ -230,10 +230,13 @@ open class CgVariableConstructor(val context: CgContext) :
                 is UtStatementCallModel -> {
                     val call = createCgExecutableCallFromUtExecutableCall(statementModel)
                     val equivalentFieldAccess = replaceCgExecutableCallWithFieldAccessIfNeeded(call)
-                    if (equivalentFieldAccess != null)
-                        +equivalentFieldAccess
-                    else
-                        +call
+                    val thrownException = statementModel.thrownConcreteException
+
+                    if (equivalentFieldAccess != null) +equivalentFieldAccess
+                    else if (thrownException != null) {
+                        +tryBlock { +call }
+                            .catch(thrownException) { /* do nothing */ }
+                    } else +call
                 }
             }
         }

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

@@ -110,7 +110,7 @@ class SimpleUtExecutionInstrumentation(
                     applyPostprocessing()
                 }
             }
-        }
+        }.copy(stateBefore = parameters.stateBefore)
     }
 
     override fun getStaticField(fieldId: FieldId): Result<UtModel> =

utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/providers/Objects.kt

@@ -106,7 +106,7 @@ class ObjectValueProvider(
                         model.modificationsChain as MutableList +=
                             UtExecutableCallModel(
                                 model,
-                                md.executableId,
+                                md.executable,
                                 values.map { it.model }
                             )
                     })
@@ -212,9 +212,8 @@ internal class FieldDescription(
 
 internal class MethodDescription(
     val name: String,
-//    val returnType: FuzzedType,
     val parameterTypes: List<FuzzedType>,
-    val executableId: ExecutableId
+    val executable: ExecutableId
 )
 
 internal fun findAccessibleModifiableFields(description: FuzzedDescription?, classId: ClassId, packageName: String?): List<FieldDescription>  {
@@ -242,27 +241,28 @@ internal fun findAllPublicMethods(
     description: FuzzedDescription?,
     classId: ClassId,
     packageName: String?
-): List<MethodDescription> {
-    return classId.jClass.declaredMethods.mapNotNull { method ->
+): List<MethodDescription> =
+    classId.jClass.declaredMethods.mapNotNull { method ->
         if (isAccessible(method, packageName)) {
             val parameterTypes =
                 method
                     .parameterTypes
                     .map {
-                        if (description != null) toFuzzerType(
-                            it,
-                            description.typeCache
-                        ) else FuzzedType(method.returnType.id)
+                        if (description != null) {
+                            toFuzzerType(
+                                it,
+                                description.typeCache
+                            )
+                        } else FuzzedType(it.id)
                     }
 
             MethodDescription(
                 name = method.name,
                 parameterTypes = parameterTypes,
-                executableId = method.executableId
+                executable = method.executableId
             )
         } else null
     }
-}
 
 internal fun Class<*>.findPublicSetterGetterIfHasPublicGetter(field: Field, packageName: String?): PublicSetterGetter? {
     @Suppress("DEPRECATION") val postfixName = field.name.capitalize()