minor fixes

DaniilStepanov · DaniilStepanov · commit bbb34cd71eb5 · 2023-01-24T19:02:19.000+03:00
diff --git a/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt b/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt
@@ -168,16 +168,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(searchDirectory, sourceCodeFile.toFile()) else it
         }
-    }
 
 
     protected fun withLogger(targetClassFqn: String, block: Runnable) {
diff --git a/utbot-core/src/main/kotlin/org/utbot/common/FileUtil.kt b/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()
diff --git a/utbot-core/src/main/kotlin/org/utbot/common/KClassUtil.kt b/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)
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt
@@ -240,7 +240,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
@@ -255,7 +255,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.
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt b/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
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/constructor/ValueConstructor.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/constructor/ValueConstructor.kt
@@ -42,7 +42,6 @@ import org.utbot.framework.plugin.api.util.anyInstance
 import org.utbot.framework.plugin.api.util.constructLambda
 import org.utbot.framework.plugin.api.util.constructStaticLambda
 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.jClass
 import org.utbot.framework.plugin.api.util.jField
diff --git a/utbot-framework/build.gradle b/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'
 
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt b/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.*
@@ -423,7 +426,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
             }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestFlow.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestFlow.kt
@@ -6,8 +6,6 @@ import kotlinx.coroutines.flow.flattenConcat
 import kotlinx.coroutines.flow.flowOf
 import org.utbot.engine.UtBotSymbolicEngine
 import org.utbot.framework.UtSettings
-import kotlin.io.path.Path
-import kotlin.io.path.appendText
 
 /**
  * Constructs [TestFlow] for customization and creates flow producer.
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/util/SootUtils.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/util/SootUtils.kt
@@ -16,12 +16,7 @@ import soot.jimple.JimpleBody
 import soot.options.Options
 import soot.toolkits.graph.ExceptionalUnitGraph
 import java.io.File
-import java.net.URI
-import java.nio.file.FileSystems
-import java.nio.file.Files
 import java.nio.file.Path
-import kotlin.io.path.absolutePathString
-import kotlin.streams.toList
 
 object SootUtils {
     /**
@@ -136,6 +131,7 @@ val ExecutableId.sootMethod: SootMethod
 fun jimpleBody(method: ExecutableId): JimpleBody =
     method.sootMethod.jimpleBody()
 
+
 private fun addBasicClasses(vararg classes: Class<*>) {
     classes.forEach {
         Scene.v().addBasicClass(it.name, SootClass.BODIES)
diff --git a/utbot-framework/src/main/kotlin/org/utbot/fuzzer/FuzzerFunctions.kt b/utbot-framework/src/main/kotlin/org/utbot/fuzzer/FuzzerFunctions.kt
@@ -5,10 +5,36 @@ import org.utbot.framework.concrete.constructors.UtModelConstructor
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.classId
-import org.utbot.framework.plugin.api.util.*
+import org.utbot.framework.plugin.api.util.booleanClassId
+import org.utbot.framework.plugin.api.util.byteClassId
+import org.utbot.framework.plugin.api.util.charClassId
+import org.utbot.framework.plugin.api.util.doubleClassId
+import org.utbot.framework.plugin.api.util.floatClassId
+import org.utbot.framework.plugin.api.util.intClassId
+import org.utbot.framework.plugin.api.util.longClassId
+import org.utbot.framework.plugin.api.util.shortClassId
+import org.utbot.framework.plugin.api.util.stringClassId
+import org.utbot.framework.plugin.api.util.byteWrapperClassId
+import org.utbot.framework.plugin.api.util.charWrapperClassId
+import org.utbot.framework.plugin.api.util.doubleWrapperClassId
+import org.utbot.framework.plugin.api.util.floatWrapperClassId
+import org.utbot.framework.plugin.api.util.intWrapperClassId
+import org.utbot.framework.plugin.api.util.longWrapperClassId
+import org.utbot.framework.plugin.api.util.shortWrapperClassId
 import org.utbot.framework.util.executableId
-import soot.*
+import soot.BooleanType
+import soot.ByteType
+import soot.CharType
+import soot.DoubleType
+import soot.FloatType
+import soot.IntType
+import soot.Local
+import soot.LongType
+import soot.ShortType
+import soot.SootMethod
 import soot.Unit
+import soot.Value
+import soot.ValueBox
 import soot.jimple.Constant
 import soot.jimple.IntConstant
 import soot.jimple.InvokeExpr
@@ -284,6 +310,7 @@ private object ConstantsAsIs: ConstantsFinder {
     override fun find(graph: ExceptionalUnitGraph, unit: Unit, value: Value): List<FuzzedConcreteValue> {
         if (value !is Constant || value is NullConstant) return emptyList()
         return listOf(FuzzedConcreteValue(value.type.classId, value.plainValue))
+
     }
 
 }
diff --git a/utbot-framework/src/main/resources/log4j2.xml b/utbot-framework/src/main/resources/log4j2.xml
diff --git a/utbot-greyboxfuzzer/src/main/kotlin/org/utbot/greyboxfuzzer/GreyBoxFuzzer.kt b/utbot-greyboxfuzzer/src/main/kotlin/org/utbot/greyboxfuzzer/GreyBoxFuzzer.kt
@@ -19,10 +19,10 @@ import org.utbot.greyboxfuzzer.mutator.Seed
 import org.utbot.greyboxfuzzer.mutator.SeedCollector
 import org.utbot.greyboxfuzzer.quickcheck.generator.GeneratorContext
 import org.utbot.greyboxfuzzer.util.*
+import ru.vyarus.java.generics.resolver.context.GenericsInfoFactory
 import java.lang.reflect.Executable
 import java.lang.reflect.Field
 import kotlin.random.Random
-import kotlin.system.exitProcess
 
 class GreyBoxFuzzer(
     private val methodUnderTest: ExecutableId,
@@ -40,6 +40,9 @@ class GreyBoxFuzzer(
     private val percentageOfTimeBudgetToChangeMode = 25
     private val logger = KotlinLogging.logger {}
 
+    init {
+        GenericsInfoFactory.disableCache()
+    }
 
     suspend fun fuzz() = flow {
         logger.debug { "Started to fuzz ${methodUnderTest.name}" }
diff --git a/utbot-greyboxfuzzer/src/main/kotlin/org/utbot/greyboxfuzzer/util/UtGreyBoxFuzzedExecution.kt b/utbot-greyboxfuzzer/src/main/kotlin/org/utbot/greyboxfuzzer/util/UtGreyBoxFuzzedExecution.kt
@@ -6,7 +6,7 @@ class UtFuzzingConcreteExecutionResult(
     val stateAfter: EnvironmentModels?,
     val result: UtExecutionResult,
     val coverage: Coverage,
-    val methodInstructions: List<Instruction>?
+    val methodInstructions: List<Instruction>? = null
 )
 
 //class UtFuzzExecutionResult() : UtConcreteExecutionResult
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/et/TraceListStrategy.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/et/TraceListStrategy.kt
@@ -10,7 +10,7 @@ import org.objectweb.asm.commons.LocalVariablesSorter
 
 class TraceListStrategy(
     private val className: String,
-    val storage: ProcessingStorage,
+    private val storage: ProcessingStorage,
     private val inserter: TraceInstructionBytecodeInserter
 ) : IInstructionVisitor {
     var currentLine: Int = 0
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/FuzzerConcreteExecutor.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/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(
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtExecutionInstrumentation.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtExecutionInstrumentation.kt
@@ -12,6 +12,7 @@ import org.utbot.instrumentation.instrumentation.execution.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.UtAssembleModel
 import org.utbot.framework.plugin.api.UtExecutionResult
 import org.utbot.framework.plugin.api.UtInstrumentation
 import org.utbot.framework.plugin.api.UtModel
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtExecutionInstrumentationWithStatsCollection.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtExecutionInstrumentationWithStatsCollection.kt
@@ -19,12 +19,12 @@ import kotlin.reflect.jvm.javaMethod
 
 interface UtExecutionInstrumentationWithStatsCollection : Instrumentation<UtFuzzingConcreteExecutionResult> {
 
-    val delegateInstrumentation: InvokeInstrumentation// = InvokeInstrumentation()
+    val delegateInstrumentation: InvokeInstrumentation
 
-    val instrumentationContext: InstrumentationContext// = InstrumentationContext()
+    val instrumentationContext: InstrumentationContext
 
-    val traceHandler: TraceHandler //= TraceHandler()
-    val pathsToUserClasses: MutableSet<String>// = mutableSetOf<String>()
+    val traceHandler: TraceHandler
+    val pathsToUserClasses: MutableSet<String>
     override fun init(pathsToUserClasses: Set<String>) {
         this.pathsToUserClasses.clear()
         this.pathsToUserClasses += pathsToUserClasses
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtFuzzingExecutionInstrumentation.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/UtFuzzingExecutionInstrumentation.kt
@@ -2,6 +2,7 @@ package org.utbot.framework.concrete
 
 import org.utbot.framework.concrete.constructors.ConstructOnlyUserClassesOrCachedObjectsStrategy
 import org.utbot.framework.concrete.mock.InstrumentationContext
+import org.utbot.framework.concrete.phases.PhaseError
 import org.utbot.framework.concrete.phases.PhasesController
 import org.utbot.framework.concrete.phases.start
 import org.utbot.framework.plugin.api.*
@@ -10,6 +11,7 @@ import org.utbot.greyboxfuzzer.util.UtFuzzingConcreteExecutionResult
 import org.utbot.instrumentation.instrumentation.ArgumentList
 import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
 import org.utbot.instrumentation.instrumentation.et.TraceHandler
+import java.security.AccessControlException
 
 object UtFuzzingExecutionInstrumentation : UtExecutionInstrumentationWithStatsCollection {
 
@@ -186,3 +188,21 @@ private fun Coverage.toLocalCoverage(traceHandler: TraceHandler) =
         instructionsCount,
         missedInstructions.map { traceHandler.processingStorage.convertToLocalInstruction(it) }
     )
+
+private inline fun PhasesController.computeFuzzingConcreteExecutionResult(block: PhasesController.() -> UtFuzzingConcreteExecutionResult): UtFuzzingConcreteExecutionResult {
+    return use {
+        try {
+            block()
+        } catch (e: PhaseError) {
+            if (e.cause.cause is AccessControlException) {
+                return@use UtFuzzingConcreteExecutionResult(
+                    MissingState,
+                    UtSandboxFailure(e.cause.cause!!),
+                    Coverage(),
+                    null
+                )
+            }
+            throw e
+        }
+    }
+}
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/constructors/MockValueConstructor.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/constructors/MockValueConstructor.kt
@@ -213,12 +213,7 @@ class MockValueConstructor(
             check(Reflection.isModifiersAccessible())
 
             val target = mockTarget(fieldModel) {
-                FieldMockTarget(
-                    fieldModel.classId.name,
-                    model.classId.name,
-                    UtConcreteValue(classInstance),
-                    fieldId.name
-                )
+                FieldMockTarget(fieldModel.classId.name, model.classId.name, UtConcreteValue(classInstance), fieldId.name)
             }
             val value = construct(fieldModel, target).value
             val instance = if (Modifier.isStatic(declaredField.modifiers)) null else classInstance
@@ -367,10 +362,9 @@ class MockValueConstructor(
                         val value = construct(elementModel, null).value
                         try {
                             java.lang.reflect.Array.set(instance, i, value)
-                        } catch (iae: IllegalArgumentException) {
+                        } catch (iae:IllegalArgumentException) {
                             throw IllegalArgumentException(
-                                iae.message + " array: ${instance.javaClass.name}; value: ${value?.javaClass?.name}",
-                                iae
+                                iae.message + " array: ${instance.javaClass.name}; value: ${value?.javaClass?.name}" , iae
                             )
                         }
                     }
diff --git a/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/phases/PhasesController.kt b/utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/execution/phases/PhasesController.kt
@@ -7,7 +7,6 @@ import org.utbot.instrumentation.instrumentation.execution.mock.InstrumentationC
 import org.utbot.framework.plugin.api.Coverage
 import org.utbot.framework.plugin.api.MissingState
 import org.utbot.framework.plugin.api.UtSandboxFailure
-import org.utbot.greyboxfuzzer.util.UtFuzzingConcreteExecutionResult
 import org.utbot.instrumentation.instrumentation.Instrumentation
 import org.utbot.instrumentation.instrumentation.et.TraceHandler
 
@@ -48,25 +47,6 @@ class PhasesController(
         }
     }
 
-    inline fun computeFuzzingConcreteExecutionResult(block: PhasesController.() -> UtFuzzingConcreteExecutionResult): UtFuzzingConcreteExecutionResult {
-        return use {
-            try {
-                block()
-            } catch (e: PhaseError) {
-                if (e.cause.cause is AccessControlException) {
-                    return@use UtFuzzingConcreteExecutionResult(
-                        MissingState,
-                        UtSandboxFailure(e.cause.cause!!),
-                        Coverage(),
-                        null
-                    )
-                }
-                // TODO: make failure results from different phase errors
-                throw e
-            }
-        }
-    }
-
     override fun close() {
         valueConstructionContext.close()
     }
diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt
@@ -277,7 +277,7 @@ fun runGeneration(
                     val methodJob = currentCoroutineContext().job
 
                     logger.debug { " ... " }
-                    val statsForMethod = StatsForMethod("${method.classId.simpleName}#${method.name}#${method.signature}", Type.getInternalName(method.classId.jClass))
+                    val statsForMethod = StatsForMethod("${method.classId.simpleName}#${method.name}")
                     statsForClass.statsForMethods.add(statsForMethod)
 
 
