Allow Fuzzer use all class under test public methods #2344 (#2444)

Author: sofurihafe

settings.gradle.kts

@@ -28,6 +28,7 @@ rootProject.name = "utbot"
 include("utbot-core")
 include("utbot-framework")
 include("utbot-framework-api")
+include("utbot-modificators-analyzer")
 include("utbot-intellij")
 include("utbot-sample")
 include("utbot-java-fuzzing")

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

@@ -826,6 +826,7 @@ sealed class UtStatementCallModel(
     override val instance: UtReferenceModel?,
     open val statement: StatementId,
     open val params: List<UtModel>,
+    var thrownConcreteException: ClassId? = null
 ): UtStatementModel(instance) {
     override fun toString() = withToStringThreadLocalReentrancyGuard {
         buildString {

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

@@ -0,0 +1,25 @@
+package org.utbot.framework.util
+
+import org.utbot.framework.plugin.api.ExecutableId
+import org.utbot.framework.plugin.api.classId
+import org.utbot.framework.plugin.api.id
+import org.utbot.framework.plugin.api.util.constructorId
+import org.utbot.framework.plugin.api.util.methodId
+import soot.SootMethod
+
+/**
+ * Gets method or constructor id of SootMethod.
+ */
+val SootMethod.executableId: ExecutableId
+    get() = when {
+        isConstructor -> constructorId(
+            classId = declaringClass.id,
+            arguments = parameterTypes.map { it.classId }.toTypedArray()
+        )
+        else -> methodId(
+            classId = declaringClass.id,
+            name = name,
+            returnType = returnType.classId,
+            arguments = parameterTypes.map { it.classId }.toTypedArray()
+        )
+    }

utbot-framework-test/src/test/kotlin/org/utbot/framework/modificators/UtBotFieldModificatorsTest.kt

@@ -12,10 +12,10 @@ import org.utbot.examples.modificators.StronglyConnectedComponents
 import org.utbot.examples.modificators.coupling.ClassA
 import org.utbot.examples.modificators.coupling.ClassB
 import org.utbot.examples.modificators.hierarchy.InheritedModifications
-import org.utbot.framework.modifications.AnalysisMode
-import org.utbot.framework.modifications.AnalysisMode.AllModificators
-import org.utbot.framework.modifications.AnalysisMode.SettersAndDirectAccessors
-import org.utbot.framework.modifications.UtBotFieldsModificatorsSearcher
+import org.utbot.modifications.AnalysisMode
+import org.utbot.modifications.AnalysisMode.AllModificators
+import org.utbot.modifications.AnalysisMode.SettersAndDirectAccessors
+import org.utbot.modifications.UtBotFieldsModificatorsSearcher
 import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.id
 import kotlin.reflect.KClass
@@ -24,9 +24,9 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.utbot.common.nameOfPackage
 import org.utbot.framework.plugin.services.JdkInfoDefaultProvider
 import org.utbot.framework.util.SootUtils
+import org.utbot.modifications.ModificationTransformationMode
 
 internal class UtBotFieldModificatorsTest {
     private lateinit var fieldsModificatorsSearcher: UtBotFieldsModificatorsSearcher
@@ -176,7 +176,9 @@ internal class UtBotFieldModificatorsTest {
             forceReload = false,
             jdkInfo = JdkInfoDefaultProvider().info
         )
-        fieldsModificatorsSearcher = UtBotFieldsModificatorsSearcher()
+        fieldsModificatorsSearcher = UtBotFieldsModificatorsSearcher(
+            modificationTransformationMode = ModificationTransformationMode.WriteOnly
+        )
     }
 
     private fun runUpdate(classes: Set<KClass<*>>) {
@@ -193,7 +195,7 @@ internal class UtBotFieldModificatorsTest {
 
     //We use sorting here to make comparing with sorted in advance expected collections easier
     private fun runFieldModificatorsSearch(analysisMode: AnalysisMode) =
-        fieldsModificatorsSearcher.findModificators(analysisMode)
+        fieldsModificatorsSearcher.getFieldToModificators(analysisMode)
             .map { (key, value) ->
                 val modificatorNames = value.filterNot { it.name.startsWith("direct_set_") }.map { it.name }
                 key.name to modificatorNames.toSortedSet()

utbot-framework/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     api project(':utbot-summary')
     api project(':utbot-framework-api')
     api project(':utbot-rd')
+    api project(':utbot-modificators-analyzer')
 
     implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
     implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion

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

@@ -16,7 +16,6 @@ import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
 import org.utbot.framework.plugin.api.UtNullModel
 import org.utbot.framework.plugin.api.UtPrimitiveModel
-import org.utbot.framework.plugin.api.UtStatementModel
 import org.utbot.framework.plugin.api.classId
 import org.utbot.framework.plugin.api.id
 import org.utbot.framework.plugin.api.util.defaultValueModel

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

@@ -13,13 +13,11 @@ import org.utbot.framework.plugin.api.UtExecutableCallModel
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtNullModel
 import org.utbot.framework.plugin.api.UtPrimitiveModel
-import org.utbot.framework.plugin.api.UtStatementModel
 import org.utbot.framework.plugin.api.classId
 import org.utbot.framework.plugin.api.util.defaultValueModel
 import org.utbot.framework.plugin.api.util.doubleArrayClassId
 import org.utbot.framework.plugin.api.util.doubleClassId
 import org.utbot.framework.plugin.api.util.doubleStreamClassId
-import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.intArrayClassId
 import org.utbot.framework.plugin.api.util.intClassId
 import org.utbot.framework.plugin.api.util.intStreamClassId

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

@@ -537,7 +537,7 @@ class UtBotSymbolicEngine(
 
             emit(
                 UtFuzzedExecution(
-                    stateBefore = stateBefore,
+                    stateBefore = concreteExecutionResult.stateBefore,
                     stateAfter = concreteExecutionResult.stateAfter,
                     result = concreteExecutionResult.result,
                     coverage = concreteExecutionResult.coverage,

utbot-framework/src/main/kotlin/org/utbot/framework/assemble/AssembleModelGenerator.kt

@@ -7,10 +7,10 @@ import org.utbot.engine.ResolvedExecution
 import org.utbot.engine.ResolvedModels
 import org.utbot.framework.UtSettings
 import org.utbot.framework.codegen.util.isAccessibleFrom
-import org.utbot.framework.modifications.AnalysisMode.SettersAndDirectAccessors
-import org.utbot.framework.modifications.ConstructorAnalyzer
-import org.utbot.framework.modifications.ConstructorAssembleInfo
-import org.utbot.framework.modifications.UtBotFieldsModificatorsSearcher
+import org.utbot.modifications.AnalysisMode.SettersAndDirectAccessors
+import org.utbot.modifications.ConstructorAnalyzer
+import org.utbot.modifications.ConstructorAssembleInfo
+import org.utbot.modifications.UtBotFieldsModificatorsSearcher
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ConstructorId
 import org.utbot.framework.plugin.api.DirectFieldAccessId
@@ -48,6 +48,7 @@ import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.util.nextModelName
 import java.lang.reflect.Constructor
 import java.util.IdentityHashMap
+import org.utbot.modifications.ModificationTransformationMode
 
 /**
  * Creates [UtAssembleModel] from any [UtModel] or it's inner models if possible
@@ -72,7 +73,10 @@ class AssembleModelGenerator(private val basePackageName: String) {
     //Call chain of statements to create assemble model
     private var callChain = mutableListOf<UtStatementModel>()
 
-    private val modificatorsSearcher = UtBotFieldsModificatorsSearcher()
+    private val modificatorsSearcher =
+        UtBotFieldsModificatorsSearcher(
+            modificationTransformationMode = ModificationTransformationMode.WriteOnly
+        )
     private val constructorAnalyzer = ConstructorAnalyzer()
 
     /**
@@ -492,7 +496,7 @@ class AssembleModelGenerator(private val basePackageName: String) {
      * Finds setters and direct accessors for fields of particular class.
      */
     private fun findSettersAndDirectAccessors(classId: ClassId): Map<FieldId, StatementId> {
-        val allModificatorsOfClass =  modificatorsSearcher.findModificators(SettersAndDirectAccessors)
+        val allModificatorsOfClass =  modificatorsSearcher.getFieldToModificators(SettersAndDirectAccessors)
 
         return allModificatorsOfClass
             .mapNotNull { (fieldId, possibleModificators) ->

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

@@ -260,10 +260,13 @@ open class CgVariableConstructor(val context: CgContext) :
                 is UtStatementCallModel -> {
                     val call = createCgExecutableCallFromUtExecutableCall(statementModel)
                     val equivalentFieldAccess = replaceCgExecutableCallWithFieldAccessIfNeeded(call)
-                    if (equivalentFieldAccess != null)
-                        +equivalentFieldAccess
-                    else
-                        +call
+                    val thrownException = statementModel.thrownConcreteException
+
+                    if (equivalentFieldAccess != null) +equivalentFieldAccess
+                    else if (thrownException != null) {
+                        +tryBlock { +call }
+                            .catch(thrownException) { /* do nothing */ }
+                    } else +call
                 }
             }
         }