Fixed review issues

Author: Kamenev Yury

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

@@ -1148,7 +1148,7 @@ fun UtBotSymbolicEngine.constructEnumStaticFieldResult(
     fieldType: Type,
     declaringClass: SootClass,
     enumConstantSymbolicResultsByName: Map<String, MethodResult>,
-    existingEnumSymbolicValue: Any?,
+    staticFieldConcreteValue: Any?,
     enumConstantSymbolicValues: List<ObjectValue>
 ): MethodResult =
     if (isEnumValuesFieldName(fieldName)) {
@@ -1161,8 +1161,9 @@ fun UtBotSymbolicEngine.constructEnumStaticFieldResult(
             // it is field to store enum constant so we use already created symbolic value from runtime enum constant
             enumConstantSymbolicResultsByName.getValue(fieldName)
         } else {
-            // otherwise, we have to create new symbolic value for field using enum class symbolic value
-            toMethodResult(existingEnumSymbolicValue, fieldType)
+            // otherwise, it is a common static field,
+            // and we have to create new symbolic value for it using its concrete value
+            toMethodResult(staticFieldConcreteValue, fieldType)
         }
     }
 

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

@@ -928,7 +928,7 @@ class UtBotSymbolicEngine(
             // Note that this list is not exhaustive, so it may be supplemented in the future.
             val packagesToProcessConcretely = javaPackagesToProcessConcretely + sunPackagesToProcessConcretely
 
-            val declaringClass = fieldRef.fieldRef.declaringClass()
+            val declaringClass = fieldRef.field.declaringClass
 
             val isFromPackageToProcessConcretely = packagesToProcessConcretely.any { className.startsWith(it) }
                     // it is required to remove classes we override, since
@@ -1055,7 +1055,7 @@ class UtBotSymbolicEngine(
         if (stmt is JAssignStmt) {
             val local = stmt.leftOp as JimpleLocal
             val localUpdate = localMemoryUpdate(
-                LocalVariable(local.name) to curFieldSymbolicValueForLocalVariable
+                local.variable to curFieldSymbolicValueForLocalVariable
             )
 
             allUpdates += localUpdate

utbot-framework/src/main/kotlin/org/utbot/engine/util/statics/concrete/EnumConcreteUtils.kt

@@ -1,26 +1,14 @@
 package org.utbot.engine.util.statics.concrete
 
 import org.utbot.common.withAccessibility
-import org.utbot.engine.MemoryChunkDescriptor
-import org.utbot.engine.MethodResult
-import org.utbot.engine.ObjectValue
-import org.utbot.engine.SymbolicSuccess
-import org.utbot.engine.SymbolicValue
-import org.utbot.engine.TypeResolver
-import org.utbot.engine.UtBotSymbolicEngine
-import org.utbot.engine.addr
-import org.utbot.engine.canRetrieveBody
-import org.utbot.engine.constructEnumStaticFieldResult
-import org.utbot.engine.fieldId
+import org.utbot.engine.*
 import org.utbot.engine.nullObjectAddr
 import org.utbot.engine.pc.addrEq
 import org.utbot.engine.pc.mkEq
 import org.utbot.engine.pc.mkNot
 import org.utbot.engine.pc.select
-import org.utbot.engine.staticInitializerOrNull
 import org.utbot.engine.symbolic.SymbolicStateUpdate
 import org.utbot.engine.symbolic.asHardConstraint
-import org.utbot.engine.toMethodResult
 import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.util.field
 import soot.SootClass
@@ -191,7 +179,7 @@ fun SootMethod.isAffectingExternalStatics(
         return false
     }
 
-    return activeBody.units.any {
+    return jimpleBody().units.any {
         if (it !is Stmt) {
             return@any false
         }
@@ -204,7 +192,7 @@ fun SootMethod.isAffectingExternalStatics(
                     return@any false
                 }
 
-                val declaringClass = leftOp.fieldRef.declaringClass()
+                val declaringClass = leftOp.field.declaringClass
 
                 val currentClassImplementedInterfaces = typeResolver
                     .findOrConstructAncestorsIncludingTypes(currentClass.type)