Fix CI

Author: sofurihafe

settings.gradle.kts

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

utbot-framework/build.gradle

@@ -14,7 +14,7 @@ dependencies {
     api project(':utbot-summary')
     api project(':utbot-framework-api')
     api project(':utbot-rd')
-    api project(':utbot-modification-analyzer')
+    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/framework/util/EngineUtils.kt

@@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger
 
 private val logger = KotlinLogging.logger {  }
 
-private val instanceCounter = AtomicInteger(0)
+val instanceCounter = AtomicInteger(0)
 
 fun nextModelName(base: String): String = "$base${instanceCounter.incrementAndGet()}"
 

utbot-java-fuzzing/build.gradle.kts

@@ -5,7 +5,7 @@ val rgxgenVersion: String by rootProject
 dependencies {
     implementation(project(":utbot-framework-api"))
     api(project(":utbot-fuzzing"))
-    api(project(":utbot-modification-analyzer"))
+    api(project(":utbot-modificators-analyzer"))
 
     implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") {
         exclude(group="com.google.guava", module="guava")

utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/providers/Objects.kt

@@ -104,7 +104,7 @@ class ObjectValueProvider(
                         }
                     }
                 }
-                if (true || shouldMutateWithMethods) {
+                if (shouldMutateWithMethods) {
                     findAllAvailableMethods(description, classId, description.description.packageName).forEach { md ->
                         yield(Routine.Call(md.parameterTypes) { self, values ->
                             val model = self.model as UtAssembleModel
@@ -263,9 +263,6 @@ internal fun findAccessibleModifiableFields(description: FuzzedDescription?, cla
     }.toList()
 }
 
-/**
- * text.
- */
 internal fun findAllAvailableMethods(
     description: FuzzedDescription?,
     classId: ClassId,
@@ -334,7 +331,7 @@ private fun findModifyingMethodNames(classId: ClassId) =
     UtBotFieldsModificatorsSearcher()
         .let { searcher ->
             searcher.update(setOf(classId))
-            searcher.getModificatorToFields(AnalysisMode.AllModificators)
+            searcher.getModificatorToFields(AnalysisMode.Methods)
                 .keys
                 .mapTo(mutableSetOf()) { it.name }
         }

utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/spring/SpringBeanValueProvider.kt

@@ -80,12 +80,7 @@ class SpringBeanValueProvider(
                                 }
                             })
                         }
-                        /**
-                         * 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 ->
                                     val model = self.model as UtAssembleModel
@@ -103,9 +98,4 @@ class SpringBeanValueProvider(
             )
         }
     }
-
-    private fun List<MethodDescription>.removeSetters(): List<MethodDescription> =
-        filterNot { md ->
-            md.method.name.startsWith("set") && md.method.parameterCount == 1
-        }
 }

utbot-modification-analyzer/build.gradle.kts renamed to utbot-modificators-analyzer/build.gradle.kts

@@ -1,7 +1,7 @@
 package org.utbot.modifications
 
 /**
- * Restrictions on demanded modificators
+ * Restrictions on demanded modifications
  */
 enum class AnalysisMode {
 
@@ -20,5 +20,9 @@ enum class AnalysisMode {
      */
     Constructors,
 
-    // TODO?: add all modificators without constructors (methods only)
+    /**
+     * Look for methods that modify fields.
+     * Setters are excluded.
+     */
+    Methods,
 }

utbot-modification-analyzer/src/main/kotlin/org/utbot/modifications/AnalysisMode.kt renamed to utbot-modificators-analyzer/src/main/kotlin/org/utbot/modifications/AnalysisMode.kt

@@ -1,13 +1,15 @@
 package org.utbot.modifications
 
 import org.utbot.modifications.AnalysisMode.AllModificators
+import org.utbot.modifications.AnalysisMode.Methods
 import org.utbot.modifications.AnalysisMode.Constructors
 import org.utbot.modifications.AnalysisMode.SettersAndDirectAccessors
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ConstructorId
 import org.utbot.framework.plugin.api.DirectFieldAccessId
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.FieldId
+import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.StatementId
 
 /**
@@ -91,12 +93,15 @@ class StatementsStorage {
         statementId: StatementId,
         analysisMode: AnalysisMode,
     ): Set<FieldId> {
+        fun isSetterOrDirectAccessor(statementId: StatementId, fields: Set<FieldId>): Boolean =
+            isSetterOrDirectAccessor(statementId) && fields.size == 1
+
         val fields = items[statementId]?.allModifiedFields ?: return emptySet()
 
         return when (analysisMode) {
             AllModificators -> fields
-            SettersAndDirectAccessors -> if (isSetterOrDirectAccessor(statementId) && fields.size == 1) fields else emptySet()
-            // TODO: add Methods -> { ... }
+            Methods -> if (statementId is MethodId && !isSetterOrDirectAccessor(statementId, fields)) fields else emptySet()
+            SettersAndDirectAccessors -> if (isSetterOrDirectAccessor(statementId, fields)) fields else emptySet()
             Constructors -> if (statementId is ConstructorId) fields else emptySet()
         }
     }