USVM experimental integration into UnitTestBot

gradle.properties

@@ -109,7 +109,7 @@ springBootVersion=2.7.13
 springSecurityVersion=5.8.5
 
 approximationsVersion=bfce4eedde
-usvmVersion=72924ad
+usvmVersion=7b45e18b0e
 
 # configuration for build server
 #

utbot-cli-go/build.gradle

@@ -57,6 +57,7 @@ classes {
 }
 
 jar {
+    zip64 = true
     manifest {
         attributes 'Main-Class': 'org.utbot.cli.go.ApplicationKt'
         attributes 'Bundle-SymbolicName': 'org.utbot.cli.go'

utbot-cli-js/build.gradle

@@ -55,6 +55,7 @@ classes {
 }
 
 jar {
+    zip64 = true
     manifest {
         attributes 'Main-Class': 'org.utbot.cli.js.ApplicationKt'
         attributes 'Bundle-SymbolicName': 'org.utbot.cli.js'

utbot-cli-python/build.gradle

@@ -49,6 +49,7 @@ classes {
 }
 
 jar {
+    zip64 = true
     manifest {
         attributes 'Main-Class': 'org.utbot.cli.language.python.ApplicationKt'
         attributes 'Bundle-SymbolicName': 'org.utbot.cli.language.python'

utbot-cli/build.gradle

@@ -55,6 +55,7 @@ classes {
 }
 
 jar {
+    zip64 = true
     manifest {
         attributes 'Main-Class': 'org.utbot.cli.ApplicationKt'
         attributes 'Bundle-SymbolicName': 'org.utbot.cli'

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

@@ -57,6 +57,8 @@ import kotlin.contracts.contract
 import org.utbot.common.isAbstract
 import org.utbot.framework.plugin.api.mapper.UtModelMapper
 import org.utbot.framework.plugin.api.mapper.map
+import org.utbot.framework.plugin.api.mapper.mapModelIfExists
+import org.utbot.framework.plugin.api.mapper.mapModels
 import org.utbot.framework.plugin.api.mapper.mapPreservingType
 import org.utbot.framework.plugin.api.util.SpringModelUtils
 import org.utbot.framework.process.OpenModulesContainer
@@ -73,6 +75,11 @@ data class UtMethodTestSet(
     val clustersInfo: List<Pair<UtClusterInfo?, IntRange>> = listOf(null to executions.indices)
 )
 
+fun UtMethodTestSet.mapModels(mapper: UtModelMapper): UtMethodTestSet =
+    copy(executions = executions.map { it.mapModels(mapper) })
+
+fun Collection<UtMethodTestSet>.mapModels(mapper: UtModelMapper) = map { it.mapModels(mapper) }
+
 data class Step(
     val stmt: Stmt,
     val depth: Int,
@@ -145,11 +152,70 @@ abstract class UtExecution(
         displayName: String? = this.displayName,
     ): UtExecution
 
+    open fun mapModels(mapper: UtModelMapper) = copy(
+        stateBefore = stateBefore.mapModels(mapper),
+        stateAfter = stateAfter.mapModels(mapper),
+        result = result.mapModelIfExists(mapper)
+    )
+
     val executableToCall get() = stateBefore.executableToCall
 }
 
-interface UtExecutionWithInstrumentation {
-    val instrumentation: List<UtInstrumentation>
+abstract class UtExecutionWithInstrumentation(
+    stateBefore: EnvironmentModels,
+    stateAfter: EnvironmentModels,
+    result: UtExecutionResult,
+    coverage: Coverage? = null,
+    summary: List<DocStatement>? = null,
+    testMethodName: String? = null,
+    displayName: String? = null,
+    val instrumentation: List<UtInstrumentation>,
+) : UtExecution(
+    stateBefore = stateBefore,
+    stateAfter = stateAfter,
+    result = result,
+    coverage = coverage,
+    summary = summary,
+    testMethodName = testMethodName,
+    displayName = displayName,
+) {
+    abstract fun copy(
+        stateBefore: EnvironmentModels = this.stateBefore,
+        stateAfter: EnvironmentModels = this.stateAfter,
+        result: UtExecutionResult = this.result,
+        coverage: Coverage? = this.coverage,
+        summary: List<DocStatement>? = this.summary,
+        testMethodName: String? = this.testMethodName,
+        displayName: String? = this.displayName,
+        instrumentation: List<UtInstrumentation> = this.instrumentation,
+    ): UtExecution
+
+    override fun copy(
+        stateBefore: EnvironmentModels,
+        stateAfter: EnvironmentModels,
+        result: UtExecutionResult,
+        coverage: Coverage?,
+        summary: List<DocStatement>?,
+        testMethodName: String?,
+        displayName: String?,
+    ): UtExecution = copy(
+        stateBefore = stateBefore,
+        stateAfter = stateAfter,
+        result = result,
+        instrumentation = instrumentation,
+        coverage = coverage,
+        summary = summary,
+        testMethodName = testMethodName,
+        displayName = displayName,
+    )
+
+    override fun mapModels(mapper: UtModelMapper): UtExecution =
+        copy(
+            stateBefore = stateBefore.mapModels(mapper),
+            stateAfter = stateAfter.mapModels(mapper),
+            result = result.mapModelIfExists(mapper),
+            instrumentation = instrumentation.map { it.mapModels(mapper) },
+        )
 }
 
 /**
@@ -167,15 +233,24 @@ class UtSymbolicExecution(
     stateBefore: EnvironmentModels,
     stateAfter: EnvironmentModels,
     result: UtExecutionResult,
-    override val instrumentation: List<UtInstrumentation>,
+    instrumentation: List<UtInstrumentation>,
     val path: MutableList<Step>,
     val fullPath: List<Step>,
     coverage: Coverage? = null,
     summary: List<DocStatement>? = null,
     testMethodName: String? = null,
     displayName: String? = null,
     /** Convenient view of the full symbolic path */ val symbolicSteps: List<SymbolicStep> = listOf(),
-) : UtExecution(stateBefore, stateAfter, result, coverage, summary, testMethodName, displayName), UtExecutionWithInstrumentation {
+) : UtExecutionWithInstrumentation(
+    stateBefore,
+    stateAfter,
+    result,
+    coverage,
+    summary,
+    testMethodName,
+    displayName,
+    instrumentation
+) {
     /**
      * By design the 'before' and 'after' states contain info about the same fields.
      * It means that it is not possible for a field to be present at 'before' and to be absent at 'after'.
@@ -193,7 +268,8 @@ class UtSymbolicExecution(
         coverage: Coverage?,
         summary: List<DocStatement>?,
         testMethodName: String?,
-        displayName: String?
+        displayName: String?,
+        instrumentation: List<UtInstrumentation>,
     ): UtExecution = UtSymbolicExecution(
         stateBefore = stateBefore,
         stateAfter = stateAfter,
@@ -205,7 +281,9 @@ class UtSymbolicExecution(
         summary = summary,
         testMethodName = testMethodName,
         displayName = displayName
-    )
+    ).also {
+        it.containsMocking = containsMocking
+    }
 
     override fun toString(): String = buildString {
         append("UtSymbolicExecution(")
@@ -252,7 +330,9 @@ class UtSymbolicExecution(
         summary = summary,
         testMethodName = testMethodName,
         displayName = displayName
-    )
+    ).also {
+        it.containsMocking = containsMocking
+    }
 }
 
 /**
@@ -1369,19 +1449,49 @@ class BuiltinMethodId(
     name: String,
     returnType: ClassId,
     parameters: List<ClassId>,
-    bypassesSandbox: Boolean = false,
-    // by default we assume that the builtin method is non-static and public
-    isStatic: Boolean = false,
-    isPublic: Boolean = true,
-    isProtected: Boolean = false,
-    isPrivate: Boolean = false
+    bypassesSandbox: Boolean,
+    override val modifiers: Int,
 ) : MethodId(classId, name, returnType, parameters, bypassesSandbox) {
-    override val modifiers: Int = ModifierFactory {
-        static = isStatic
-        public = isPublic
-        private = isPrivate
-        protected = isProtected
-    }
+    constructor(
+        classId: ClassId,
+        name: String,
+        returnType: ClassId,
+        parameters: List<ClassId>,
+        bypassesSandbox: Boolean = false,
+        // by default, we assume that the builtin method is non-static and public
+        isStatic: Boolean = false,
+        isPublic: Boolean = true,
+        isProtected: Boolean = false,
+        isPrivate: Boolean = false
+    ) : this(
+        classId = classId,
+        name = name,
+        returnType = returnType,
+        parameters = parameters,
+        bypassesSandbox = bypassesSandbox,
+        modifiers = ModifierFactory {
+            static = isStatic
+            public = isPublic
+            private = isPrivate
+            protected = isProtected
+        }
+    )
+
+    fun copy(
+        classId: ClassId = this.classId,
+        name: String = this.name,
+        returnType: ClassId = this.returnType,
+        parameters: List<ClassId> = this.parameters,
+        bypassesSandbox: Boolean = this.bypassesSandbox,
+        modifiers: Int = this.modifiers,
+    ) = BuiltinMethodId(
+        classId = classId,
+        name = name,
+        returnType = returnType,
+        parameters = parameters,
+        bypassesSandbox = bypassesSandbox,
+        modifiers = modifiers,
+    )
 }
 
 class BuiltinConstructorId(

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

@@ -1,6 +1,7 @@
 package org.utbot.framework.plugin.api.mapper
 
 import org.utbot.framework.plugin.api.EnvironmentModels
+import org.utbot.framework.plugin.api.MissingState
 import org.utbot.framework.plugin.api.UtDirectGetFieldModel
 import org.utbot.framework.plugin.api.UtDirectSetFieldModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
@@ -50,12 +51,15 @@ fun UtStatementCallModel.mapModels(mapper: UtModelMapper): UtStatementCallModel
         )
     }
 
-fun EnvironmentModels.mapModels(mapper: UtModelMapper) = EnvironmentModels(
-    thisInstance = thisInstance?.map(mapper),
-    statics = statics.mapModelValues(mapper),
-    parameters = parameters.mapModels(mapper),
-    executableToCall = executableToCall,
-)
+fun EnvironmentModels.mapModels(mapper: UtModelMapper) = when (this) {
+    MissingState -> MissingState
+    else -> EnvironmentModels(
+        thisInstance = thisInstance?.map(mapper),
+        statics = statics.mapModelValues(mapper),
+        parameters = parameters.mapModels(mapper),
+        executableToCall = executableToCall,
+    )
+}
 
 fun UtExecutionResult.mapModelIfExists(mapper: UtModelMapper) = if (this.isSuccess) {
     val successResult = this as UtExecutionSuccess
@@ -72,4 +76,4 @@ fun UtInstrumentation.mapModels(mapper: UtModelMapper) = when (this) {
 
 fun UtExecution.mapStateBeforeModels(mapper: UtModelMapper) = copy(
     stateBefore = stateBefore.mapModels(mapper)
-)
+)

utbot-framework/build.gradle

@@ -15,6 +15,8 @@ dependencies {
     api project(':utbot-rd')
     api project(':utbot-modificators-analyzer')
 
+    api project(':utbot-usvm')
+
     implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
     implementation group: 'com.jetbrains.rd', name: 'rd-core', version: rdVersion