Minor changes fixing issues found in review

volivan239 · volivan239 · commit 38fb0d0240ca · 2022-09-27T18:21:35.000+03:00
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
@@ -29,8 +29,8 @@ import org.utbot.framework.codegen.model.tree.CgValue
 import org.utbot.framework.codegen.model.tree.CgVariable
 import org.utbot.framework.codegen.model.util.at
 import org.utbot.framework.codegen.model.util.canBeSetFrom
-import org.utbot.framework.codegen.model.util.fieldThisIsGetterFor
-import org.utbot.framework.codegen.model.util.fieldThisIsSetterFor
+import org.utbot.framework.codegen.model.util.fieldThatIsGotWith
+import org.utbot.framework.codegen.model.util.fieldThatIsSetWith
 import org.utbot.framework.codegen.model.util.inc
 import org.utbot.framework.codegen.model.util.isAccessibleFrom
 import org.utbot.framework.codegen.model.util.lessThan
@@ -218,11 +218,11 @@ internal class CgVariableConstructor(val context: CgContext) :
                 }
                 is UtExecutableCallModel -> {
                     val call = createCgExecutableCallFromUtExecutableCall(statementModel)
-                    val callOrAccess: CgStatement = replaceCgExecutableCallWithFieldAccessIfNeeded(call)
-                    if (callOrAccess is CgExecutableCall)
-                        +callOrAccess   // smart-cast => CgExecutableCall.unaryPlus()
+                    val equivalentFieldAccess = replaceCgExecutableCallWithFieldAccessIfNeeded(call)
+                    if (equivalentFieldAccess != null)
+                        +equivalentFieldAccess
                     else
-                        +callOrAccess   // CgStatement.unaryPlus()
+                        +call
                 }
             }
         }
@@ -246,7 +246,6 @@ internal class CgVariableConstructor(val context: CgContext) :
         val initExpr = if (isPrimitiveWrapperOrString(type)) {
             cgLiteralForWrapper(params)
         } else {
-            // TODO: if instantiation chain could be a setter call, we need to replace it in Kotlin
             createCgExecutableCallFromUtExecutableCall(executableCall)
         }
         newVar(type, model, baseName) {
@@ -272,21 +271,35 @@ internal class CgVariableConstructor(val context: CgContext) :
         return cgCall
     }
 
-    private fun replaceCgExecutableCallWithFieldAccessIfNeeded(call: CgExecutableCall): CgStatement {
-        if (call !is CgMethodCall || context.codegenLanguage != CodegenLanguage.KOTLIN)
-            return call
+    /**
+     * If executable is getter/setter that should be syntactically replaced with field access
+     * (e.g., getter/setter generated by Kotlin in Kotlin code), this method returns [CgStatement]
+     * with which [call] should be replaced.
+     *
+     * Otherwise, returns null.
+     */
+    private fun replaceCgExecutableCallWithFieldAccessIfNeeded(call: CgExecutableCall): CgStatement? {
+        when (context.codegenLanguage) {
+            CodegenLanguage.JAVA -> return null
+            CodegenLanguage.KOTLIN -> {
+                if (call !is CgMethodCall)
+                    return null
 
-        val caller = call.caller ?: return call
+                val caller = call.caller ?: return null
 
-        caller.type.fieldThisIsSetterFor(call.executableId)?.let {
-            return CgAssignment(caller[it], call.arguments.single())
-        }
-        caller.type.fieldThisIsGetterFor(call.executableId)?.let {
-            require(call.arguments.isEmpty())
-            return caller[it]
-        }
+                caller.type.fieldThatIsSetWith(call.executableId)?.let {
+                    return CgAssignment(caller[it], call.arguments.single())
+                }
+                caller.type.fieldThatIsGotWith(call.executableId)?.let {
+                    require(call.arguments.isEmpty()) {
+                        "Method $call was detected as getter for $it, but its arguments list isn't empty"
+                    }
+                    return caller[it]
+                }
 
-        return call
+                return null
+            }
+        }
     }
 
     /**
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/ClassIdUtil.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/ClassIdUtil.kt
@@ -36,11 +36,11 @@ infix fun ClassId.isAccessibleFrom(packageName: String): Boolean {
 /**
  * Returns field of [this], such that [methodId] is a getter for it (or null if methodId doesn't represent a getter)
  */
-internal fun ClassId.fieldThisIsGetterFor(methodId: MethodId): FieldId? =
-    allDeclaredFieldIds.firstOrNull { !it.isStatic && it.getter == methodId }
+internal fun ClassId.fieldThatIsGotWith(methodId: MethodId): FieldId? =
+    allDeclaredFieldIds.singleOrNull { !it.isStatic && it.getter == methodId }
 
 /**
  * Returns field of [this], such that [methodId] is a setter for it (or null if methodId doesn't represent a setter)
  */
-internal fun ClassId.fieldThisIsSetterFor(methodId: MethodId): FieldId? =
-    allDeclaredFieldIds.firstOrNull { !it.isStatic && it.setter == methodId }
+internal fun ClassId.fieldThatIsSetWith(methodId: MethodId): FieldId? =
+    allDeclaredFieldIds.singleOrNull { !it.isStatic && it.setter == methodId }
