[utbot-java]

Review fix

Author: Domonion

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

@@ -84,8 +84,6 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
             delegateInstrumentation,
             timeout
         ).computeConcreteExecutionResult {
-            var savedStatics: Map<FieldId, Any?>? = null
-
             try {
                 val (params, statics, cache) = this.executePhaseInTimeout(valueConstructionPhase) {
                     val params = constructParameters(stateBefore)
@@ -100,7 +98,7 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
                 // invariants:
                 // 1. phase must always complete if started as static reset relies on it
                 // 2. phase must be fast as there are no incremental changes
-                savedStatics = preparationPhase.start {
+                postprocessingPhase.savedStatics = preparationPhase.start {
                     val result = setStaticFields(statics)
                     resetTrace()
                     result
@@ -146,13 +144,10 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
                     coverage
                 )
             } finally {
-                // postprocessing
-                savedStatics?.let {
-                    postprocessingPhase.start {
-                        resetStaticFields(it)
-                    }
+                postprocessingPhase.start {
+                    resetStaticFields()
+                    valueConstructionPhase.resetMockMethods()
                 }
-                valueConstructionPhase.resetMockMethods()
             }
         }
     }

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

@@ -10,10 +10,18 @@ import org.utbot.framework.plugin.api.util.jField
  */
 class PostprocessingPhase : ExecutionPhase {
 
+    private var savedStaticsInstance: Map<FieldId, Any?>? = null
+
+    var savedStatics: Map<FieldId, Any?>
+        get() = savedStaticsInstance!!
+        set(value) {
+            savedStaticsInstance = value
+        }
+
     override fun wrapError(e: Throwable): ExecutionPhaseException = ExecutionPhaseError(this.javaClass.simpleName, e)
 
-    fun resetStaticFields(staticFields: Map<FieldId, Any?>) {
-        staticFields.forEach { (fieldId, value) ->
+    fun resetStaticFields() {
+        savedStatics.forEach { (fieldId, value) ->
             fieldId.jField.run {
                 withAccessibility {
                     set(null, value)

utbot-junit-contest/build.gradle

@@ -56,8 +56,6 @@ dependencies {
     implementation project(":utbot-analytics")
 
 
-    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
-    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion
     implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
         exclude group:'com.google.guava', module:'guava'
     }