Move UtExecutionInstrumentation to utbot-instrumentation module (#1637)

Author: sergeypospelov

utbot-core/src/main/kotlin/org/utbot/common/ReflectionUtil.kt

@@ -22,6 +22,7 @@ object Reflection {
             isAccessible = true
         }
 
+
     @Suppress("UNCHECKED_CAST")
     private val fields: Array<Field> =
         getDeclaredFields0Method.invoke(Field::class.java, false) as Array<Field>
@@ -43,7 +44,7 @@ object Reflection {
     }
 }
 
-inline fun <R> AccessibleObject.withAccessibility(block: () -> R): R {
+inline fun <T : AccessibleObject, R> T.withAccessibility(block: T.() -> R): R {
     val prevAccessibility = isAccessible
     isAccessible = true
 
@@ -64,7 +65,7 @@ inline fun <R> AccessibleObject.withAccessibility(block: () -> R): R {
  *
  * Also note, that primitive static final fields may be inlined, so may not be possible to change.
  */
-inline fun <reified R> Field.withAccessibility(block: () -> R): R {
+inline fun <reified R> Field.withAccessibility(block: Field.() -> R): R {
     val prevModifiers = modifiers
     val prevAccessibility = isAccessible
 

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

@@ -0,0 +1,63 @@
+package org.utbot.framework.plugin.api.util
+
+import org.utbot.common.Reflection
+import org.utbot.framework.plugin.api.FieldId
+import soot.RefType
+
+/**
+ * Several fields are inaccessible in runtime even via reflection
+ */
+val FieldId.isInaccessibleViaReflection: Boolean
+    get() {
+        val declaringClassName = declaringClass.name
+        return declaringClassName in inaccessibleViaReflectionClasses ||
+                (name to declaringClassName) in inaccessibleViaReflectionFields
+    }
+
+val RefType.isInaccessibleViaReflection: Boolean
+    get() {
+        return className in inaccessibleViaReflectionClasses
+    }
+
+private val inaccessibleViaReflectionClasses = setOf(
+    "jdk.internal.reflect.ReflectionFactory",
+    "jdk.internal.reflect.Reflection",
+    "jdk.internal.loader.ClassLoaderValue",
+    "sun.reflect.Reflection",
+)
+
+private val inaccessibleViaReflectionFields = setOf(
+    "security" to "java.lang.System",
+)
+
+@Suppress("DEPRECATION")
+val Class<*>.anyInstance: Any
+    get() {
+//        val defaultCtor = declaredConstructors.singleOrNull { it.parameterCount == 0}
+//        if (defaultCtor != null) {
+//            try {
+//                defaultCtor.isAccessible = true
+//                return defaultCtor.newInstance()
+//            } catch (e : Throwable) {
+//                logger.warn(e) { "Can't create object with default ctor. Fallback to Unsafe." }
+//            }
+//        }
+        return Reflection.unsafe.allocateInstance(this)
+
+//        val constructors = runCatching {
+//            arrayOf(getDeclaredConstructor())
+//        }.getOrElse { declaredConstructors }
+//
+//        return constructors.asSequence().mapNotNull { constructor ->
+//            runCatching {
+//                val parameters = constructor.parameterTypes.map { defaultParameterValue(it) }
+//                val isAccessible = constructor.isAccessible
+//                try {
+//                    constructor.isAccessible = true
+//                    constructor.newInstance(*parameters.toTypedArray())
+//                } finally {
+//                    constructor.isAccessible = isAccessible
+//                }
+//            }.getOrNull()
+//        }.firstOrNull() ?: error("Failed to create instance of $this")
+    }

…e/util/lambda/LambdaConstructionUtils.kt …l/constructor/LambdaConstructionUtils.ktutbot-framework/src/main/kotlin/org/utbot/engine/util/lambda/LambdaConstructionUtils.kt renamed to utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/constructor/LambdaConstructionUtils.kt utbot-framework/src/main/kotlin/org/utbot/engine/util/lambda/LambdaConstructionUtils.kt renamed to utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/constructor/LambdaConstructionUtils.kt

@@ -1,4 +1,4 @@
-package org.utbot.engine.util.lambda
+package org.utbot.framework.plugin.api.util
 
 import java.lang.invoke.LambdaMetafactory
 import java.lang.invoke.MethodHandles
@@ -115,7 +115,7 @@ private fun getSingleAbstractMethod(clazz: Class<*>): Method {
  * @return an [Any] that represents an instance of the given functional interface `samType`
  * and implements its single abstract method with the behavior of the given lambda.
  */
-internal fun constructStaticLambda(
+fun constructStaticLambda(
     samType: Class<*>,
     declaringClass: Class<*>,
     lambdaName: String,
@@ -151,7 +151,7 @@ internal fun constructStaticLambda(
  * @return an [Any] that represents an instance of the given functional interface `samType`
  * and implements its single abstract method with the behavior of the given lambda.
  */
-internal fun constructLambda(
+fun constructLambda(
     samType: Class<*>,
     declaringClass: Class<*>,
     lambdaName: String,

…lin/org/utbot/engine/ValueConstructor.kt …api/util/constructor/ValueConstructor.ktutbot-framework/src/main/kotlin/org/utbot/engine/ValueConstructor.kt renamed to utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/constructor/ValueConstructor.kt utbot-framework/src/main/kotlin/org/utbot/engine/ValueConstructor.kt renamed to utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/constructor/ValueConstructor.kt

@@ -1,11 +1,9 @@
-package org.utbot.engine
+package org.utbot.framework.plugin.api.util.constructor
 
 import org.utbot.common.Reflection
 import org.utbot.common.invokeCatching
+import org.utbot.common.withAccessibility
 import org.utbot.framework.plugin.api.ClassId
-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.ConstructorId
 import org.utbot.framework.plugin.api.EnvironmentModels
 import org.utbot.framework.plugin.api.FieldId
@@ -39,15 +37,16 @@ import org.utbot.framework.plugin.api.UtValueExecution
 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.CapturedArgument
+import org.utbot.framework.plugin.api.util.anyInstance
+import org.utbot.framework.plugin.api.util.constructLambda
+import org.utbot.framework.plugin.api.util.constructStaticLambda
 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.jField
 import org.utbot.framework.plugin.api.util.method
 import org.utbot.framework.plugin.api.util.utContext
-import org.utbot.framework.util.anyInstance
-import org.utbot.instrumentation.process.runSandbox
-import java.lang.reflect.Field
 import java.lang.reflect.Modifier
 import kotlin.reflect.KClass
 
@@ -435,12 +434,12 @@ class ValueConstructor {
     private fun value(model: UtModel) = construct(model, null).value
 
     private fun MethodId.call(args: List<Any?>, instance: Any?): Any? =
-        method.runSandbox {
-            invokeCatching(obj = instance, args = args).getOrThrow()
+        method.withAccessibility {
+            method.invokeCatching(obj = instance, args = args).getOrThrow()
         }
 
     private fun ConstructorId.call(args: List<Any?>): Any? =
-        constructor.runSandbox {
+        constructor.withAccessibility {
             newInstance(*args.toTypedArray())
         }
 

utbot-framework-test/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt

@@ -57,13 +57,14 @@ import org.utbot.framework.plugin.api.util.intClassId
 import org.utbot.framework.plugin.services.JdkInfoDefaultProvider
 import org.utbot.framework.util.SootUtils
 import org.utbot.framework.util.instanceCounter
-import org.utbot.framework.util.modelIdCounter
+import java.util.concurrent.atomic.AtomicInteger
 import kotlin.reflect.full.functions
 
 /**
  * Test classes must be located in the same folder as [AssembleTestUtils] class.
  */
 class AssembleModelGeneratorTests {
+    val modelIdCounter = AtomicInteger(0)
 
     private lateinit var context: AutoCloseable
     private lateinit var statementsChain: MutableList<String>

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

@@ -11,7 +11,6 @@ import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.id
 import org.utbot.framework.plugin.api.util.id
-import org.utbot.framework.plugin.api.util.isRefType
 import org.utbot.framework.util.executableId
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.reflect.KFunction2
@@ -20,7 +19,7 @@ import kotlinx.collections.immutable.persistentListOf
 import org.utbot.common.nameOfPackage
 import org.utbot.engine.types.OBJECT_TYPE
 import org.utbot.engine.util.mockListeners.MockListenerController
-import org.utbot.framework.util.isInaccessibleViaReflection
+import org.utbot.framework.plugin.api.util.isInaccessibleViaReflection
 import soot.BooleanType
 import soot.RefType
 import soot.Scene

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

@@ -101,6 +101,7 @@ import org.utbot.engine.types.TypeRegistry
 import org.utbot.engine.types.TypeResolver
 import org.utbot.framework.plugin.api.visible.UtStreamConsumingException
 import org.utbot.framework.plugin.api.UtStreamConsumingFailure
+import org.utbot.framework.plugin.api.util.constructor.ValueConstructor
 import org.utbot.framework.plugin.api.util.isStatic
 
 // hack

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

@@ -127,7 +127,7 @@ import org.utbot.framework.plugin.api.util.isConstructor
 import org.utbot.framework.plugin.api.util.utContext
 import org.utbot.framework.util.executableId
 import org.utbot.framework.util.graph
-import org.utbot.framework.util.isInaccessibleViaReflection
+import org.utbot.framework.plugin.api.util.isInaccessibleViaReflection
 import java.lang.reflect.ParameterizedType
 import kotlin.collections.plus
 import kotlin.collections.plusAssign

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

@@ -32,9 +32,7 @@ import org.utbot.framework.UtSettings.pathSelectorStepsLimit
 import org.utbot.framework.UtSettings.pathSelectorType
 import org.utbot.framework.UtSettings.processUnknownStatesDuringConcreteExecution
 import org.utbot.framework.UtSettings.useDebugVisualization
-import org.utbot.framework.concrete.UtConcreteExecutionData
-import org.utbot.framework.concrete.UtConcreteExecutionResult
-import org.utbot.framework.concrete.UtExecutionInstrumentation
+import org.utbot.framework.util.convertToAssemble
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.Step
 import org.utbot.framework.plugin.api.util.*
@@ -44,6 +42,9 @@ import org.utbot.fuzzer.*
 import org.utbot.fuzzing.*
 import org.utbot.fuzzing.utils.Trie
 import org.utbot.instrumentation.ConcreteExecutor
+import org.utbot.instrumentation.instrumentation.execution.UtConcreteExecutionData
+import org.utbot.instrumentation.instrumentation.execution.UtConcreteExecutionResult
+import org.utbot.instrumentation.instrumentation.execution.UtExecutionInstrumentation
 import soot.jimple.Stmt
 import soot.tagkit.ParamNamesTag
 import java.lang.reflect.Method
@@ -151,7 +152,6 @@ class UtBotSymbolicEngine(
         ConcreteExecutor(
             UtExecutionInstrumentation,
             classpath,
-            dependencyPaths
         ).apply { this.classLoader = utContext.classLoader }
 
     private val featureProcessor: FeatureProcessor? =
@@ -564,7 +564,10 @@ private suspend fun ConcreteExecutor<UtConcreteExecutionResult, UtExecutionInstr
     methodUnderTest.classId.name,
     methodUnderTest.signature,
     arrayOf(),
-    parameters = UtConcreteExecutionData(stateBefore, instrumentation)
+    parameters = UtConcreteExecutionData(
+        stateBefore,
+        instrumentation
+    )
 ).convertToAssemble(methodUnderTest.classId.packageName)
 
 /**

utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt

@@ -10,9 +10,9 @@ import org.utbot.framework.codegen.domain.NoStaticMocking
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.framework.codegen.services.language.CgLanguageAssistant
-import org.utbot.framework.concrete.UtConcreteExecutionData
-import org.utbot.framework.concrete.UtConcreteExecutionResult
-import org.utbot.framework.concrete.UtExecutionInstrumentation
+import org.utbot.instrumentation.instrumentation.execution.UtConcreteExecutionData
+import org.utbot.instrumentation.instrumentation.execution.UtConcreteExecutionResult
+import org.utbot.instrumentation.instrumentation.execution.UtExecutionInstrumentation
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.framework.plugin.api.MockFramework
@@ -71,7 +71,6 @@ object UtBotJavaApi {
         val concreteExecutor = ConcreteExecutor(
             UtExecutionInstrumentation,
             classpath,
-            dependencyClassPath
         )
 
         testSets.addAll(generateUnitTests(concreteExecutor, methodsForGeneration, classUnderTest))