Rolled back changes in codegen

volivan239 · volivan239 · commit 36123965dfdc · 2022-08-01T13:54:21.000+03:00
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
@@ -43,6 +43,7 @@ import org.utbot.framework.codegen.model.tree.CgEqualTo
 import org.utbot.framework.codegen.model.tree.CgErrorTestMethod
 import org.utbot.framework.codegen.model.tree.CgExecutableCall
 import org.utbot.framework.codegen.model.tree.CgExpression
+import org.utbot.framework.codegen.model.tree.CgFieldAccess
 import org.utbot.framework.codegen.model.tree.CgGetJavaClass
 import org.utbot.framework.codegen.model.tree.CgIfStatement
 import org.utbot.framework.codegen.model.tree.CgLiteral
@@ -928,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 variable[this]
+            if (field.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
@@ -15,6 +15,7 @@ import org.utbot.framework.codegen.model.tree.CgAllocateInitializedArray
 import org.utbot.framework.codegen.model.tree.CgDeclaration
 import org.utbot.framework.codegen.model.tree.CgEnumConstantAccess
 import org.utbot.framework.codegen.model.tree.CgExpression
+import org.utbot.framework.codegen.model.tree.CgFieldAccess
 import org.utbot.framework.codegen.model.tree.CgGetJavaClass
 import org.utbot.framework.codegen.model.tree.CgLiteral
 import org.utbot.framework.codegen.model.tree.CgStaticFieldAccess
@@ -45,6 +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.findFieldByIdOrNull
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intClassId
@@ -125,17 +127,21 @@ internal class CgVariableConstructor(val context: CgContext) :
         }
 
         for ((fieldId, fieldModel) in model.fields) {
+            val field = fieldId.field
             val variableForField = getOrCreateVariable(fieldModel)
-            val field = obj.type.findFieldByIdOrNull(fieldId)
+            val fieldFromVariableSpecifiedType = 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)
             // Example:
             // Object heapByteBuffer = createInstance("java.nio.HeapByteBuffer");
             // branchRegisterRequest.byteBuffer = heapByteBuffer;
             // byteBuffer is field of type ByteBuffer and upper line is incorrect
-            if (field != null && field.type.id == variableForField.type && fieldId.canBeSetIn(testClassPackageName)) {
-                val fieldAccess = if (field.isStatic) CgStaticFieldAccess(fieldId) else obj[fieldId]
+            val canFieldBeDirectlySetByVariableAndFieldTypeRestrictions =
+                fieldFromVariableSpecifiedType != null && fieldFromVariableSpecifiedType.type.id == variableForField.type
+            if (canFieldBeDirectlySetByVariableAndFieldTypeRestrictions && fieldId.canBeSetIn(testClassPackageName)) {
+                // TODO: check if it is correct to use declaringClass of a field here
+                val fieldAccess = if (field.isStatic) CgStaticFieldAccess(fieldId) else CgFieldAccess(obj, fieldId)
                 fieldAccess `=` variableForField
             } else {
                 // composite models must not have info about static fields, hence only non-static fields are set here
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/DslUtil.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/DslUtil.kt
@@ -1,6 +1,5 @@
 package org.utbot.framework.codegen.model.util
 
-import org.utbot.common.findDirectAccessedFieldOrNull
 import org.utbot.framework.codegen.model.constructor.tree.CgCallableAccessManager
 import org.utbot.framework.codegen.model.tree.CgArrayElementAccess
 import org.utbot.framework.codegen.model.tree.CgDecrement
@@ -17,7 +16,6 @@ import org.utbot.framework.codegen.model.tree.CgLessThan
 import org.utbot.framework.codegen.model.tree.CgLiteral
 import org.utbot.framework.codegen.model.tree.CgStaticFieldAccess
 import org.utbot.framework.codegen.model.tree.CgThisInstance
-import org.utbot.framework.codegen.model.tree.CgTypeCast
 import org.utbot.framework.codegen.model.tree.CgVariable
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
@@ -27,11 +25,9 @@ import org.utbot.framework.plugin.api.util.booleanClassId
 import org.utbot.framework.plugin.api.util.byteClassId
 import org.utbot.framework.plugin.api.util.charClassId
 import org.utbot.framework.plugin.api.util.doubleClassId
-import org.utbot.framework.plugin.api.util.field
 import org.utbot.framework.plugin.api.util.floatClassId
 import org.utbot.framework.plugin.api.util.intClassId
 import org.utbot.framework.plugin.api.util.isArray
-import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.longClassId
 import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.framework.plugin.api.util.shortClassId
@@ -76,11 +72,7 @@ fun stringLiteral(string: String) = CgLiteral(stringClassId, string)
 
 // non-static fields
 operator fun CgExpression.get(fieldId: FieldId): CgFieldAccess =
-    if (type.jClass.findDirectAccessedFieldOrNull(fieldId.name) != fieldId.field) {
-        CgFieldAccess(CgTypeCast(fieldId.declaringClass, this), fieldId)
-    } else {
-        CgFieldAccess(this, fieldId)
-    }
+    CgFieldAccess(this, fieldId)
 
 // static fields
 // TODO: unused receiver
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt
@@ -121,9 +121,7 @@ internal class CgKotlinRenderer(context: CgContext, printer: CgPrinter = CgPrint
     // Property access
 
     override fun visit(element: CgFieldAccess) {
-        if (element.caller is CgTypeCast) print("(")
         element.caller.accept(this)
-        if (element.caller is CgTypeCast) print(")")
         renderAccess(element.caller)
         print(element.fieldId.name)
     }
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
@@ -1,19 +1,21 @@
 package org.utbot.examples.objects
 
 import org.utbot.examples.UtValueTestCaseChecker
-import org.utbot.examples.DoNotCalculate
 import org.utbot.examples.eq
 import org.junit.jupiter.api.Test
 
 internal class HiddenFieldAccessModifiersTest : UtValueTestCaseChecker(testClass = HiddenFieldAccessModifiersExample::class) {
     @Test
     fun testCheckSuperFieldEqualsOne() {
-        check(
-            HiddenFieldAccessModifiersExample::checkSuperFieldEqualsOne,
-            eq(3),
-            { o, _ -> o == null },
-            { _, r -> r == true },
-            { _, r -> r == false},
-        )
+        // TODO: currently, codegen can't handle tests with field hiding
+        withEnabledTestingCodeGeneration(testCodeGeneration = false) {
+            check(
+                HiddenFieldAccessModifiersExample::checkSuperFieldEqualsOne,
+                eq(3),
+                { o, _ -> o == null },
+                { _, r -> r == true },
+                { _, r -> r == false },
+            )
+        }
     }
 }
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,14 +21,17 @@ internal class HiddenFieldExampleTest : UtValueTestCaseChecker(testClass = Hidde
 
     @Test
     fun testCheckSuccField() {
-        check(
-            HiddenFieldExample::checkSuccField,
-            eq(5),
-            { o, _ -> o == null },
-            { o, r -> o.a == 1 && r == 1 },
-            { 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 },
-        )
+        // TODO: currently, codegen can't handle tests with field hiding
+        withEnabledTestingCodeGeneration(testCodeGeneration = false) {
+            check(
+                HiddenFieldExample::checkSuccField,
+                eq(5),
+                { o, _ -> o == null },
+                { o, r -> o.a == 1 && r == 1 },
+                { 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 },
+            )
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,7 @@ internal class CgKotlinRenderer(context: CgContext, printer: CgPrinter = CgPrint`
`121`	`121`	`// Property access`
`122`	`122`
`123`	`123`	`override fun visit(element: CgFieldAccess) {`
`124`		`- if (element.caller is CgTypeCast) print("(")`
`125`	`124`	`element.caller.accept(this)`
`126`		`- if (element.caller is CgTypeCast) print(")")`
`127`	`125`	`renderAccess(element.caller)`
`128`	`126`	`print(element.fieldId.name)`
`129`	`127`	`}`