Apply several fixes

Author: EgorkaKulikov

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

@@ -4,6 +4,7 @@ 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
@@ -25,6 +26,7 @@ fun assemble(model: UtPrimitiveModel): UtAssembleModel {
         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)

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/context/CgContext.kt

@@ -54,7 +54,7 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.persistentSetOf
 import org.utbot.framework.codegen.model.constructor.builtin.streamsDeepEqualsMethodId
-import org.utbot.framework.codegen.model.tree.CgParameterType
+import org.utbot.framework.codegen.model.tree.CgParameterKind
 import org.utbot.framework.plugin.api.util.executableId
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.isCheckedException
@@ -189,7 +189,7 @@ internal interface CgContextOwner {
     var valueByModelId: MutableMap<Int?, CgValue>
 
     // parameters of the method currently being generated
-    val currentMethodParameters: MutableMap<CgParameterType, CgVariable>
+    val currentMethodParameters: MutableMap<CgParameterKind, CgVariable>
 
     val testClassCustomName: String?
 
@@ -451,7 +451,7 @@ internal data class CgContext(
 
     override var valueByModelId: MutableMap<Int?, CgValue> = mutableMapOf()
 
-    override val currentMethodParameters: MutableMap<CgParameterType, CgVariable> = mutableMapOf()
+    override val currentMethodParameters: MutableMap<CgParameterKind, CgVariable> = mutableMapOf()
 
     override val testClassThisInstance: CgThisInstance = CgThisInstance(currentTestClass)
 }

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt

@@ -52,7 +52,7 @@ import org.utbot.framework.codegen.model.tree.CgMethodCall
 import org.utbot.framework.codegen.model.tree.CgMultilineComment
 import org.utbot.framework.codegen.model.tree.CgNotNullAssertion
 import org.utbot.framework.codegen.model.tree.CgParameterDeclaration
-import org.utbot.framework.codegen.model.tree.CgParameterType
+import org.utbot.framework.codegen.model.tree.CgParameterKind
 import org.utbot.framework.codegen.model.tree.CgParameterizedTestDataProviderMethod
 import org.utbot.framework.codegen.model.tree.CgRegion
 import org.utbot.framework.codegen.model.tree.CgReturnStatement
@@ -448,7 +448,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                     //actual result is primitive to support cases with exceptions.
                     resultModel = if (result is UtPrimitiveModel) assemble(result) else result
 
-                    val expectedVariable = currentMethodParameters[CgParameterType.ExpectedResult]!!
+                    val expectedVariable = currentMethodParameters[CgParameterKind.ExpectedResult]!!
                     val expectedExpression = CgNotNullAssertion(expectedVariable)
 
                     assertEquality(expectedExpression, actual)
@@ -1234,11 +1234,11 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                 val testParameterDeclarations = createParameterDeclarations(testSet, genericExecution)
                 val mainBody = {
                     // build this instance
-                    thisInstance = genericExecution.stateBefore.thisInstance?.let { currentMethodParameters[CgParameterType.ThisInstance] }
+                    thisInstance = genericExecution.stateBefore.thisInstance?.let { currentMethodParameters[CgParameterKind.ThisInstance] }
 
                     // build arguments for method under test and parameterized test
                     for (index in genericExecution.stateBefore.parameters.indices) {
-                        methodArguments += currentMethodParameters[CgParameterType.Argument(index)]!!
+                        methodArguments += currentMethodParameters[CgParameterKind.Argument(index)]!!
                     }
 
                     //record result and generate result assertions
@@ -1292,7 +1292,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                     isReferenceType = true
                 )
                 this += thisInstance
-                currentMethodParameters[CgParameterType.ThisInstance] = thisInstance.parameter
+                currentMethodParameters[CgParameterKind.ThisInstance] = thisInstance.parameter
             }
             // arguments
             for (index in genericExecution.stateBefore.parameters.indices) {
@@ -1314,7 +1314,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                     isReferenceType = argumentType.isRefType
                 )
                 this += argument
-                currentMethodParameters[CgParameterType.Argument(index)] = argument.parameter
+                currentMethodParameters[CgParameterKind.Argument(index)] = argument.parameter
             }
 
             val method = currentExecutable as MethodId
@@ -1334,7 +1334,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                     isReferenceType = wrappedType.isRefType
                 )
                 this += expectedResult
-                currentMethodParameters[CgParameterType.ExpectedResult] = expectedResult.parameter
+                currentMethodParameters[CgParameterKind.ExpectedResult] = expectedResult.parameter
             }
 
             if (containsFailureExecution) {
@@ -1347,7 +1347,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                     isReferenceType = true
                 )
                 this += expectedException
-                currentMethodParameters[CgParameterType.ExpectedException] = expectedException.parameter
+                currentMethodParameters[CgParameterKind.ExpectedException] = expectedException.parameter
             }
         }
     }

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/CgElement.kt

@@ -4,9 +4,9 @@ import org.utbot.common.WorkaroundReason
 import org.utbot.common.workaround
 import org.utbot.framework.codegen.Import
 import org.utbot.framework.codegen.model.constructor.tree.TestsGenerationReport
-import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
 import org.utbot.framework.codegen.model.util.CgExceptionHandler
 import org.utbot.framework.codegen.model.visitor.CgVisitor
+import org.utbot.framework.plugin.api.BuiltinClassId
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ConstructorId
 import org.utbot.framework.plugin.api.DocClassLinkStmt
@@ -26,7 +26,6 @@ import org.utbot.framework.plugin.api.util.intClassId
 import org.utbot.framework.plugin.api.util.objectArrayClassId
 import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.framework.plugin.api.util.voidClassId
-import kotlin.math.exp
 
 interface CgElement {
     // TODO: order of cases is important here due to inheritance between some of the element types
@@ -584,9 +583,13 @@ open class CgVariable(
  */
 class CgNotNullAssertion(val expression: CgExpression) : CgValue {
     override val type: ClassId
-        get() {
-            val expressionType = expression.type
-            return ClassId(
+        get() = when (val expressionType = expression.type) {
+            is BuiltinClassId -> BuiltinClassId(
+                name = expressionType.name,
+                canonicalName = expressionType.canonicalName,
+                simpleName = expressionType.simpleName,
+            )
+            else -> ClassId(
                 expressionType.name,
                 expressionType.elementClassId,
                 isNullable = false
@@ -617,17 +620,17 @@ data class CgParameterDeclaration(
 }
 
 /**
- * Test methd parameter can be one of the following types:
+ * Test method parameter can be one of the following types:
  * - this instance for method under test (MUT)
  * - argument of MUT with a certain index
  * - result expected from MUT with the given arguments
  * - exception expected from MUT with the given arguments
  */
-sealed class CgParameterType {
-    object ThisInstance : CgParameterType()
-    data class Argument(val index: Int) : CgParameterType()
-    object ExpectedResult : CgParameterType()
-    object ExpectedException : CgParameterType()
+sealed class CgParameterKind {
+    object ThisInstance : CgParameterKind()
+    data class Argument(val index: Int) : CgParameterKind()
+    object ExpectedResult : CgParameterKind()
+    object ExpectedException : CgParameterKind()
 }