Remove expected error from CgContext

Author: EgorkaKulikov

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/context/CgContext.kt

@@ -171,9 +171,6 @@ internal interface CgContextOwner {
     // a variable representing an actual result of the method under test call
     var actual: CgVariable
 
-    //a variable representing an expected error in parametrized tests
-    var expectedErrorVariable: CgVariable
-
     // a variable representing if test method contains reflective call or not
     // and should we catch exceptions like InvocationTargetException or not so on
     var containsReflectiveCall: Boolean
@@ -432,7 +429,6 @@ internal data class CgContext(
 ) : CgContextOwner {
     override lateinit var statesCache: EnvironmentFieldStateCache
     override lateinit var actual: CgVariable
-    override lateinit var expectedErrorVariable: CgVariable
 
     override val currentTestClass: ClassId by lazy {
         val packagePrefix = if (testClassPackageName.isNotEmpty()) "$testClassPackageName." else ""

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt

@@ -1223,20 +1223,22 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                         }
 
                         if (containsFailureExecution(testSet)) {
+                            val expectedErrorVariable = currentMethodParameters[CgParameterKind.ExpectedException]
+                                ?: error("Test set $testSet contains failure execution, but test method signature has no error parameter")
                             currentTryBlock =
                                 if (containsReflectiveCall) {
-                                currentTryBlock.catch(InvocationTargetException::class.java.id) { exception ->
-                                    testFrameworkManager.assertBoolean(
-                                        CgIsInstance(expectedErrorVariable, exception[getTargetException]())
-                                    )
-                                }
-                            } else {
-                                currentTryBlock.catch(Throwable::class.java.id) { throwable ->
-                                    testFrameworkManager.assertBoolean(
-                                        CgIsInstance(expectedErrorVariable, throwable)
-                                    )
+                                    currentTryBlock.catch(InvocationTargetException::class.java.id) { exception ->
+                                        testFrameworkManager.assertBoolean(
+                                            CgIsInstance(expectedErrorVariable, exception[getTargetException]())
+                                        )
+                                    }
+                                } else {
+                                    currentTryBlock.catch(Throwable::class.java.id) { throwable ->
+                                        testFrameworkManager.assertBoolean(
+                                            CgIsInstance(expectedErrorVariable, throwable)
+                                        )
+                                    }
                                 }
-                            }
                         }
 
                         if (statics.isNotEmpty()) {
@@ -1333,19 +1335,20 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
             val containsFailureExecution = containsFailureExecution(testSet)
             if (containsFailureExecution) {
                 val classClassId = Class::class.id
-                expectedErrorVariable = declareParameter(
-                    type = BuiltinClassId(
-                        name = classClassId.name,
-                        simpleName = classClassId.simpleName,
-                        canonicalName = classClassId.canonicalName,
-                        packageName = classClassId.packageName,
-                        typeParameters = TypeParameters(listOf(Throwable::class.java.id))
+                val expectedException = CgParameterDeclaration(
+                    parameter = declareParameter(
+                        type = BuiltinClassId(
+                            name = classClassId.name,
+                            simpleName = classClassId.simpleName,
+                            canonicalName = classClassId.canonicalName,
+                            packageName = classClassId.packageName,
+                            typeParameters = TypeParameters(listOf(Throwable::class.java.id))
+                        ),
+                        name = nameGenerator.variableName(expectedErrorVarName)
                     ),
-                    name = nameGenerator.variableName(expectedErrorVarName)
+                    // exceptions are always reference type
+                    isReferenceType = true,
                 )
-
-                // exceptions are always reference type
-                val expectedException = CgParameterDeclaration(parameter = expectedErrorVariable, isReferenceType = true)
                 this += expectedException
                 currentMethodParameters[CgParameterKind.ExpectedException] = expectedException.parameter
             }