Merge branch 'main' into Vassiliy-Kudryashov/273-indexnotreadyexception-thrown-in-idea-with-installed-unittestbot-plugin

Author: Vassiliy-Kudryashov

.github/ISSUE_TEMPLATE/test_request.md

@@ -11,7 +11,9 @@ assignees: ''
 
 *Check that the IntelliJ Idea UTBot plugin can be successfully installed*
 
-- [ ] Choose appropriate workflow from the next list (by default, use the latest one) https://github.com/UnitTestBot/UTBotJava/actions/workflows/publish-plugin-and-cli.yml
+- [ ] Choose appropriate workflow from the list (by default, filter by main branch and take the latest one) https://github.com/UnitTestBot/UTBotJava/actions/workflows/publish-plugin-and-cli.yml
+- [ ] Download plugin
+- [ ] Check downloaded zip-file size < 100 MB
 - [ ] Open IntelliJ IDE
 - [ ] Remove previously installed UTBot plugin
 - [ ] Clone or reuse UTBot project (https://github.com/UnitTestBot/UTBotJava.git)

gradle.properties

@@ -14,7 +14,6 @@ collections_version=0.3.4
 intellij_plugin_version=0.6.4
 jacoco_version=0.8.5
 commons_lang_version=3.11
-commons_io_version=2.8.0
 kotlin_logging_version=1.8.3
 ktor_version=1.4.1
 clikt_version=3.2.0

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

@@ -223,6 +223,15 @@ object FileUtil {
         this.parentFile.mkdirs()
         this.createNewFile()
     }
+
+    // https://stackoverflow.com/a/68822715
+    fun byteCountToDisplaySize(bytes: Long): String =
+        when {
+            bytes >= 1 shl 30 -> "%.1f GB".format(bytes / (1 shl 30))
+            bytes >= 1 shl 20 -> "%.1f MB".format(bytes / (1 shl 20))
+            bytes >= 1 shl 10 -> "%.0f kB".format(bytes / (1 shl 10))
+            else -> "$bytes bytes"
+        }
 }
 
 /**

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

@@ -270,7 +270,7 @@ object UtSettings {
     /**
      * Fuzzer tries to generate and run tests during this time.
      */
-    var fuzzingTimeoutInMillis: Int by getIntProperty(3_000)
+    var fuzzingTimeoutInMillis: Long by getLongProperty(3_000L)
 
     /**
      * Generate tests that treat possible overflows in arithmetic operations as errors

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

@@ -610,10 +610,13 @@ val Type.classId: ClassId
  * [elementClassId] if this class id represents an array class, then this property
  * represents the class id of the array's elements. Otherwise, this property is null.
  */
-open class ClassId(
+open class ClassId @JvmOverloads constructor(
     val name: String,
-    val elementClassId: ClassId? = null
+    val elementClassId: ClassId? = null,
+    // Treat simple class ids as non-nullable
+    open val isNullable: Boolean = false
 ) {
+
     open val canonicalName: String
         get() = jClass.canonicalName ?: error("ClassId $name does not have canonical name")
 
@@ -677,10 +680,6 @@ open class ClassId(
     open val isSynthetic: Boolean
         get() = jClass.isSynthetic
 
-    open val isNullable: Boolean
-        // Treat simple class ids as non-nullable
-        get() = false
-
     /**
      * Collects all declared methods (including private and protected) from class and all its superclasses to sequence
      */
@@ -755,6 +754,7 @@ class BuiltinClassId(
     override val simpleName: String,
     // by default we assume that the class is not a member class
     override val simpleNameWithEnclosings: String = simpleName,
+    override val isNullable: Boolean = false,
     override val isPublic: Boolean = true,
     override val isProtected: Boolean = false,
     override val isPrivate: Boolean = false,
@@ -774,7 +774,7 @@ class BuiltinClassId(
             -1, 0 -> ""
             else -> canonicalName.substring(0, index)
         },
-) : ClassId(name) {
+) : ClassId(name = name, isNullable = isNullable) {
     init {
         BUILTIN_CLASSES_BY_NAMES[name] = this
     }
@@ -1081,7 +1081,7 @@ enum class CodegenLanguage(
     @Suppress("unused") override val description: String = "Generate unit tests in $displayName"
 ) : CodeGenerationSettingItem {
     JAVA(displayName = "Java"),
-    KOTLIN(displayName = "Kotlin");
+    KOTLIN(displayName = "Kotlin (experimental)");
 
     enum class OperatingSystem {
         WINDOWS,

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

@@ -236,6 +236,21 @@ val idToPrimitive: Map<ClassId, Class<*>> = mapOf(
  */
 fun isPrimitiveWrapperOrString(type: ClassId): Boolean = (type in primitiveWrappers) || (type == stringClassId)
 
+/**
+ * Returns a wrapper of a given type if it is primitive or a type itself otherwise.
+ */
+fun wrapIfPrimitive(type: ClassId): ClassId = when (type) {
+    booleanClassId -> booleanWrapperClassId
+    byteClassId -> byteWrapperClassId
+    charClassId -> charWrapperClassId
+    shortClassId -> shortWrapperClassId
+    intClassId -> intWrapperClassId
+    longClassId -> longWrapperClassId
+    floatClassId -> floatWrapperClassId
+    doubleClassId -> doubleWrapperClassId
+    else -> type
+}
+
 /**
  * Note: currently uses class$innerClass form to load classes with classloader.
  */

utbot-framework/build.gradle

@@ -37,16 +37,12 @@ dependencies {
     testImplementation project(':utbot-analytics')
 
     // used for testing code generation
-    testImplementation group: 'commons-io', name: 'commons-io', version: commons_io_version
     testImplementation group: 'junit', name: 'junit', version: junit4_version
     testImplementation group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: junit4_platform_version
     testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito_version
     testImplementation group: 'org.testng', name: 'testng', version: testng_version
     testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockito_inline_version
 
-    testCompile group: 'org.mockito', name: 'mockito-inline', version: mockito_inline_version
-    testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2_version
-
     z3native group: 'com.microsoft.z3', name: 'z3-native-win64', version: z3_version, ext: 'zip'
     z3native group: 'com.microsoft.z3', name: 'z3-native-linux64', version: z3_version, ext: 'zip'
     z3native group: 'com.microsoft.z3', name: 'z3-native-osx', version: z3_version, ext: 'zip'

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

@@ -180,6 +180,8 @@ class UtBotSymbolicEngine(
 
     fun attachMockListener(mockListener: MockListener) = mocker.mockListenerController?.attach(mockListener)
 
+    fun detachMockListener(mockListener: MockListener) = mocker.mockListenerController?.detach(mockListener)
+
     private val statesForConcreteExecution: MutableList<ExecutionState> = mutableListOf()
 
     private val traverser = Traverser(
@@ -435,7 +437,7 @@ class UtBotSymbolicEngine(
             })
         }
         fuzzedValues.forEach { values ->
-            if (System.currentTimeMillis() >= until) {
+            if (controller.job?.isActive == false || System.currentTimeMillis() >= until) {
                 logger.info { "Fuzzing overtime: $methodUnderTest" }
                 return@flow
             }

utbot-framework/src/main/kotlin/org/utbot/engine/selectors/strategies/GraphViz.kt

@@ -1,24 +1,23 @@
 package org.utbot.engine.selectors.strategies
 
+import mu.KotlinLogging
+import org.utbot.common.FileUtil.createNewFileWithParentDirectories
 import org.utbot.engine.CALL_DECISION_NUM
 import org.utbot.engine.Edge
 import org.utbot.engine.ExecutionState
 import org.utbot.engine.InterProceduralUnitGraph
+import org.utbot.engine.isLibraryNonOverriddenClass
 import org.utbot.engine.isReturn
 import org.utbot.engine.selectors.PathSelector
 import org.utbot.engine.stmts
 import org.utbot.framework.UtSettings.copyVisualizationPathToClipboard
+import soot.jimple.Stmt
+import soot.toolkits.graph.ExceptionalUnitGraph
 import java.awt.Toolkit
 import java.awt.datatransfer.StringSelection
 import java.io.FileWriter
 import java.nio.file.Files
 import java.nio.file.Paths
-import mu.KotlinLogging
-import org.apache.commons.io.FileUtils
-import org.utbot.engine.isLibraryNonOverriddenClass
-import org.utbot.engine.isOverridden
-import soot.jimple.Stmt
-import soot.toolkits.graph.ExceptionalUnitGraph
 
 private val logger = KotlinLogging.logger {}
 
@@ -51,10 +50,17 @@ class GraphViz(
         val classLoader = GraphViz::class.java.classLoader
 
         for (file in requiredFileNames) {
-            FileUtils.copyInputStreamToFile(
-                classLoader.getResourceAsStream("html/$file"),
-                Paths.get(graphVisDirectory.toString(), file).toFile()
-            )
+            classLoader.getResourceAsStream("html/$file").use { inputStream ->
+                val path = Paths.get(graphVisDirectory.toString(), file)
+                val targetFile = path.toFile()
+                targetFile.createNewFileWithParentDirectories()
+
+                targetFile.outputStream().use { targetOutputStream ->
+                    inputStream?.copyTo(targetOutputStream) ?: logger.error {
+                        "Could not start a visualization because of missing resource html/$file"
+                    }
+                }
+            }
         }
         FileWriter(graphJs).use {
             it.write(

utbot-framework/src/main/kotlin/org/utbot/engine/util/mockListeners/ForceMockListener.kt

@@ -2,6 +2,7 @@ package org.utbot.engine.util.mockListeners
 import org.utbot.engine.EngineController
 import org.utbot.engine.MockStrategy
 import org.utbot.engine.UtMockInfo
+import org.utbot.framework.plugin.api.TestCaseGenerator
 import org.utbot.framework.util.Conflict
 import org.utbot.framework.util.ConflictTriggers
 
@@ -18,4 +19,13 @@ class ForceMockListener(triggers: ConflictTriggers): MockListener(triggers) {
 
         triggers[Conflict.ForceMockHappened] = true
     }
+
+    companion object {
+        fun create(testCaseGenerator: TestCaseGenerator, conflictTriggers: ConflictTriggers) : ForceMockListener {
+            val listener = ForceMockListener(conflictTriggers)
+            testCaseGenerator.engineActions.add { engine -> engine.attachMockListener(listener) }
+
+            return listener
+        }
+    }
 }

utbot-framework/src/main/kotlin/org/utbot/engine/util/mockListeners/ForceStaticMockListener.kt

@@ -6,6 +6,7 @@ import org.utbot.engine.UtMockInfo
 import org.utbot.engine.UtNewInstanceMockInfo
 import org.utbot.engine.UtStaticMethodMockInfo
 import org.utbot.engine.UtStaticObjectMockInfo
+import org.utbot.framework.plugin.api.TestCaseGenerator
 import org.utbot.framework.util.Conflict
 import org.utbot.framework.util.ConflictTriggers
 
@@ -26,4 +27,13 @@ class ForceStaticMockListener(triggers: ConflictTriggers): MockListener(triggers
             triggers[Conflict.ForceStaticMockHappened] = true
         }
     }
+
+    companion object {
+        fun create(testCaseGenerator: TestCaseGenerator, conflictTriggers: ConflictTriggers) : ForceStaticMockListener {
+            val listener = ForceStaticMockListener(conflictTriggers)
+            testCaseGenerator.engineActions.add { engine -> engine.attachMockListener(listener) }
+
+            return listener
+        }
+    }
 }

utbot-framework/src/main/kotlin/org/utbot/engine/util/mockListeners/MockListener.kt

@@ -3,6 +3,7 @@ package org.utbot.engine.util.mockListeners
 import org.utbot.engine.EngineController
 import org.utbot.engine.MockStrategy
 import org.utbot.engine.UtMockInfo
+import org.utbot.framework.plugin.api.TestCaseGenerator
 import org.utbot.framework.util.ConflictTriggers
 
 /**
@@ -12,4 +13,8 @@ abstract class MockListener(
     val triggers: ConflictTriggers
 ) {
     abstract fun onShouldMock(controller: EngineController, strategy: MockStrategy, mockInfo: UtMockInfo)
+
+    fun detach(testCaseGenerator: TestCaseGenerator, listener: MockListener) {
+        testCaseGenerator.engineActions.add { engine -> engine.detachMockListener(listener) }
+    }
 }

utbot-framework/src/main/kotlin/org/utbot/engine/util/mockListeners/MockListenerController.kt

@@ -14,6 +14,10 @@ class MockListenerController(private val controller: EngineController) {
         listeners += listener
     }
 
+    fun detach(listener: MockListener) {
+        listeners -= listener
+    }
+
     fun onShouldMock(strategy: MockStrategy, mockInfo: UtMockInfo) {
         listeners.map { it.onShouldMock(controller, strategy, mockInfo) }
     }

utbot-framework/src/main/kotlin/org/utbot/framework/assemble/AssemblePrimitiveWrapper.kt

@@ -0,0 +1,50 @@
+package org.utbot.framework.assemble
+
+import org.utbot.framework.plugin.api.UtAssembleModel
+import org.utbot.framework.plugin.api.UtExecutableCallModel
+import org.utbot.framework.plugin.api.UtPrimitiveModel
+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.executableId
+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.wrapIfPrimitive
+
+/**
+ * Creates [UtAssembleModel] of the wrapper for a given [UtPrimitiveModel].
+ */
+fun assemble(model: UtPrimitiveModel): UtAssembleModel {
+    val modelType = model.classId
+    val assembledModelType = wrapIfPrimitive(modelType)
+
+    val constructorCall = when (modelType) {
+        shortClassId -> java.lang.Short::class.java.getConstructor(Short::class.java)
+        intClassId -> java.lang.Integer::class.java.getConstructor(Int::class.java)
+        longClassId -> java.lang.Long::class.java.getConstructor(Long::class.java)
+        charClassId -> java.lang.Character::class.java.getConstructor(Char::class.java)
+        byteClassId -> java.lang.Byte::class.java.getConstructor(Byte::class.java)
+        booleanClassId -> java.lang.Boolean::class.java.getConstructor(Boolean::class.java)
+        floatClassId -> java.lang.Float::class.java.getConstructor(Float::class.java)
+        doubleClassId -> java.lang.Double::class.java.getConstructor(Double::class.java)
+        else -> error("Model type $modelType is void or non-primitive")
+    }
+
+    val constructorCallModel = UtExecutableCallModel(
+        instance = null,
+        executable = constructorCall.executableId,
+        params = listOf(model),
+        returnValue = null,
+    )
+
+    return UtAssembleModel(
+        id = null,
+        classId = assembledModelType,
+        modelName = modelType.canonicalName,
+        instantiationChain = listOf(constructorCallModel),
+        modificationsChain = emptyList(),
+    )
+}