merge

Author: DaniilStepanov

utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt

@@ -245,27 +245,17 @@ object UtSettings : AbstractSettings(logger, defaultKeyForSettingsPath, defaultS
     /**
      * Set to true to use grey-box fuzzing
      */
-    var useGreyBoxFuzzing: Boolean by getBooleanProperty(true)
+    var useGreyBoxFuzzing: Boolean by getBooleanProperty(false)
 
     /**
      * Set to true to use UtCompositeModels in grey-box fuzzing process
      */
-    var useCompositeModelsInGreyBoxFuzzing: Boolean by getBooleanProperty(true)
-
-    /**
-     * Set to true to use grey-box fuzzing
-     */
-    var useGreyBoxFuzzing: Boolean by getBooleanProperty(true)
+    var useCompositeModelsInGreyBoxFuzzing: Boolean by getBooleanProperty(false)
 
     /**
      * Set to true to use grey-box fuzzing in competition mode (without asserts generation)
      */
-    var greyBoxFuzzingCompetitionMode: Boolean by getBooleanProperty(true)
-
-    /**
-     * Set to true to use UtCompositeModels in grey-box fuzzing process
-     */
-    var useCompositeModelsInGreyBoxFuzzing: Boolean by getBooleanProperty(false)
+    var greyBoxFuzzingCompetitionMode: Boolean by getBooleanProperty(false)
 
     /**
      * Set the total attempts to improve coverage by fuzzer.

utbot-framework/build.gradle

@@ -6,6 +6,7 @@ repositories {
 
 configurations {
     z3native
+    fetchInstrumentationJar
 }
 
 dependencies {
@@ -50,6 +51,7 @@ dependencies {
     z3native group: 'com.microsoft.z3', name: 'z3-native-win64', version: z3Version, ext: 'zip'
     z3native group: 'com.microsoft.z3', name: 'z3-native-linux64', version: z3Version, ext: 'zip'
     z3native group: 'com.microsoft.z3', name: 'z3-native-osx', version: z3Version, ext: 'zip'
+    fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration:'instrumentationArchive')
 }
 
 processResources {
@@ -58,4 +60,7 @@ processResources {
             into "lib/x64"
         }
     }
+    from(configurations.fetchInstrumentationJar) {
+        into "lib"
+    }
 }

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

@@ -32,6 +32,8 @@ 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.FuzzerConcreteExecutor
+import org.utbot.framework.concrete.UtFuzzingExecutionInstrumentation
 import org.utbot.framework.util.convertToAssemble
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.Step
@@ -48,6 +50,8 @@ import ru.vyarus.java.generics.resolver.context.GenericsInfoFactory
 import org.utbot.instrumentation.instrumentation.execution.UtConcreteExecutionData
 import org.utbot.instrumentation.instrumentation.execution.UtConcreteExecutionResult
 import org.utbot.instrumentation.instrumentation.execution.UtExecutionInstrumentation
+import org.utbot.instrumentation.instrumentation.execution.constructors.UtModelConstructor
+import org.utbot.instrumentation.instrumentation.execution.phases.ValueConstructionContext
 import soot.jimple.Stmt
 import soot.tagkit.ParamNamesTag
 import java.lang.reflect.Method
@@ -442,8 +446,7 @@ class UtBotSymbolicEngine(
                         collectConstantsForGreyBoxFuzzer(methodUnderTest.sootMethod, utModelConstructor),
                         fuzzerUtModelConstructor,
                         FuzzerConcreteExecutor(
-                            concreteExecutor.pathsToUserClasses,
-                            concreteExecutor.pathsToDependencyClasses
+                            concreteExecutor.pathsToUserClasses
                         )::execute,
                         ValueConstructionContext(UtFuzzingExecutionInstrumentation.instrumentationContext, true)::constructParameters,
                         timeBudget