switching to jcdb: another portion #349

Author: lehvolk

utbot-framework-api/build.gradle

@@ -14,7 +14,7 @@ dependencies {
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
     implementation group: 'org.ow2.asm', name: 'asm', version: asm_version
 
-    api group: 'com.github.UnitTestBot.jcdb', name: 'jcdb-core', version: '7b0de88442'
+    api group: 'com.github.UnitTestBot.jcdb', name: 'jcdb-core', version: '6269be7929'
 }
 
 shadowJar {

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

@@ -134,4 +134,9 @@ suspend fun Accessible.isAccessibleFrom(packageName: String): Boolean {
 
 suspend fun ClassId.isClassAccessibleFrom(packageName: String): Boolean {
     return isPublic() || (this.packageName == packageName && (isPackagePrivate() || isProtected()))
-}
+}
+
+val ClassId.isInDefaultPackage: Boolean
+    get() {
+        return this is PredefinedPrimitive || packageName.isEmpty()
+    }

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

@@ -14,7 +14,6 @@ import org.utbot.framework.modifications.UtBotFieldsModificatorsSearcher
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.asExecutable
 import org.utbot.framework.plugin.api.util.defaultValueModel
-import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.util.nextModelName
 import org.utbot.jcdb.api.ClassId
 import org.utbot.jcdb.api.FieldId
@@ -208,7 +207,7 @@ class AssembleModelGenerator(private val methodUnderTest: UtMethod<*>) {
         }
 
         try {
-            val modelName = nextModelName(compositeModel.classId.jClass.simpleName.decapitalize())
+            val modelName = nextModelName(compositeModel.classId.simpleName.decapitalize())
 
             val instantiationChain = mutableListOf<UtStatementModel>()
             val modificationsChain = mutableListOf<UtStatementModel>()

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

@@ -709,15 +709,13 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
      * We overapproximate this assumption for all parametrized classes because we can't be sure that
      * overridden equals doesn't rely on type parameters equals.
      */
-    private suspend fun CgVariable.hasNotParametrizedCustomEquals(): Boolean {
+    private fun CgVariable.hasNotParametrizedCustomEquals(): Boolean = runBlocking {
         if (type.overridesEquals()) {
             // type parameters is list of class type parameters - empty if class is not generic
-            val resolution = runBlocking { type.resolution() }
-
-            return resolution == Raw
+            type.resolution() == Raw
+        }else {
+            false
         }
-
-        return false
     }
 
     /**
@@ -850,7 +848,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                 // TODO: How to compare arrays of Float and Double wrappers?
                 // TODO: For example, JUnit5 does not have an assertEquals() overload for these wrappers.
                 // TODO: So for now we compare arrays of these wrappers as arrays of Objects, but that is probably wrong.
-                when (expected.type..ifArrayGetElementClass()!!) {
+                when (expected.type.ifArrayGetElementClass()!!) {
                     floatClassId -> testFrameworkManager.assertFloatArrayEquals(
                         typeCast(floatArrayClassId, expected, isSafetyCast = true),
                         typeCast(floatArrayClassId, actual, isSafetyCast = true),

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt

@@ -13,9 +13,7 @@ import org.utbot.framework.fields.FieldAccess
 import org.utbot.framework.fields.FieldPath
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.*
-import org.utbot.jcdb.api.ClassId
-import org.utbot.jcdb.api.MethodId
-import org.utbot.jcdb.api.isSubtypeOf
+import org.utbot.jcdb.api.*
 
 internal data class EnvironmentFieldStateCache(
     val thisInstance: FieldStateCache,
@@ -210,15 +208,15 @@ internal suspend fun ClassId.overridesEquals(): Boolean =
     }
 
 // NOTE: this function does not consider executable return type because it is not important in our case
-internal fun ClassId.getAmbiguousOverloadsOf(executableId: ExecutableId): Sequence<ExecutableId> {
-    val allExecutables = when (executableId) {
-        is MethodExecutableId -> allMethods
-        is ConstructorExecutableId -> allConstructors
+internal fun ClassId.getAmbiguousOverloadsOf(executableId: ExecutableId): Sequence<ExecutableId> = runBlocking {
+    val methodsOrConstructors = when (executableId) {
+        is MethodExecutableId -> methods().filter { !it.isConstructor }
+        is ConstructorExecutableId -> allConstructors()
     }
 
-    return allExecutables.filter {
+    methodsOrConstructors.filter {
         it.name == executableId.name && it.parameters.size == executableId.executable.parameters.size && it.classId == executableId.classId
-    }
+    }.map { it.asExecutable() }.asSequence()
 }
 
 
@@ -262,7 +260,7 @@ internal infix fun UtModel.isDefaultValueOf(type: ClassId): Boolean =
         else -> false
     }
 
-internal infix fun UtModel.isNotDefaultValueOf(type: ClassId): Boolean = !this.isDefaultValueOf(type)
+internal infix fun UtModel.isNotDefaultValueOf(type: ClassId): Boolean = !isDefaultValueOf(type)
 
 /**
  * If the model contains a store for the given [index], return the model of this store.

utbot-framework/src/main/kotlin/org/utbot/fuzzer/FallbackModelProvider.kt

@@ -1,7 +1,6 @@
 package org.utbot.fuzzer
 
 import kotlinx.coroutines.runBlocking
-import org.utbot.engine.isPublic
 import org.utbot.framework.concrete.UtModelConstructor
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.*
@@ -25,8 +24,8 @@ open class FallbackModelProvider(
 
     private fun createModelByClassId(classId: ClassId): UtModel = runBlocking {
         val modelConstructor = UtModelConstructor(IdentityHashMap())
-        val defaultConstructor = classId.jClass.constructors.firstOrNull {
-            it.parameters.isEmpty() && it.isPublic
+        val defaultConstructor = classId.allConstructors().firstOrNull {
+            it.parameters().isEmpty() && it.isPublic()
         }
         when {
             classId.isPrimitive ->
@@ -42,7 +41,7 @@ open class FallbackModelProvider(
             classId.isIterable -> {
                 @Suppress("RemoveRedundantQualifierName") // ArrayDeque must be taken from java, not from kotlin
                 val defaultInstance = when {
-                    defaultConstructor != null -> defaultConstructor.newInstance()
+                    defaultConstructor != null -> (defaultConstructor.asExecutable() as ConstructorExecutableId).constructor.newInstance()
                     classId isSubtypeOf asClass<java.util.ArrayList<*>>() -> ArrayList<Any>()
                     classId isSubtypeOf asClass<java.util.TreeSet<*>>() -> TreeSet<Any>()
                     classId isSubtypeOf asClass<java.util.HashMap<*,*>>() -> HashMap<Any, Any>()

utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt

@@ -7,7 +7,6 @@ import org.utbot.common.ClassLocation
 import org.utbot.common.FileUtil.findPathToClassFiles
 import org.utbot.common.FileUtil.locateClass
 import org.utbot.common.WorkaroundReason.HACK
-import org.utbot.common.findField
 import org.utbot.common.workaround
 import org.utbot.engine.prettify
 import org.utbot.framework.UtSettings.checkSolverTimeoutMillis
@@ -148,7 +147,7 @@ internal abstract class UtModelTestCaseChecker(
      * Finds field model in [UtCompositeModel] and [UtAssembleModel]. For assemble model supports direct field access only.
      */
     protected fun UtModel.findField(fieldName: String): UtModel =
-        findField(this.classId.jClass.findField(fieldName).fieldId)
+        findField(classId.findField(fieldName))
 
     /**
      * Finds field model in [UtCompositeModel] and [UtAssembleModel]. For assemble model supports direct field access only.