Some fixes

Author: ArsenHD

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

@@ -11,7 +11,6 @@ package org.utbot.framework.plugin.api
 import org.utbot.common.isDefaultValue
 import org.utbot.common.withToStringThreadLocalReentrancyGuard
 import org.utbot.framework.UtSettings
-import org.utbot.framework.plugin.api.MockFramework.MOCKITO
 import org.utbot.framework.plugin.api.impl.FieldIdReflectionStrategy
 import org.utbot.framework.plugin.api.impl.FieldIdSootStrategy
 import org.utbot.framework.plugin.api.util.booleanClassId
@@ -1084,10 +1083,15 @@ class BuiltinConstructorId(
     classId: ClassId,
     parameters: List<ClassId>,
     // by default, we assume that the builtin constructor is public
-    override val isPublic: Boolean = true,
-    override val isProtected: Boolean = false,
-    override val isPrivate: Boolean = false
-) : ConstructorId(classId, parameters)
+    isPublic: Boolean = true,
+    isProtected: Boolean = false,
+    isPrivate: Boolean = false
+) : ConstructorId(classId, parameters) {
+    override val modifiers: Int =
+        (if (isPublic) Modifier.PUBLIC else 0) or
+            (if (isProtected) Modifier.PROTECTED else 0) or
+            (if (isPrivate) Modifier.PRIVATE else 0)
+}
 
 open class TypeParameters(val parameters: List<ClassId> = emptyList())
 

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

@@ -59,16 +59,13 @@ import org.utbot.framework.plugin.api.UtOverflowFailure
 import org.utbot.framework.plugin.api.UtResult
 import org.utbot.framework.plugin.api.UtSymbolicExecution
 import org.utbot.framework.util.graph
-import org.utbot.framework.plugin.api.util.executableId
 import org.utbot.framework.plugin.api.util.isStatic
-import org.utbot.framework.plugin.api.onSuccess
 import org.utbot.framework.plugin.api.util.description
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.isConstructor
 import org.utbot.framework.plugin.api.util.isEnum
 import org.utbot.framework.plugin.api.util.utContext
 import org.utbot.framework.plugin.api.util.voidClassId
-import org.utbot.framework.util.graph
 import org.utbot.framework.util.sootMethod
 import org.utbot.fuzzer.FallbackModelProvider
 import org.utbot.fuzzer.FuzzedMethodDescription

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

@@ -39,6 +39,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.isStatic
 import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.method

utbot-framework/src/main/kotlin/org/utbot/engine/util/lambda/LambdaConstructionUtils.kt

@@ -155,7 +155,7 @@ internal fun constructLambda(
     samType: Class<*>,
     declaringClass: Class<*>,
     lambdaName: String,
-    capturedReceiver: Any,
+    capturedReceiver: Any?,
     vararg capturedArguments: CapturedArgument
 ): Any {
     val (caller, invokedName, samMethodType, lambdaMethod, lambdaMethodType) =
@@ -164,7 +164,7 @@ internal fun constructLambda(
     val lambdaMethodHandle = caller.findVirtual(declaringClass, lambdaName, lambdaMethodType)
 
     val capturedArgumentTypes = capturedArguments.map { it.type }.toTypedArray()
-    val invokedType = MethodType.methodType(samType, capturedReceiver.javaClass, *capturedArgumentTypes)
+    val invokedType = MethodType.methodType(samType, declaringClass, *capturedArgumentTypes)
     val instantiatedMethodType = getInstantiatedMethodType(lambdaMethod, capturedArgumentTypes)
 
     // Create a CallSite for the given lambda.

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

@@ -3,6 +3,7 @@ package org.utbot.framework.codegen.model.constructor.tree
 import org.utbot.framework.codegen.model.CodeGenerator
 import org.utbot.framework.codegen.model.UtilClassKind
 import org.utbot.framework.codegen.model.constructor.builtin.utUtilsClassId
+import org.utbot.framework.codegen.model.tree.CgAuxiliaryClass
 import org.utbot.framework.codegen.model.tree.CgRegularClassFile
 import org.utbot.framework.codegen.model.tree.CgUtilMethod
 import org.utbot.framework.codegen.model.tree.buildRegularClass
@@ -25,6 +26,7 @@ internal object CgUtilClassConstructor {
                     content += utilClassKind.utilClassVersionComment
                     content += utilClassKind.utilClassKindComment
                     content += utilMethodProvider.utilMethodIds.map { CgUtilMethod(it) }
+                    content += CgAuxiliaryClass(utilMethodProvider.capturedArgumentClassId)
                 }
             }
         }

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

@@ -56,11 +56,10 @@ import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intClassId
 import org.utbot.framework.plugin.api.util.isArray
 import org.utbot.framework.plugin.api.util.isPrimitiveWrapperOrString
+import org.utbot.framework.plugin.api.util.isStatic
 import org.utbot.framework.plugin.api.util.stringClassId
 import org.utbot.framework.plugin.api.util.supertypeOfAnonymousClass
 import org.utbot.framework.plugin.api.util.wrapperByPrimitive
-import java.lang.reflect.Field
-import java.lang.reflect.Modifier
 
 /**
  * Constructs CgValue or CgVariable given a UtModel

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/CgStatementConstructor.kt

@@ -320,7 +320,7 @@ internal class CgStatementConstructorImpl(context: CgContext) :
         return if (classId isAccessibleFrom testClassPackageName) {
             CgGetJavaClass(classId)
         } else {
-            newVar(classCgClassId) { Class::class.id[forName](classId.name) }
+            newVar(classCgClassId) { classClassId[forName](classId.name) }
         }
     }
 

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/UtilMethods.kt

@@ -1302,7 +1302,7 @@ private fun capturedArgumentClass(language: CodegenLanguage) =
              * Captured values are represented as arguments of a synthetic method that lambda is compiled into,
              * hence the name of the class.
              */
-            static class CapturedArgument {
+            public static class CapturedArgument {
                 private Class<?> type;
                 private Object value;
         

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

@@ -48,6 +48,7 @@ import org.utbot.engine.util.lambda.CapturedArgument
 import org.utbot.engine.util.lambda.constructLambda
 import org.utbot.engine.util.lambda.constructStaticLambda
 import org.utbot.framework.plugin.api.UtLambdaModel
+import org.utbot.framework.plugin.api.util.isStatic
 import org.utbot.instrumentation.process.runSandbox
 
 /**
@@ -369,14 +370,15 @@ class MockValueConstructor(
     }
 
     private fun constructFromLambdaModel(lambdaModel: UtLambdaModel): Any {
+        constructedObjects[lambdaModel]?.let { return it }
         // A class representing a functional interface.
         val samType: Class<*> = lambdaModel.samType.jClass
         // A class where the lambda is declared.
         val declaringClass: Class<*> = lambdaModel.declaringClass.jClass
         // A name of the synthetic method that represents a lambda.
         val lambdaName = lambdaModel.lambdaName
 
-        return if (lambdaModel.lambdaMethodId.isStatic) {
+        val lambda = if (lambdaModel.lambdaMethodId.isStatic) {
             val capturedArguments = lambdaModel.capturedValues
                 .map { model -> CapturedArgument(type = model.classId.jClass, value = value(model)) }
                 .toTypedArray()
@@ -386,12 +388,14 @@ class MockValueConstructor(
                 ?: error("Non-static lambda must capture `this` instance, so there must be at least one captured value")
 
             // Values that the given lambda has captured.
-            val capturedReceiver = value(capturedReceiverModel) ?: error("Captured receiver of lambda must not be null")
+            val capturedReceiver = value(capturedReceiverModel)
             val capturedArguments = lambdaModel.capturedValues.subList(1, lambdaModel.capturedValues.size)
                 .map { model -> CapturedArgument(type = model.classId.jClass, value = value(model)) }
                 .toTypedArray()
             constructLambda(samType, declaringClass, lambdaName, capturedReceiver, *capturedArguments)
         }
+        constructedObjects[lambdaModel] = lambda
+        return lambda
     }
 
     /**

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

@@ -9,6 +9,7 @@ import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtClassRefModel
 import org.utbot.framework.plugin.api.UtCompositeModel
 import org.utbot.framework.plugin.api.UtEnumConstantModel
+import org.utbot.framework.plugin.api.UtLambdaModel
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtNullModel
 import org.utbot.framework.plugin.api.UtPrimitiveModel
@@ -82,8 +83,13 @@ class UtModelConstructor(
      *
      * Handles cache on stateBefore values.
      */
-    override fun construct(value: Any?, classId: ClassId): UtModel =
-        when (value) {
+    override fun construct(value: Any?, classId: ClassId): UtModel {
+        objectToModelCache[value]?.let { model ->
+            if (model is UtLambdaModel) {
+                return model
+            }
+        }
+        return when (value) {
             null -> UtNullModel(classId)
             is Unit -> UtVoidModel
             is Byte,
@@ -107,6 +113,7 @@ class UtModelConstructor(
             is Class<*> -> constructFromClass(value)
             else -> constructFromAny(value)
         }
+    }
 
     // Q: Is there a way to get rid of duplicated code?