Fixed behavior to match tests

Author: volivan239

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

@@ -519,20 +519,13 @@ data class UtDirectSetFieldModel(
     val fieldId: FieldId,
     val fieldModel: UtModel,
 ) : UtStatementModel(instance) {
-    private val fieldName
-        get() =
-            if (instance.classId == fieldId.declaringClass)
-                "${instance.modelName}.${fieldId.name}"
-            else
-                "${instance.modelName}.(${fieldId.declaringClass.name})${fieldId.name}"
-
 
     override fun toString(): String = withToStringThreadLocalReentrancyGuard {
             val modelRepresentation = when (fieldModel) {
                 is UtAssembleModel -> fieldModel.modelName
                 else -> fieldModel.toString()
             }
-            "$fieldName = $modelRepresentation"
+            "${instance.modelName}.${fieldId.name} = $modelRepresentation"
         }
 
 }
@@ -813,6 +806,9 @@ enum class FieldIdStrategyValues {
  */
 open class FieldId(val declaringClass: ClassId, val name: String) {
 
+    init {
+        //assert(declaringClass.jClass.declaredFields.any { it.name == name })
+    }
     object Strategy {
         var value: FieldIdStrategyValues = FieldIdStrategyValues.Soot
     }

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt

@@ -288,7 +288,11 @@ val ClassId.isIterableOrMap: Boolean
 fun ClassId.fieldOrNull(fieldId: FieldId): Field? {
     if (this.isNotSubtypeOf(fieldId.declaringClass))
         return null
-    return fieldId.field
+    return try {
+        fieldId.field
+    } catch (e: Exception) {
+        null
+    }
 }
 
 fun ClassId.hasField(fieldId: FieldId): Boolean = fieldOrNull(fieldId) != null

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

@@ -30,9 +30,14 @@ class Hierarchy(private val typeRegistry: TypeRegistry) {
         val realType = typeRegistry.findRealType(type) as RefType
 
 
-        val ancestorType = field.declaringClass
-        //val ancestorType = ancestors(realType.sootClass.id).firstOrNull { it.declaresField(field.subSignature) }?.type
-            //?: error("No such field ${field.subSignature} found in ${realType.sootClass.name}")
+        /*val ancestorType = field.declaringClass
+        val ancestorType2 = ancestors(realType.sootClass.id).firstOrNull { it.declaresField(field.subSignature) }?.type
+            ?: error("No such field ${field.subSignature} found in ${realType.sootClass.name}")*/
+        val ancestorType = if (field.declaringClass in ancestors(realType.sootClass.id))
+            field.declaringClass
+        else
+            ancestors(realType.sootClass.id).firstOrNull { it.declaresField(field.subSignature) }?.type
+                ?: error("No such field ${field.subSignature} found in ${realType.sootClass.name}")
         return ChunkId("$ancestorType", field.name)
     }
 

utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt

@@ -7,7 +7,6 @@ import org.junit.jupiter.api.Test
 
 internal class HiddenFieldExampleTest : UtValueTestCaseChecker(testClass = HiddenFieldExample::class) {
     @Test
-    // Engine creates HiddenFieldSuccClass instead of HiddenFieldSuperClass, feels wrong field and matchers fail
     fun testCheckHiddenField() {
         check(
             HiddenFieldExample::checkHiddenField,
@@ -21,8 +20,6 @@ internal class HiddenFieldExampleTest : UtValueTestCaseChecker(testClass = Hidde
     }
 
     @Test
-    //@Disabled("SAT-315 Engine cannot work with hidden fields")
-    // Engine translates calls to super.b as calls to succ.b
     fun testCheckSuccField() {
         check(
             HiddenFieldExample::checkSuccField,