bug fixes

UnitTestBot · DaniilStepanov · Nov 9, 2022 · Nov 15, 2022 · Nov 10, 2022 · Nov 10, 2022
commit 1cc03c3c2173dad1ed6d80815c2fe6dd61c59928
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/GreyBoxFuzzer.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/GreyBoxFuzzer.kt
@@ -63,7 +63,7 @@ class GreyBoxFuzzer(
         var regenerateThis = false
         val thisInstancesHistory = ArrayDeque<ThisInstance>()
         val startTime = System.currentTimeMillis()
-        val endTime = startTime + timeBudgetInMillis / percentageOfTimeBudgetToChangeMode
+        val endTime = startTime + timeBudgetInMillis / (100L / percentageOfTimeBudgetToChangeMode)
         var iterationNumber = 0
         while (System.currentTimeMillis() < endTime) {
             try {
@@ -160,7 +160,7 @@ class GreyBoxFuzzer(
         if (seeds == null || seeds!!.seedsSize() == 0) return
         if (seeds!!.all { it.parameters.isEmpty() }) return
         val startTime = System.currentTimeMillis()
-        val endTime = startTime + timeBudgetInMillis / percentageOfTimeBudgetToChangeMode
+        val endTime = startTime + timeBudgetInMillis / (100L / percentageOfTimeBudgetToChangeMode)
         var iterationNumber = 0
         while (System.currentTimeMillis() < endTime) {
             if (timeRemain < 0 || isMethodCovered()) return

diff --git a/...amework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/GeneratorConfigurator.kt b/...amework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/GeneratorConfigurator.kt
@@ -27,7 +27,7 @@ object GeneratorConfigurator {
     private val maxDouble: Double = 100.0
     private val minStringLength: Int = 1
     private val maxStringLength: Int = 5
-    val minCollectionSize: Int = 1
+    val minCollectionSize: Int = 0
     val maxCollectionSize: Int = 5
 
     val sizeAnnotationInstance: Size

diff --git a/...ramework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/QuickCheckExtensions.kt b/...ramework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/QuickCheckExtensions.kt
@@ -15,6 +15,7 @@ import org.utbot.engine.greyboxfuzzer.quickcheck.generator.GeneratorContext
 import org.utbot.engine.greyboxfuzzer.quickcheck.internal.FakeAnnotatedTypeFactory
 import org.utbot.engine.greyboxfuzzer.quickcheck.internal.ParameterTypeContext
 import org.utbot.engine.greyboxfuzzer.quickcheck.internal.generator.ArrayGenerator
+import org.utbot.engine.greyboxfuzzer.quickcheck.internal.generator.CompositeGenerator
 import org.utbot.engine.greyboxfuzzer.quickcheck.internal.generator.GeneratorRepository
 import ru.vyarus.java.generics.resolver.GenericsResolver
 import ru.vyarus.java.generics.resolver.context.ConstructorGenericsContext
@@ -41,6 +42,7 @@ fun Generator.getComponents(): List<Generator> =
     when (this) {
         is org.utbot.engine.greyboxfuzzer.quickcheck.generator.ComponentizedGenerator -> this.componentGenerators()
         is ArrayGenerator -> listOf(this.component)
+        is CompositeGenerator -> this.composed.map { it.item }
         else -> emptyList()
     }
 

diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/mutator/SeedCollector.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/mutator/SeedCollector.kt
@@ -2,7 +2,7 @@ package org.utbot.engine.greyboxfuzzer.mutator
 
 import kotlin.random.Random
 
-class SeedCollector(private val maxSize: Int = 50, private val methodInstructionsIds: Set<Long>) {
+class SeedCollector(private val maxSize: Int = 100, private val methodInstructionsIds: Set<Long>) {
     private val seeds = ArrayList<Seed>(maxSize)
 
     fun calcSeedScore(coverage: Set<Long>): Double =

diff --git a/...main/kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/ComponentizedGenerator.kt b/...main/kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/ComponentizedGenerator.kt
@@ -16,8 +16,8 @@ import java.util.Collections
  * @param type class token for type of property parameter this generator
  * is applicable to
 </T> */
-abstract class ComponentizedGenerator constructor(type: Class<*>) : org.utbot.engine.greyboxfuzzer.quickcheck.generator.Generator(type) {
-    private val components: MutableList<org.utbot.engine.greyboxfuzzer.quickcheck.generator.Generator> = ArrayList()
+abstract class ComponentizedGenerator constructor(type: Class<*>) : Generator(type) {
+    private val components: MutableList<Generator> = ArrayList()
 
     /**
      * {@inheritDoc}
@@ -35,7 +35,7 @@ abstract class ComponentizedGenerator constructor(type: Class<*>) : org.utbot.en
     }
 
     override fun addComponentGenerators(
-        newComponents: List<org.utbot.engine.greyboxfuzzer.quickcheck.generator.Generator>
+        newComponents: List<Generator>
     ) {
         require(newComponents.size == numberOfNeededComponents()) {
             String.format(
@@ -89,12 +89,12 @@ abstract class ComponentizedGenerator constructor(type: Class<*>) : org.utbot.en
     /**
      * @return this generator's component generators
      */
-    fun componentGenerators(): List<org.utbot.engine.greyboxfuzzer.quickcheck.generator.Generator> {
+    fun componentGenerators(): List<Generator> {
         return Collections.unmodifiableList(components)
     }
 
-    override fun copy(): org.utbot.engine.greyboxfuzzer.quickcheck.generator.Generator {
-        return (super.copy() as org.utbot.engine.greyboxfuzzer.quickcheck.generator.ComponentizedGenerator).also {
+    override fun copy(): Generator {
+        return (super.copy() as ComponentizedGenerator).also {
             it.components.addAll(components.map { it.copy() })
         }
     }

diff --git a/...ramework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/Generator.kt b/...ramework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/Generator.kt
@@ -40,7 +40,7 @@ abstract class Generator protected constructor(types: List<Class<*>>) : Gen {
         return when (generationState) {
             GenerationState.REGENERATE -> {
                 val possibleConstant =
-                    if (Random.getTrue(20)) {
+                    if (Random.getTrue(25)) {
                         getConstant()
                     } else null
                 (possibleConstant ?: generate(random, status)).also {

diff --git a/...tlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/java/util/CollectionGenerator.kt b/...tlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/java/util/CollectionGenerator.kt
@@ -22,7 +22,7 @@ import org.utbot.engine.greyboxfuzzer.quickcheck.random.SourceOfRandomness
  *
  * @param <T> the type of collection generated
 </T> */
-abstract class CollectionGenerator(type: Class<*>) : org.utbot.engine.greyboxfuzzer.quickcheck.generator.ComponentizedGenerator(type) {
+abstract class CollectionGenerator(type: Class<*>) : ComponentizedGenerator(type) {
     private var sizeRange: Size? = null
     private var distinct = false
 

diff --git a/...kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/internal/generator/CompositeGenerator.kt b/...kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/internal/generator/CompositeGenerator.kt
@@ -12,7 +12,7 @@ import java.lang.reflect.AnnotatedElement
 import java.lang.reflect.AnnotatedType
 
 class CompositeGenerator(composed: List<Weighted<Generator>>) : Generator(Any::class.java) {
-    private val composed: MutableList<Weighted<Generator>>
+    val composed: MutableList<Weighted<Generator>>
     private var previousChosenGenerator: Generator? = null
 
     init {
@@ -122,10 +122,11 @@ class CompositeGenerator(composed: List<Weighted<Generator>>) : Generator(Any::c
 
     override fun copy(): Generator {
         val composedCopies = composed.map { Weighted(it.item.copy(), it.weight) }.toMutableList()
-        val gen = Reflection.instantiate(CompositeGenerator::class.java.constructors.first(), composedCopies) as Generator
+        val gen = Reflection.instantiate(CompositeGenerator::class.java.constructors.first(), composedCopies) as CompositeGenerator
         return gen.also {
             it.generatedUtModel = generatedUtModel
             it.generationState = generationState
+            it.generatorContext = generatorContext
             it.nestedGenerators = nestedGenerators.map { it.copy() }.toMutableList()
             GeneratorConfigurator.configureGenerator(it, 100)
         }

diff --git a/utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt b/utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt
@@ -184,7 +184,7 @@ object UtBotJavaApi {
                     generationTimeoutInMillis,
                     generate = { symbolicEngine ->
                         if (isGreyBoxFuzzing) {
-                            symbolicEngine.greyBoxFuzzing()
+                            symbolicEngine.greyBoxFuzzing(generationTimeoutInMillis)
                         } else {
                             symbolicEngine.fuzzing { defaultModelProvider ->
                                 customModelProvider.withFallback(defaultModelProvider)