renamed fieldById->findFieldById, deleted redundant stuff

Author: volivan239

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

@@ -20,7 +20,7 @@ import org.utbot.framework.plugin.api.util.charClassId
 import org.utbot.framework.plugin.api.util.constructor
 import org.utbot.framework.plugin.api.util.doubleClassId
 import org.utbot.framework.plugin.api.util.executableId
-import org.utbot.framework.plugin.api.util.fieldByIdOrNull
+import org.utbot.framework.plugin.api.util.findFieldByIdOrNull
 import org.utbot.framework.plugin.api.util.floatClassId
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intClassId
@@ -856,7 +856,7 @@ open class FieldId(val declaringClass: ClassId, val name: String) {
         return result
     }
 
-    override fun toString() = declaringClass.fieldByIdOrNull(this).toString()
+    override fun toString() = declaringClass.findFieldByIdOrNull(this).toString()
 }
 
 inline fun <T> withReflection(block: () -> T): T {

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

@@ -285,17 +285,24 @@ val ClassId.isMap: Boolean
 val ClassId.isIterableOrMap: Boolean
     get() = isIterable || isMap
 
-fun ClassId.fieldById(fieldId: FieldId): Field =
-    fieldByIdOrNull(fieldId) ?: error("Can't find field ${fieldId.name} in $name")
-
-fun ClassId.fieldByIdOrNull(fieldId: FieldId): Field? =
+// TODO: needs to be refactored (do we really need receiver? Can't we specify cases where we should return null?)
+fun ClassId.findFieldByIdOrNull(fieldId: FieldId): Field? {
     if (isNotSubtypeOf(fieldId.declaringClass)) {
-        null
-    } else {
-        fieldId.declaringClass.jClass.declaredFields.firstOrNull { it.name == fieldId.name }
+        error("findFieldByIdOrNull is called on class ${name}, which is not a subclass of ${fieldId.name}'s declaring class")
     }
 
-fun ClassId.hasField(fieldId: FieldId): Boolean = fieldByIdOrNull(fieldId) != null
+    return fieldId.declaringClass.jClass.declaredFields.firstOrNull { it.name == fieldId.name }
+}
+
+// TODO: maybe we could replace its usages with FieldId.field
+fun ClassId.findFieldById(fieldId: FieldId): Field =
+    findFieldByIdOrNull(fieldId) ?: error("Can't find field ${fieldId.name} in $name")
+
+// TODO: check if we need this function
+fun ClassId.hasField(fieldId: FieldId): Boolean {
+    assert(findFieldByIdOrNull(fieldId) != null)
+    return findFieldByIdOrNull(fieldId) != null
+}
 
 fun ClassId.defaultValueModel(): UtModel = when (this) {
     intClassId -> UtPrimitiveModel(0)

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

@@ -89,7 +89,7 @@ import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.UtMethod
 import org.utbot.framework.plugin.api.classId
 import org.utbot.framework.plugin.api.id
-import org.utbot.framework.plugin.api.util.fieldById
+import org.utbot.framework.plugin.api.util.findFieldById
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.signature
@@ -639,7 +639,7 @@ class Traverser(
             SECURITY_FIELD_SIGNATURE -> SecurityManager()
             FIELD_FILTER_MAP_FIELD_SIGNATURE -> mapOf(Reflection::class to arrayOf("fieldFilterMap", "methodFilterMap"))
             METHOD_FILTER_MAP_FIELD_SIGNATURE -> emptyMap<Class<*>, Array<String>>()
-            else -> declaringClass.id.fieldById(field.fieldId).let { it.withAccessibility { it.get(null) } }
+            else -> declaringClass.id.findFieldById(field.fieldId).let { it.withAccessibility { it.get(null) } }
         }
 
     private fun isStaticInstanceInMethodResult(id: ClassId, methodResult: MethodResult?) =

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

@@ -36,7 +36,7 @@ import org.utbot.framework.plugin.api.UtVoidModel
 import org.utbot.framework.plugin.api.isMockModel
 import org.utbot.framework.plugin.api.util.constructor
 import org.utbot.framework.plugin.api.util.field
-import org.utbot.framework.plugin.api.util.fieldById
+import org.utbot.framework.plugin.api.util.findFieldById
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.method
 import org.utbot.framework.plugin.api.util.utContext
@@ -213,7 +213,7 @@ class ValueConstructor {
         constructedObjects[model] = classInstance
 
         model.fields.forEach { (field, fieldModel) ->
-            val declaredField = model.classId.fieldById(field)
+            val declaredField = model.classId.findFieldById(field)
             val accessible = declaredField.isAccessible
 
             try {

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

@@ -45,7 +45,7 @@ import org.utbot.framework.plugin.api.UtPrimitiveModel
 import org.utbot.framework.plugin.api.UtReferenceModel
 import org.utbot.framework.plugin.api.UtVoidModel
 import org.utbot.framework.plugin.api.util.defaultValueModel
-import org.utbot.framework.plugin.api.util.fieldByIdOrNull
+import org.utbot.framework.plugin.api.util.findFieldByIdOrNull
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intClassId
 import org.utbot.framework.plugin.api.util.isArray
@@ -126,7 +126,7 @@ internal class CgVariableConstructor(val context: CgContext) :
 
         for ((fieldId, fieldModel) in model.fields) {
             val variableForField = getOrCreateVariable(fieldModel)
-            val field = obj.type.fieldByIdOrNull(fieldId)
+            val field = obj.type.findFieldByIdOrNull(fieldId)
 
             // we cannot set field directly if variable declared type does not have such field
             // or we cannot directly create variable for field with the specified type (it is private, for example)

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MockValueConstructor.kt

@@ -45,7 +45,7 @@ import org.mockito.Mockito
 import org.mockito.stubbing.Answer
 import org.objectweb.asm.Type
 import org.utbot.common.withAccessibility
-import org.utbot.framework.plugin.api.util.fieldById
+import org.utbot.framework.plugin.api.util.findFieldById
 
 /**
  * Constructs values (including mocks) from models.
@@ -170,7 +170,7 @@ class MockValueConstructor(
         }
 
         model.fields.forEach { (field, fieldModel) ->
-            val declaredField = model.classId.fieldById(field)
+            val declaredField = model.classId.findFieldById(field)
             val accessible = declaredField.isAccessible
             declaredField.isAccessible = true
 

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

@@ -14,7 +14,6 @@ internal class HiddenFieldAccessModifiersTest : UtValueTestCaseChecker(testClass
             { o, _ -> o == null },
             { _, r -> r == true },
             { _, r -> r == false},
-            coverage = DoNotCalculate
         )
     }
 }

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

@@ -29,7 +29,6 @@ internal class HiddenFieldExampleTest : UtValueTestCaseChecker(testClass = Hidde
             { o, r -> o.a != 1 && o.b == 2.0 && r == 2 },
             { o, r -> o.a != 1 && o.b != 2.0 && (o as HiddenFieldSuperClass).b == 3 && r == 3 },
             { o, r -> o.a != 1 && o.b != 2.0 && (o as HiddenFieldSuperClass).b != 3 && r == 4 },
-            coverage = DoNotCalculate
         )
     }
 }

utbot-sample/src/main/java/org/utbot/examples/objects/HiddenFieldSuccClass.java

@@ -2,9 +2,4 @@
 
 public class HiddenFieldSuccClass extends HiddenFieldSuperClass {
     public double b;
-
-    @Override
-    public String toString() {
-        return b + ". Super b: " + super.b;
-    }
 }