Merge branch 'tmp' into HEAD

# Conflicts:
#	utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt
#	utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgMethodConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgTestClassConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/ConcreteExecutor.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/BigNumberConstructor.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/BitSetConstructor.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/DateTimeConstructors.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/FuzzerConcreteExecutor.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/LocaleConstructor.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UUIDConstructor.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtExecutionInstrumentationWithStatsCollection.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtFuzzingExecutionInstrumentation.kt
#	utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt
#	utbot-junit-contest/src/main/kotlin/org/utbot/contest/GreyBoxFuzzerContest.kt

Author: DaniilStepanov

settings.gradle.kts

@@ -23,6 +23,7 @@ include("utbot-intellij")
 include("utbot-sample")
 include("utbot-fuzzers")
 include("utbot-fuzzing")
+include("utbot-greyboxfuzzer")
 include("utbot-junit-contest")
 include("utbot-analytics")
 include("utbot-analytics-torch")

utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt

@@ -40,7 +40,6 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
-import org.utbot.engine.greyboxfuzzer.util.CustomClassLoader
 
 private const val LONG_GENERATION_TIMEOUT = 1_200_000L
 
@@ -146,11 +145,16 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
         val classRelativePath = classFqnToPath(classFqn) + ".class"
         val classAbsoluteURL = classLoader.getResource(classRelativePath) ?: return null
         val classAbsolutePath =
-            if (classAbsoluteURL.toURI().scheme == "jar") {
-                replaceSeparator(classAbsoluteURL.file.removePrefix("file:"))
-                    .removeSuffix(classRelativePath)
-                    .removeSuffix("/")
-                    .removeSuffix("!")
+            if (UtSettings.useGreyBoxFuzzing) {
+                if (classAbsoluteURL.toURI().scheme == "jar") {
+                    replaceSeparator(classAbsoluteURL.file.removePrefix("file:"))
+                        .removeSuffix(classRelativePath)
+                        .removeSuffix("/")
+                        .removeSuffix("!")
+                } else {
+                    replaceSeparator(classAbsoluteURL.toPath().toString())
+                        .removeSuffix(classRelativePath)
+                }
             } else {
                 replaceSeparator(classAbsoluteURL.toPath().toString())
                     .removeSuffix(classRelativePath)
@@ -164,17 +168,15 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
         sourceCodeFile: Path? = null,
         searchDirectory: Path,
         chosenClassesToMockAlways: Set<ClassId>
-    ): List<UtMethodTestSet> {
-        CustomClassLoader.classLoader = classLoader
-        return testCaseGenerator.generate(
+    ): List<UtMethodTestSet> =
+        testCaseGenerator.generate(
             targetMethods,
             mockStrategy,
             chosenClassesToMockAlways,
             generationTimeout
         ).map {
             if (sourceCodeFile != null) it.summarize(searchDirectory, sourceCodeFile.toFile()) else it
         }
-    }
 
 
     protected fun withLogger(targetClassFqn: String, block: Runnable) {

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

@@ -252,6 +252,21 @@ object UtSettings : AbstractSettings(logger, defaultKeyForSettingsPath, defaultS
      */
     var useCompositeModelsInGreyBoxFuzzing: Boolean by getBooleanProperty(true)
 
+    /**
+     * Set to true to use grey-box fuzzing
+     */
+    var useGreyBoxFuzzing: Boolean by getBooleanProperty(true)
+
+    /**
+     * 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)
+
     /**
      * Set the total attempts to improve coverage by fuzzer.
      */

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

@@ -70,6 +70,9 @@ class ConcreteExecutionFailureException(cause: Throwable, errorFile: File, val p
             appendLine("Cause:\n${cause.message}")
             appendLine("Last 1000 lines of the error log ${errorFile.absolutePath}:")
             appendLine("----------------------------------------")
+            if (!errorFile.exists()) {
+                errorFile.createNewFile()
+            }
             errorFile.useLines { lines ->
                 val lastLines = LinkedList<String>()
                 for (line in lines) {

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

@@ -5,7 +5,7 @@ import org.utbot.common.currentThreadInfo
 import org.utbot.framework.plugin.api.util.UtContext.Companion.setUtContext
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.ThreadContextElement
-import mu.KotlinLogging
+//import mu.KotlinLogging
 
 val utContext: UtContext
     get() = UtContext.currentContext()
@@ -75,7 +75,7 @@ inline fun <T> withUtContext(context: UtContext, block: () -> T): T = setUtConte
     try {
         return@use block.invoke()
     } catch (e: Exception) {
-        KotlinLogging.logger("withUtContext").error { e }
+        //KotlinLogging.logger("withUtContext").error { e }
         throw e
     }
 }

utbot-framework/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     api project(':utbot-summary')
     api project(':utbot-framework-api')
     api project(':utbot-rd')
+    api project(':utbot-greyboxfuzzer')
 
     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/UtBotSymbolicEngine.kt

@@ -11,7 +11,6 @@ import org.utbot.api.exception.UtMockAssumptionViolatedException
 import org.utbot.common.bracket
 import org.utbot.common.debug
 import org.utbot.engine.MockStrategy.NO_MOCKS
-import org.utbot.engine.greyboxfuzzer.GreyBoxFuzzer
 import org.utbot.engine.pc.*
 import org.utbot.engine.selectors.*
 import org.utbot.engine.selectors.nurs.NonUniformRandomSearch
@@ -42,6 +41,8 @@ import org.utbot.framework.util.sootMethod
 import org.utbot.fuzzer.*
 import org.utbot.fuzzing.*
 import org.utbot.fuzzing.utils.Trie
+import org.utbot.greyboxfuzzer.GreyBoxFuzzer
+import org.utbot.greyboxfuzzer.util.FuzzerUtModelConstructor
 import org.utbot.instrumentation.ConcreteExecutor
 import ru.vyarus.java.generics.resolver.context.GenericsInfoFactory
 import org.utbot.instrumentation.instrumentation.execution.UtConcreteExecutionData
@@ -50,6 +51,7 @@ import org.utbot.instrumentation.instrumentation.execution.UtExecutionInstrument
 import soot.jimple.Stmt
 import soot.tagkit.ParamNamesTag
 import java.lang.reflect.Method
+import java.util.IdentityHashMap
 import kotlin.system.measureTimeMillis
 
 val logger = KotlinLogging.logger {}
@@ -421,27 +423,36 @@ class UtBotSymbolicEngine(
     //Simple fuzzing
     fun greyBoxFuzzing(timeBudget: Long = Long.MAX_VALUE) =
         flow {
-            GenericsInfoFactory.disableCache()
             val isFuzzable = methodUnderTest.parameters.all { classId ->
                 classId != Method::class.java.id // causes the child process crash at invocation
             }
             if (!isFuzzable) {
                 return@flow
             }
+            val utModelConstructor = UtModelConstructor(IdentityHashMap())
+            val fuzzerUtModelConstructor = FuzzerUtModelConstructor(
+                utModelConstructor::construct,
+                utModelConstructor::computeUnusedIdAndUpdate
+            )
 
             try {
                 emitAll(
                     GreyBoxFuzzer(
-                        concreteExecutor.pathsToUserClasses,
-                        concreteExecutor.pathsToDependencyClasses,
                         methodUnderTest,
+                        collectConstantsForGreyBoxFuzzer(methodUnderTest.sootMethod, utModelConstructor),
+                        fuzzerUtModelConstructor,
+                        FuzzerConcreteExecutor(
+                            concreteExecutor.pathsToUserClasses,
+                            concreteExecutor.pathsToDependencyClasses
+                        )::execute,
+                        ValueConstructionContext(UtFuzzingExecutionInstrumentation.instrumentationContext, true)::constructParameters,
                         timeBudget
                     ).fuzz()
                 )
             } catch (e: CancellationException) {
                 logger.debug { "Cancelled by timeout" }
             } catch (e: Throwable) {
-                emit(UtError("Unexpected fuzzing crash", e))
+                emit(UtError("Unexpected fuzzing crash\n${e.stackTraceToString()}", e))
             }
             return@flow
         }
@@ -586,7 +597,7 @@ private fun ResolvedModels.constructStateForMethod(methodUnderTest: ExecutableId
     return EnvironmentModels(thisInstanceBefore, paramsBefore, statics)
 }
 
-private suspend fun ConcreteExecutor<UtConcreteExecutionResult, UtExecutionInstrumentation>.executeConcretely(
+internal suspend fun ConcreteExecutor<UtConcreteExecutionResult, UtExecutionInstrumentation>.executeConcretely(
     methodUnderTest: ExecutableId,
     stateBefore: EnvironmentModels,
     instrumentation: List<UtInstrumentation>

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

@@ -70,7 +70,7 @@ object UtBotJavaApi {
 
         val concreteExecutor = ConcreteExecutor(
             UtExecutionInstrumentation,
-            classpath,
+            classpath
         )
 
         testSets.addAll(generateUnitTests(concreteExecutor, methodsForGeneration, classUnderTest))
@@ -184,7 +184,7 @@ object UtBotJavaApi {
                     generationTimeoutInMillis,
                     generate = { symbolicEngine ->
                         if (isGreyBoxFuzzing) {
-                            symbolicEngine.greyBoxFuzzing()
+                            symbolicEngine.greyBoxFuzzing(generationTimeoutInMillis)
                         } else {
                             symbolicEngine.fuzzing { defaultModelProvider ->
                                 customModelProvider.withFallback(defaultModelProvider)

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/context/CgContext.kt

@@ -551,8 +551,9 @@ data class CgContext(
         }
     }
 
+    private var nestedClassIndex = 0
     private fun createClassIdForNestedClass(testClassModel: TestClassModel): ClassId {
-        val simpleName = "${testClassModel.classUnderTest.simpleName}Test"
+        val simpleName = "${testClassModel.classUnderTest.simpleName}Test${nestedClassIndex++}"
         return BuiltinClassId(
             canonicalName = currentTestClass.canonicalName + "." + simpleName,
             simpleName = simpleName,

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/models/CgElement.kt

@@ -45,6 +45,7 @@ interface CgElement {
             is CgAuxiliaryClass -> visit(element)
             is CgUtilMethod -> visit(element)
             is CgTestMethod -> visit(element)
+            is CgMockMethod -> visit(element)
             is CgErrorTestMethod -> visit(element)
             is CgParameterizedTestDataProviderMethod -> visit(element)
             is CgCommentedAnnotation -> visit(element)
@@ -133,7 +134,7 @@ class CgClass(
     val body: CgClassBody,
     val isStatic: Boolean,
     val isNested: Boolean,
-): CgElement {
+): CgStatement {
     val packageName
         get() = id.packageName
 
@@ -282,6 +283,17 @@ class CgTestMethod(
     override val requiredFields: List<CgParameterDeclaration> = emptyList(),
 ) : CgMethod(false)
 
+class CgMockMethod(
+    override val name: String,
+    override val returnType: ClassId,
+    override val parameters: List<CgParameterDeclaration>,
+    override val statements: List<CgStatement>,
+    override val exceptions: Set<ClassId>,
+    override val annotations: List<CgAnnotation>,
+    override val documentation: CgDocumentationComment = CgDocumentationComment(emptyList()),
+    override val requiredFields: List<CgParameterDeclaration> = emptyList(),
+) : CgMethod(false)
+
 class CgErrorTestMethod(
     override val name: String,
     override val statements: List<CgStatement>,