Fixed rebase errors

Author: Damtev

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

@@ -1244,12 +1244,6 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                     ) {
                         thisInstance[executable](*methodArguments.toTypedArray())
                     }
-
-                    // We need to clear scope of created variables
-                    // because after invocation of MUT some expressions could be changed.
-                    // For example, fields of object that were null could be assigned to some new objects
-                    // and previously created variables do not reflect these changes.
-                    createdFromExpressionVariables.clear()
                 }
                 else -> {} // TODO: check this specific case
             }

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

@@ -4,6 +4,7 @@ import org.utbot.common.appendHtmlLine
 import org.utbot.framework.codegen.model.constructor.CgMethodTestSet
 import org.utbot.framework.codegen.model.tree.CgTestMethod
 import org.utbot.framework.codegen.model.tree.CgTestMethodType
+import org.utbot.framework.codegen.model.tree.CgTestMethodType.*
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.util.kClass
 import kotlin.reflect.KClass
@@ -57,11 +58,11 @@ data class TestsGenerationReport(
 
             testMethods.forEach {
                 when (it.type) {
-                    CgTestMethodType.SUCCESSFUL -> updateExecutions(it, successfulExecutions)
-                    CgTestMethodType.FAILING -> updateExecutions(it, failedExecutions)
-                    CgTestMethodType.TIMEOUT -> updateExecutions(it, timeoutExecutions)
-                    CgTestMethodType.CRASH -> updateExecutions(it, crashExecutions)
-                    CgTestMethodType.PARAMETRIZED -> {
+                    SUCCESSFUL, PASSED_EXCEPTION -> updateExecutions(it, successfulExecutions)
+                    FAILING -> updateExecutions(it, failedExecutions)
+                    TIMEOUT -> updateExecutions(it, timeoutExecutions)
+                    CRASH -> updateExecutions(it, crashExecutions)
+                    PARAMETRIZED -> {
                         // Parametrized tests are not supported in the tests report yet
                         // TODO JIRA:1507
                     }