Introduce utbot-modification-analyzer, use only methods that modify fields in Fuzzer

sofurihafe · sofurihafe · commit 61da8f17d6a1 · 2023-07-26T18:28:13.000+03:00
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,6 +28,7 @@ rootProject.name = "utbot"
 include("utbot-core")
 include("utbot-framework")
 include("utbot-framework-api")
+include("utbot-modification-analyzer")
 include("utbot-intellij")
 include("utbot-sample")
 include("utbot-java-fuzzing")
@@ -86,6 +87,3 @@ if (projectType == springEdition || projectType == ultimateEdition) {
     include("utbot-spring-sample")
     include("utbot-spring-test")
 }
-
-
-
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/util/SootUtil.kt b/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()
+        )
+    }
diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/framework/modificators/UtBotFieldModificatorsTest.kt b/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
@@ -193,7 +193,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()
diff --git a/utbot-framework/build.gradle b/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-modification-analyzer')
 
     implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
     implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/OptionalWrapper.kt b/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
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/StreamWrappers.kt b/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
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/assemble/AssembleModelGenerator.kt b/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
@@ -490,7 +490,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) ->
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/context/spring/SpringIntegrationTestConcreteExecutionContext.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/context/spring/SpringIntegrationTestConcreteExecutionContext.kt
@@ -87,7 +87,7 @@ class SpringIntegrationTestConcreteExecutionContext(
                 springApplicationContext.getBeansAssignableTo(classId).map { it.beanName }
             },
             relevantRepositories = relevantRepositories
-        ).withFallback(anyObjectValueProvider(idGenerator, isSpringProject = true))
+        ).withFallback(anyObjectValueProvider(idGenerator, shouldMutateWithMethods = true))
 
         return delegateContext.tryCreateValueProvider(concreteExecutor, classUnderTest, idGenerator)
             .except { p -> p is ObjectValueProvider }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/modifications/AnalysisUtils.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/modifications/AnalysisUtils.kt
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/util/EngineUtils.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/util/EngineUtils.kt
@@ -3,41 +3,18 @@ package org.utbot.framework.util
 import mu.KotlinLogging
 import org.utbot.common.logException
 import org.utbot.framework.plugin.api.util.constructor.ValueConstructor
-import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.MissingState
 import org.utbot.framework.plugin.api.UtSymbolicExecution
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtMethodTestSet
 import org.utbot.framework.plugin.api.UtMethodValueTestSet
 import org.utbot.framework.plugin.api.UtVoidModel
-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 java.util.concurrent.atomic.AtomicInteger
-import soot.SootMethod
 
 
 private val logger = KotlinLogging.logger {  }
 
-/**
- * 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()
-        )
-    }
-
-val instanceCounter = AtomicInteger(0)
+private val instanceCounter = AtomicInteger(0)
 
 fun nextModelName(base: String): String = "$base${instanceCounter.incrementAndGet()}"
 
diff --git a/utbot-java-fuzzing/build.gradle.kts b/utbot-java-fuzzing/build.gradle.kts
@@ -18,6 +18,7 @@ tasks {
 dependencies {
     implementation(project(":utbot-framework-api"))
     api(project(":utbot-fuzzing"))
+    api(project(":utbot-modification-analyzer"))
 
     implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
         exclude(group="com.google.guava", module="guava")
diff --git a/utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/providers/Objects.kt b/utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/providers/Objects.kt
@@ -13,6 +13,9 @@ import java.lang.reflect.Field
 import java.lang.reflect.Member
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
+import java.lang.reflect.TypeVariable
+import org.utbot.modifications.AnalysisMode
+import org.utbot.modifications.UtBotFieldsModificatorsSearcher
 
 private val logger = KotlinLogging.logger {}
 
@@ -31,14 +34,14 @@ private fun isIgnored(type: ClassId): Boolean {
             || (type.isInner && !type.isStatic)
 }
 
-fun anyObjectValueProvider(idGenerator: IdentityPreservingIdGenerator<Int>, isSpringProject: Boolean = false) =
-    ObjectValueProvider(idGenerator, isSpringProject).letIf(UtSettings.fuzzingImplementationOfAbstractClasses) { ovp ->
+fun anyObjectValueProvider(idGenerator: IdentityPreservingIdGenerator<Int>, shouldMutateWithMethods: Boolean = false) =
+    ObjectValueProvider(idGenerator, shouldMutateWithMethods).letIf(UtSettings.fuzzingImplementationOfAbstractClasses) { ovp ->
         ovp.withFallback(AbstractsObjectValueProvider(idGenerator))
     }
 
 class ObjectValueProvider(
     val idGenerator: IdGenerator<Int>,
-    private val isSpringProject: Boolean,
+    private val shouldMutateWithMethods: Boolean,
 ) : ValueProvider<FuzzedType, FuzzedValue, FuzzedDescription> {
 
     override fun accept(type: FuzzedType) = !isIgnored(type.classId)
@@ -101,8 +104,8 @@ class ObjectValueProvider(
                         }
                     }
                 }
-                if (isSpringProject) {
-                    findAllPublicMethods(description, classId, description.description.packageName).forEach { md ->
+                if (true || shouldMutateWithMethods) {
+                    findAllAvailableMethods(description, classId, description.description.packageName).forEach { md ->
                         yield(Routine.Call(md.parameterTypes) { self, values ->
                             val model = self.model as UtAssembleModel
                             model.modificationsChain as MutableList +=
@@ -260,14 +263,20 @@ internal fun findAccessibleModifiableFields(description: FuzzedDescription?, cla
     }.toList()
 }
 
-internal fun findAllPublicMethods(
+/**
+ * text.
+ */
+internal fun findAllAvailableMethods(
     description: FuzzedDescription?,
     classId: ClassId,
     packageName: String?
-): List<MethodDescription> =
-    classId.jClass.declaredMethods.mapNotNull { method ->
+): List<MethodDescription> {
+    val modifyingMethods = findModifyingMethodNames(classId)
+    return classId.jClass.declaredMethods.mapNotNull { method ->
         if (isAccessible(method, packageName)) {
-            if (method.genericParameterTypes.any { it !is Class<*> }) return@mapNotNull null
+            if (method.name !in modifyingMethods) return@mapNotNull null
+            if (method.genericParameterTypes.any { it is TypeVariable<*> }) return@mapNotNull null
+
             val parameterTypes =
                 method
                     .parameterTypes
@@ -287,11 +296,7 @@ internal fun findAllPublicMethods(
             )
         } else null
     }
-
-internal fun List<MethodDescription>.removeSetters(): List<MethodDescription> =
-    filterNot { md ->
-        md.method.name.startsWith("set") && md.method.parameterCount == 1
-    }
+}
 
 internal fun Class<*>.findPublicSetterGetterIfHasPublicGetter(field: Field, packageName: String?): PublicSetterGetter? {
     @Suppress("DEPRECATION") val postfixName = field.name.capitalize()
@@ -325,7 +330,16 @@ internal fun isAccessible(clazz: Class<*>, packageName: String?): Boolean {
             (packageName != null && isNotPrivateOrProtected(clazz.modifiers) && clazz.`package`?.name == packageName)
 }
 
+private fun findModifyingMethodNames(classId: ClassId) =
+    UtBotFieldsModificatorsSearcher()
+        .let { searcher ->
+            searcher.update(setOf(classId))
+            searcher.getModificatorToFields(AnalysisMode.AllModificators)
+                .keys
+                .mapTo(mutableSetOf()) { it.name }
+        }
+
 private fun isNotPrivateOrProtected(modifiers: Int): Boolean {
     val hasAnyAccessModifier = Modifier.isPrivate(modifiers) || Modifier.isProtected(modifiers)
     return !hasAnyAccessModifier
-}
+}
diff --git a/utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/spring/SpringBeanValueProvider.kt b/utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/spring/SpringBeanValueProvider.kt
@@ -9,10 +9,10 @@ import org.utbot.fuzzer.FuzzedValue
 import org.utbot.fuzzer.IdGenerator
 import org.utbot.fuzzer.fuzzed
 import org.utbot.fuzzing.*
+import org.utbot.fuzzing.providers.MethodDescription
 import org.utbot.fuzzing.providers.SPRING_BEAN_PROP
-import org.utbot.fuzzing.providers.findAllPublicMethods
+import org.utbot.fuzzing.providers.findAllAvailableMethods
 import org.utbot.fuzzing.providers.nullRoutine
-import org.utbot.fuzzing.providers.removeSetters
 
 class SpringBeanValueProvider(
     private val idGenerator: IdGenerator<Int>,
@@ -62,7 +62,11 @@ class SpringBeanValueProvider(
                                 )
                             })
                         }
-                        findAllPublicMethods(description, type.classId, description.description.packageName)
+                        /**
+                         * We find all methods that are public, accessible, are not setters and modify at least one field.
+                         * We don't take setters because they may
+                         */
+                        findAllAvailableMethods(description, type.classId, description.description.packageName)
                             .removeSetters()
                             .forEach { md ->
                                 yield(Routine.Call(md.parameterTypes) { self, values ->
@@ -81,4 +85,9 @@ class SpringBeanValueProvider(
             )
         }
     }
+
+    private fun List<MethodDescription>.removeSetters(): List<MethodDescription> =
+        filterNot { md ->
+            md.method.name.startsWith("set") && md.method.parameterCount == 1
+        }
 }
diff --git a/utbot-modification-analyzer/build.gradle.kts b/utbot-modification-analyzer/build.gradle.kts
@@ -0,0 +1,9 @@
+val sootVersion: String by rootProject
+
+dependencies {
+    api(project(":utbot-framework-api"))
+
+    implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
+        exclude(group="com.google.guava", module="guava")
+    }
+}
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/AnalysisMode.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/AnalysisMode.kt
@@ -1,4 +1,4 @@
-package org.utbot.framework.modifications
+package org.utbot.modifications
 
 /**
  * Restrictions on demanded modificators
@@ -19,4 +19,6 @@ enum class AnalysisMode {
      * Search constructors only
      */
     Constructors,
+
+    // TODO?: add all modificators without constructors (methods only)
 }
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/ConstructorAnalyzer.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/ConstructorAnalyzer.kt
@@ -1,4 +1,4 @@
-package org.utbot.framework.modifications
+package org.utbot.modifications
 
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ConstructorId
@@ -7,7 +7,8 @@ import org.utbot.framework.plugin.api.id
 import org.utbot.framework.plugin.api.util.isArray
 import org.utbot.framework.plugin.api.util.isRefType
 import org.utbot.framework.plugin.api.util.jClass
-import org.utbot.framework.util.kotlinIntrinsicsClassId
+import org.utbot.modifications.util.kotlinIntrinsicsClassId
+import org.utbot.modifications.util.retrieveJimpleBody
 import soot.Scene
 import soot.SootMethod
 import soot.Type
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/DirectAccessorsAnalyzer.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/DirectAccessorsAnalyzer.kt
@@ -1,4 +1,4 @@
-package org.utbot.framework.modifications
+package org.utbot.modifications
 
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.DirectFieldAccessId
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/ExecutablesAnalyzer.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/ExecutablesAnalyzer.kt
@@ -1,11 +1,12 @@
-package org.utbot.framework.modifications
+package org.utbot.modifications
 
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.id
 import org.utbot.framework.plugin.api.util.fieldId
 import org.utbot.framework.util.executableId
+import org.utbot.modifications.util.retrieveJimpleBody
 import soot.Scene
 import soot.SootMethod
 import soot.jimple.InvokeExpr
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/StatementInfo.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/StatementInfo.kt
@@ -1,4 +1,4 @@
-package org.utbot.framework.modifications
+package org.utbot.modifications
 
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ExecutableId
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/StatementsStorage.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/StatementsStorage.kt
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/UtBotFieldsModificatorsSearcher.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/UtBotFieldsModificatorsSearcher.kt
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/util/KotlinIntrinsicsUtil.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/util/KotlinIntrinsicsUtil.kt
diff --git a/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/util/SootUtil.kt b/utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/util/SootUtil.kt
