Renamed field to jField and minor changes

volivan239 · volivan239 · commit 1dae4a850577 · 2022-08-02T19:31:16.000+03:00
diff --git a/utbot-core/src/main/kotlin/org/utbot/common/KClassUtil.kt b/utbot-core/src/main/kotlin/org/utbot/common/KClassUtil.kt
@@ -1,21 +1,11 @@
 package org.utbot.common
 
-import java.lang.reflect.Field
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 
 
 val Class<*>.packageName: String get() = `package`?.name?:""
 
-/**
- * Returns the Field that would be used by compiler when you try to direct access [fieldName] from code, i.e.
- * when you write `${this.name}.$fieldName`.
- * If there is no field named [fieldName] in the class, null is returned
- */
-fun Class<*>.findDirectAccessedFieldOrNull(fieldName: String): Field? = generateSequence(this) { it.superclass }
-    .flatMap { it.declaredFields.asSequence() }
-    .firstOrNull { it.name == fieldName }
-
 fun Method.invokeCatching(obj: Any?, args: List<Any?>) = try {
     Result.success(invoke(obj, *args.toTypedArray()))
 } catch (e: InvocationTargetException) {
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
@@ -20,7 +20,6 @@ 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.field
 import org.utbot.framework.plugin.api.util.floatClassId
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intClassId
@@ -30,7 +29,7 @@ import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.longClassId
 import org.utbot.framework.plugin.api.util.method
 import org.utbot.framework.plugin.api.util.primitiveTypeJvmNameOrNull
-import org.utbot.framework.plugin.api.util.safeField
+import org.utbot.framework.plugin.api.util.safeJField
 import org.utbot.framework.plugin.api.util.shortClassId
 import org.utbot.framework.plugin.api.util.toReferenceTypeBytecodeSignature
 import org.utbot.framework.plugin.api.util.voidClassId
@@ -856,7 +855,7 @@ open class FieldId(val declaringClass: ClassId, val name: String) {
         return result
     }
 
-    override fun toString() = safeField.toString()
+    override fun toString() = safeJField.toString()
 }
 
 inline fun <T> withReflection(block: () -> T): T {
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/impl/FieldIdStrategies.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/impl/FieldIdStrategies.kt
@@ -3,7 +3,7 @@ package org.utbot.framework.plugin.api.impl
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.classId
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.id
 import java.lang.reflect.Modifier
 import soot.Scene
@@ -32,25 +32,25 @@ interface FieldIdStrategy {
 class FieldIdReflectionStrategy(val fieldId: FieldId) : FieldIdStrategy {
 
     override val isPublic: Boolean
-        get() = Modifier.isPublic(fieldId.field.modifiers)
+        get() = Modifier.isPublic(fieldId.jField.modifiers)
 
     override val isProtected: Boolean
-        get() = Modifier.isProtected(fieldId.field.modifiers)
+        get() = Modifier.isProtected(fieldId.jField.modifiers)
 
     override val isPrivate: Boolean
-        get() = Modifier.isPrivate(fieldId.field.modifiers)
+        get() = Modifier.isPrivate(fieldId.jField.modifiers)
 
     override val isFinal: Boolean
-        get() = Modifier.isFinal(fieldId.field.modifiers)
+        get() = Modifier.isFinal(fieldId.jField.modifiers)
 
     override val isStatic: Boolean
-        get() = Modifier.isStatic(fieldId.field.modifiers)
+        get() = Modifier.isStatic(fieldId.jField.modifiers)
 
     override val isSynthetic: Boolean
-        get() = fieldId.field.isSynthetic
+        get() = fieldId.jField.isSynthetic
 
     override val type: ClassId
-        get() = fieldId.field.type.id
+        get() = fieldId.jField.type.id
 }
 
 class FieldIdSootStrategy(val declaringClass: ClassId, val fieldId: FieldId) : FieldIdStrategy {
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt
@@ -290,7 +290,7 @@ fun ClassId.findFieldByIdOrNull(fieldId: FieldId): Field? {
         return null
     }
 
-    return fieldId.safeField
+    return fieldId.safeJField
 }
 
 fun ClassId.hasField(fieldId: FieldId): Boolean {
@@ -310,12 +310,12 @@ fun ClassId.defaultValueModel(): UtModel = when (this) {
 }
 
 // FieldId utils
-val FieldId.safeField: Field?
+val FieldId.safeJField: Field?
     get() = declaringClass.jClass.declaredFields.firstOrNull { it.name == name }
 
 // TODO: maybe cache it somehow in the future
-val FieldId.field: Field
-    get() = safeField ?: error("Field $name is not found in class ${declaringClass.jClass.name}")
+val FieldId.jField: Field
+    get() = safeJField ?: error("Field $name is not declared in class ${declaringClass.jClass.name}")
 
 // https://docstore.mik.ua/orelly/java-ent/jnut/ch03_13.htm
 val FieldId.isInnerClassEnclosingClassReference: Boolean
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/Strings.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/Strings.kt
@@ -313,7 +313,7 @@ sealed class UtAbstractStringBuilderWrapper(className: String) : BaseOverriddenW
 
         val arrayValuesChunkId = typeRegistry.arrayChunkId(charArrayType)
 
-        val valuesFieldChunkId = hierarchy.chunkIdForField(utStringClass.type, utStringClass.valueField)
+        val valuesFieldChunkId = hierarchy.chunkIdForField(overriddenClass.type, overriddenClass.valueField)
         val valuesArrayAddrDescriptor = MemoryChunkDescriptor(valuesFieldChunkId, wrapper.type, charType)
         val valuesArrayAddr = findArray(valuesArrayAddrDescriptor, MemoryState.CURRENT).select(wrapper.addr)
 
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/Traverser.kt b/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.field
+import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.signature
@@ -640,9 +640,13 @@ class Traverser(
             FIELD_FILTER_MAP_FIELD_SIGNATURE -> mapOf(Reflection::class to arrayOf("fieldFilterMap", "methodFilterMap"))
             METHOD_FILTER_MAP_FIELD_SIGNATURE -> emptyMap<Class<*>, Array<String>>()
             else -> {
-                val id = field.fieldId
-                val jField = id.field
-                jField.let { it.withAccessibility { it.get(null) } }
+                val fieldId = field.fieldId
+                val jField = fieldId.jField
+                jField.let {
+                    it.withAccessibility {
+                        it.get(null)
+                    }
+                }
             }
         }
 
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/ValueConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/ValueConstructor.kt
@@ -35,7 +35,7 @@ import org.utbot.framework.plugin.api.UtValueExecutionState
 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.jField
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.method
 import org.utbot.framework.plugin.api.util.utContext
@@ -212,7 +212,7 @@ class ValueConstructor {
         constructedObjects[model] = classInstance
 
         model.fields.forEach { (fieldId, fieldModel) ->
-            val declaredField = fieldId.field
+            val declaredField = fieldId.jField
             val accessible = declaredField.isAccessible
 
             try {
@@ -358,7 +358,7 @@ class ValueConstructor {
         val instanceClassId = instanceModel.classId
         val fieldModel = directSetterModel.fieldModel
 
-        val field = directSetterModel.fieldId.field
+        val field = directSetterModel.fieldId.jField
         val isAccessible = field.isAccessible
 
         try {
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/util/statics/concrete/EnumConcreteUtils.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/util/statics/concrete/EnumConcreteUtils.kt
@@ -10,7 +10,7 @@ import org.utbot.engine.pc.select
 import org.utbot.engine.symbolic.SymbolicStateUpdate
 import org.utbot.engine.symbolic.asHardConstraint
 import org.utbot.framework.plugin.api.FieldId
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.jField
 import soot.SootClass
 import soot.SootField
 import soot.SootMethod
@@ -43,7 +43,7 @@ fun associateEnumSootFieldsWithConcreteValues(
     enumConstants: List<Enum<*>>
 ): List<Pair<SootField, List<Any>>> =
     enumFields.map { enumSootField ->
-        val enumField = enumSootField.fieldId.field
+        val enumField = enumSootField.fieldId.jField
 
         val fieldValues = if (enumSootField.isStatic) {
             val staticFieldValue = enumField.withAccessibility { enumField.get(null) }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
@@ -129,7 +129,7 @@ import org.utbot.framework.plugin.api.util.booleanClassId
 import org.utbot.framework.plugin.api.util.doubleArrayClassId
 import org.utbot.framework.plugin.api.util.doubleClassId
 import org.utbot.framework.plugin.api.util.doubleWrapperClassId
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.floatArrayClassId
 import org.utbot.framework.plugin.api.util.floatClassId
 import org.utbot.framework.plugin.api.util.floatWrapperClassId
@@ -929,7 +929,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
         // Can directly access field only if it is declared in variable class (or in its ancestors)
         // and is accessible from current package
         if (variable.type.hasField(this) && isAccessibleFrom(testClassPackageName)) {
-            if (field.isStatic) CgStaticFieldAccess(this) else CgFieldAccess(variable, this)
+            if (jField.isStatic) CgStaticFieldAccess(this) else CgFieldAccess(variable, this)
         } else {
             testClassThisInstance[getFieldValue](variable, stringLiteral(name))
         }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgVariableConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgVariableConstructor.kt
@@ -46,7 +46,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.field
+import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.findFieldByIdOrNull
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intClassId
@@ -127,7 +127,7 @@ internal class CgVariableConstructor(val context: CgContext) :
         }
 
         for ((fieldId, fieldModel) in model.fields) {
-            val field = fieldId.field
+            val field = fieldId.jField
             val variableForField = getOrCreateVariable(fieldModel)
             val fieldFromVariableSpecifiedType = obj.type.findFieldByIdOrNull(fieldId)
 
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MockValueConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MockValueConstructor.kt
@@ -31,7 +31,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.executableId
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.method
 import org.utbot.framework.plugin.api.util.utContext
@@ -169,7 +169,7 @@ class MockValueConstructor(
         }
 
         model.fields.forEach { (fieldId, fieldModel) ->
-            val declaredField = fieldId.field
+            val declaredField = fieldId.jField
             val accessible = declaredField.isAccessible
             declaredField.isAccessible = true
 
@@ -392,7 +392,7 @@ class MockValueConstructor(
         val instanceClassId = instanceModel.classId
         val fieldModel = directSetterModel.fieldModel
 
-        val field = directSetterModel.fieldId.field
+        val field = directSetterModel.fieldId.jField
         val isAccessible = field.isAccessible
 
         try {
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt
@@ -23,7 +23,7 @@ import org.utbot.framework.plugin.api.UtNewInstanceInstrumentation
 import org.utbot.framework.plugin.api.UtStaticMethodInstrumentation
 import org.utbot.framework.plugin.api.UtTimeoutException
 import org.utbot.framework.plugin.api.util.UtContext
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.singleExecutableId
 import org.utbot.framework.plugin.api.util.utContext
@@ -178,7 +178,7 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
                     val stateAfterParametersWithThis = params.map { construct(it.value, it.clazz.id) }
                     val stateAfterStatics = (staticFields.keys/* + traceHandler.computePutStatics()*/)
                         .associateWith { fieldId ->
-                            fieldId.field.run { construct(withAccessibility { get(null) }, fieldId.type) }
+                            fieldId.jField.run { construct(withAccessibility { get(null) }, fieldId.type) }
                         }
                     val (stateAfterThis, stateAfterParameters) = if (stateBefore.thisInstance == null) {
                         null to stateAfterParametersWithThis
@@ -258,7 +258,7 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
         val savedFields = mutableMapOf<FieldId, Any?>()
         try {
             staticFields.forEach { (fieldId, value) ->
-                fieldId.field.run {
+                fieldId.jField.run {
                     withAccessibility {
                         savedFields[fieldId] = get(null)
                         set(null, value)
@@ -268,7 +268,7 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
             return block()
         } finally {
             savedFields.forEach { (fieldId, value) ->
-                fieldId.field.run {
+                fieldId.jField.run {
                     withAccessibility {
                         set(null, value)
                     }
diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt
@@ -12,7 +12,7 @@ import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.util.id
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.jField
 
 class ClassWithEnumTest : UtValueTestCaseChecker(testClass = ClassWithEnum::class) {
     @Test
@@ -111,7 +111,7 @@ class ClassWithEnumTest : UtValueTestCaseChecker(testClass = ClassWithEnum::clas
             eq(1),
             { t, staticsAfter, r ->
                 // for some reasons x is inaccessible
-                val x = FieldId(t.javaClass.id, "x").field.get(t) as Int
+                val x = FieldId(t.javaClass.id, "x").jField.get(t) as Int
 
                 val y = staticsAfter[FieldId(ClassWithEnum.ClassWithStaticField::class.id, "y")]!!.value as Int
 
diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test
 internal class HiddenFieldAccessModifiersTest : UtValueTestCaseChecker(testClass = HiddenFieldAccessModifiersExample::class) {
     @Test
     fun testCheckSuperFieldEqualsOne() {
-        // TODO: currently, codegen can't handle tests with field hiding
+        // TODO: currently, codegen can't handle tests with field hiding (see #646)
         withEnabledTestingCodeGeneration(testCodeGeneration = false) {
             check(
                 HiddenFieldAccessModifiersExample::checkSuperFieldEqualsOne,
diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt
@@ -21,7 +21,7 @@ internal class HiddenFieldExampleTest : UtValueTestCaseChecker(testClass = Hidde
 
     @Test
     fun testCheckSuccField() {
-        // TODO: currently, codegen can't handle tests with field hiding
+        // TODO: currently, codegen can't handle tests with field hiding (see #646)
         withEnabledTestingCodeGeneration(testCodeGeneration = false) {
             check(
                 HiddenFieldExample::checkSuccField,
diff --git a/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/et/TestStaticsUsage.kt b/utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/et/TestStaticsUsage.kt
@@ -3,7 +3,7 @@ package org.utbot.examples.et
 import org.utbot.examples.objects.ObjectWithStaticFieldsClass
 import org.utbot.examples.objects.ObjectWithStaticFieldsExample
 import org.utbot.framework.plugin.api.util.UtContext
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.jField
 import org.utbot.instrumentation.execute
 import org.utbot.instrumentation.instrumentation.et.ExecutionTraceInstrumentation
 import org.utbot.instrumentation.withInstrumentation
@@ -39,7 +39,7 @@ class StaticsUsageDetectionTest {
             classInstance.x = 200
             classInstance.y = 200
             val result = it.execute(ObjectWithStaticFieldsExample::setStaticField, arrayOf(instance, classInstance))
-            assertEquals(ObjectWithStaticFieldsClass::staticValue.javaField, result.usedStatics.single().field)
+            assertEquals(ObjectWithStaticFieldsClass::staticValue.javaField, result.usedStatics.single().jField)
         }
     }
 
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/InvokeWithStaticsInstrumentation.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/InvokeWithStaticsInstrumentation.kt
@@ -1,7 +1,7 @@
 package org.utbot.instrumentation.instrumentation
 
 import org.utbot.common.withAccessibility
-import org.utbot.framework.plugin.api.util.field
+import org.utbot.framework.plugin.api.util.jField
 import org.utbot.instrumentation.util.StaticEnvironment
 import java.lang.reflect.Field
 import java.lang.reflect.Modifier
@@ -46,7 +46,7 @@ class InvokeWithStaticsInstrumentation : Instrumentation<Result<*>> {
     private fun setStaticFields(staticEnvironment: StaticEnvironment?) {
         staticEnvironment?.run {
             listOfFields.forEach { (fieldId, value) ->
-                fieldId.field.run {
+                fieldId.jField.run {
                     withAccessibility {
                         set(null, value)
                     }

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ fun ClassId.findFieldByIdOrNull(fieldId: FieldId): Field? {`
`290`	`290`	`return null`
`291`	`291`	`}`
`292`	`292`
`293`		`- return fieldId.safeField`
	`293`	`+ return fieldId.safeJField`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`fun ClassId.hasField(fieldId: FieldId): Boolean {`
`@@ -310,12 +310,12 @@ fun ClassId.defaultValueModel(): UtModel = when (this) {`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`// FieldId utils`
`313`		`-val FieldId.safeField: Field?`
	`313`	`+val FieldId.safeJField: Field?`
`314`	`314`	`get() = declaringClass.jClass.declaredFields.firstOrNull { it.name == name }`
`315`	`315`
`316`	`316`	`// TODO: maybe cache it somehow in the future`
`317`		`-val FieldId.field: Field`
`318`		`- get() = safeField ?: error("Field $name is not found in class ${declaringClass.jClass.name}")`
	`317`	`+val FieldId.jField: Field`
	`318`	`+ get() = safeJField ?: error("Field $name is not declared in class ${declaringClass.jClass.name}")`
`319`	`319`
`320`	`320`	`// https://docstore.mik.ua/orelly/java-ent/jnut/ch03_13.htm`
`321`	`321`	`val FieldId.isInnerClassEnclosingClassReference: Boolean`