minor fixes

Author: DaniilStepanov

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

@@ -167,16 +167,15 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
         sourceCodeFile: Path? = null,
         searchDirectory: Path,
         chosenClassesToMockAlways: Set<ClassId>
-    ): List<UtMethodTestSet> {
-        return testCaseGenerator.generate(
+    ): List<UtMethodTestSet> =
+        testCaseGenerator.generate(
             targetMethods,
             mockStrategy,
             chosenClassesToMockAlways,
             generationTimeout
         ).map {
             if (sourceCodeFile != null) it.summarize(sourceCodeFile.toFile(), searchDirectory) else it
         }
-    }
 
 
     protected fun withLogger(targetClassFqn: String, block: Runnable) {

utbot-core/src/main/kotlin/org/utbot/common/FileUtil.kt

@@ -90,10 +90,7 @@ object FileUtil {
 
         for (clazz in classes) {
             val path = clazz.toClassFilePath()
-            val resource =
-                clazz.classLoader.getResource(path)
-                    ?: ClassLoader.getSystemClassLoader().getResource(path)
-                    ?: error("No such file: $path")
+            val resource = clazz.classLoader.getResource(path) ?: error("No such file: $path")
 
             if (resource.toURI().scheme == "jar") {
                 val jarLocation = resource.toURI().extractJarName()

utbot-core/src/main/kotlin/org/utbot/common/KClassUtil.kt

@@ -9,6 +9,7 @@ import java.lang.reflect.Method
  */
 fun Method.invokeCatching(obj: Any?, args: List<Any?>) = try {
     val invocation = invoke(obj, *args.toTypedArray())
+
     Result.success(invocation)
 } catch (e: InvocationTargetException) {
     Result.failure<Nothing>(e.targetException)

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

@@ -239,7 +239,7 @@ object UtSettings : AbstractSettings(logger, defaultKeyForSettingsPath, defaultS
     /**
      * Set to true to start fuzzing if symbolic execution haven't return anything
      */
-    var useFuzzing: Boolean by getBooleanProperty(false)
+    var useFuzzing: Boolean by getBooleanProperty(true)
 
     /**
      * Set to true to use grey-box fuzzing
@@ -254,7 +254,7 @@ object UtSettings : AbstractSettings(logger, defaultKeyForSettingsPath, defaultS
     /**
      * Set to true to use UtCompositeModels in grey-box fuzzing process
      */
-    var useCompositeModelsInGreyBoxFuzzing: Boolean by getBooleanProperty(true)
+    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

@@ -1,6 +1,5 @@
 package org.utbot.framework.plugin.api
 
-import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.framework.plugin.api.visible.UtStreamConsumingException
 import java.io.File
 import java.util.LinkedList

utbot-framework/build.gradle

@@ -35,10 +35,6 @@ dependencies {
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion
     implementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion
     implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsTextVersion
-    implementation "org.javaruntype:javaruntype:1.3"
-    implementation "ru.vyarus:generics-resolver:3.0.3"
-    implementation "ognl:ognl:3.3.2"
-
     // we need this for construction mocks from composite models
     implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
 

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

@@ -32,8 +32,11 @@ 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.*
+import org.utbot.framework.concrete.UtConcreteExecutionData
+import org.utbot.framework.concrete.UtConcreteExecutionResult
+import org.utbot.framework.concrete.UtExecutionInstrumentation
 import org.utbot.framework.concrete.constructors.UtModelConstructor
+import org.utbot.framework.concrete.FuzzerConcreteExecutor
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.Step
 import org.utbot.framework.plugin.api.util.*
@@ -45,11 +48,10 @@ 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 soot.jimple.Stmt
 import soot.tagkit.ParamNamesTag
 import java.lang.reflect.Method
-import java.util.*
+import java.util.IdentityHashMap
 import kotlin.system.measureTimeMillis
 
 val logger = KotlinLogging.logger {}
@@ -336,7 +338,7 @@ class UtBotSymbolicEngine(
     fun fuzzing(until: Long = Long.MAX_VALUE, transform: (JavaValueProvider) -> JavaValueProvider = { it }) = flow {
         val isFuzzable = methodUnderTest.parameters.all { classId ->
             classId != Method::class.java.id && // causes the instrumented process crash at invocation
-                    classId != Class::class.java.id  // causes java.lang.IllegalAccessException: java.lang.Class at sun.misc.Unsafe.allocateInstance(Native Method)
+                classId != Class::class.java.id  // causes java.lang.IllegalAccessException: java.lang.Class at sun.misc.Unsafe.allocateInstance(Native Method)
         }
         val hasMethodUnderTestParametersToFuzz = methodUnderTest.parameters.isNotEmpty()
         if (!isFuzzable || !hasMethodUnderTestParametersToFuzz && methodUnderTest.isStatic) {
@@ -421,7 +423,6 @@ 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
             }

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

@@ -40,7 +40,6 @@ import org.utbot.framework.plugin.api.UtValueExecutionState
 import org.utbot.framework.plugin.api.UtVoidModel
 import org.utbot.framework.plugin.api.isMockModel
 import org.utbot.framework.plugin.api.util.constructor
-import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.isStatic
 import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.jClass

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/FuzzerConcreteExecutor.kt

@@ -18,19 +18,6 @@ class FuzzerConcreteExecutor(
         stateBefore: EnvironmentModels,
         instrumentation: List<UtInstrumentation>
     ): UtFuzzingConcreteExecutionResult {
-//        val fuzzingExecutor =
-//            ConcreteExecutor(
-//                UtFuzzingExecutionInstrumentation/*(UtSettings.greyBoxFuzzingCompetitionMode)*/,
-//                pathsToUserClasses,
-//                pathsToDependencyClasses
-//            ).apply { this.classLoader = utContext.classLoader }
-//        val executionResult = fuzzingExecutor.executeConcretelyFuzz(methodUnderTest, stateBefore, instrumentation)
-//        return UtFuzzingConcreteExecutionResult(
-//            null,
-//            executionResult.result,
-//            executionResult.coverage,
-//            executionResult.methodInstructionsIds
-//        )
         return if (UtSettings.greyBoxFuzzingCompetitionMode) {
             val fuzzingExecutor =
                 ConcreteExecutor(

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt

@@ -13,7 +13,6 @@ import org.utbot.framework.concrete.phases.start
 import org.utbot.framework.plugin.api.Coverage
 import org.utbot.framework.plugin.api.EnvironmentModels
 import org.utbot.framework.plugin.api.FieldId
-import org.utbot.framework.plugin.api.Instruction
 import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtExecutionResult
 import org.utbot.framework.plugin.api.UtExecutionSuccess
@@ -23,7 +22,6 @@ import org.utbot.framework.plugin.api.util.singleExecutableId
 import org.utbot.instrumentation.instrumentation.ArgumentList
 import org.utbot.instrumentation.instrumentation.Instrumentation
 import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
-import org.utbot.instrumentation.instrumentation.et.EtInstruction
 import org.utbot.instrumentation.instrumentation.et.TraceHandler
 import org.utbot.instrumentation.instrumentation.instrumenter.Instrumenter
 import org.utbot.instrumentation.instrumentation.mock.MockClassVisitor
@@ -235,12 +233,3 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
         return instrumenter.classByteCode
     }
 }
-
-/**
- * Transforms a list of internal [EtInstruction]s to a list of api [Instruction]s.
- */
-internal fun List<EtInstruction>.toApiCoverage(instructionsCount: Long? = null): Coverage =
-    Coverage(
-        map { Instruction(it.className, it.methodSignature, it.line, it.id) },
-        instructionsCount
-    )