First adoption of JCDB

.github/workflows/build-and-run-tests-from-branch.yml

@@ -30,10 +30,10 @@ jobs:
     steps:
       - name: Print environment variables
         run: printenv
-        
+
       - name: Checkout repository
         uses: actions/checkout@v3
-      
+
       - name: Check out ${{ github.event.inputs.commit_sha }} commit
         if: github.event.inputs.commit_sha != ''
         run: |
@@ -47,10 +47,10 @@ jobs:
           echo $TASKS
   framework:
     # This job does not need to wait for 'prepare-tests-matrix' result.
-    # GitHub allocates runners portionally. Framework tests are time consuming. That's why we want to force them 
+    # GitHub allocates runners portionally. Framework tests are time consuming. That's why we want to force them
     # to start execution early.
     needs: prepare-tests-matrix
-    # Using matrices let create multiple jobs runs based on the combinations of the variables from matrices. 
+    # Using matrices let create multiple jobs runs based on the combinations of the variables from matrices.
     # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
     strategy:
     # The option forces to execute all jobs even though some of them have failed.
@@ -61,7 +61,7 @@ jobs:
     steps:
     - name: Print environment variables
       run: printenv
-      
+
     - name: Checkout repository
       uses: actions/checkout@v3
 
@@ -103,7 +103,7 @@ jobs:
 
   project:
     needs: prepare-tests-matrix
-    # Using matrices let create multiple jobs runs based on the combinations of the variables from matrices. 
+    # Using matrices let create multiple jobs runs based on the combinations of the variables from matrices.
     # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
     strategy:
     # The option forces to execute all jobs even though some of them have failed.

.github/workflows/build-and-run-tests-java11

@@ -0,0 +1,45 @@
+name: "[M] UTBot Java (11): build and run tests"
+
+on:
+  workflow_dispatch
+
+jobs:
+  build-and-run-tests:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'zulu'
+        java-package: jdk+fx
+        cache: gradle
+    - uses: gradle/gradle-build-action@v2
+      with:
+        gradle-version: 7.4.2
+
+    - name: Build and run tests in UTBot Java
+      run: |
+        export KOTLIN_HOME="/usr"
+        gradle clean build --no-daemon
+
+    - name: Upload utbot-framework logs
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: utbot_framework_logs
+        path: utbot-framework/logs/*
+
+    - name: Upload utbot-framework tests report artifacts if tests have failed
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: utbot_framework_tests_report
+        path: utbot-framework/build/reports/tests/test/*
+
+    - name: Upload utbot-intellij tests report artifacts if tests have failed
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: utbot_intellij_tests_report
+        path: utbot-intellij/build/reports/tests/test/*

utbot-analytics/build.gradle

@@ -13,13 +13,13 @@ compileKotlin.dependsOn project(':utbot-instrumentation').tasks.jar
 compileTestJava.dependsOn tasks.getByPath(':utbot-framework:testClasses')
 
 dependencies {
-    implementation(project(":utbot-api"))
-    implementation(project(":utbot-core"))
-    implementation(project(":utbot-summary"))
-    implementation(project(":utbot-framework-api"))
-    implementation(project(":utbot-fuzzers"))
-    implementation(project(":utbot-instrumentation"))
-    implementation(project(":utbot-framework"))
+    implementation project(":utbot-api")
+    implementation project(":utbot-core")
+    implementation project(":utbot-summary")
+    implementation project(":utbot-framework-api")
+    implementation project(":utbot-fuzzers")
+    implementation project(":utbot-instrumentation")
+    implementation project(":utbot-framework")
     testImplementation project(':utbot-sample')
     testImplementation group: 'junit', name: 'junit', version: junit4_version
 

utbot-cli/src/main/kotlin/org/utbot/cli/BunchTestGeneratorCommand.kt

@@ -4,19 +4,20 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.choice
+import kotlinx.coroutines.runBlocking
+import mu.KotlinLogging
 import org.utbot.cli.util.createClassLoader
 import org.utbot.engine.Mocker
-import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.framework.plugin.api.util.UtContext
+import org.utbot.framework.plugin.api.util.utContext
 import org.utbot.framework.plugin.api.util.withUtContext
 import java.io.File
 import java.net.URLClassLoader
 import java.nio.file.Paths
 import java.time.temporal.ChronoUnit
 import kotlin.reflect.KClass
 import kotlin.reflect.jvm.jvmName
-import mu.KotlinLogging
 
 
 private val logger = KotlinLogging.logger {}
@@ -66,7 +67,7 @@ class BunchTestGeneratorCommand : GenerateTestsAbstractCommand(
         }
     }
 
-    override fun run() {
+    override fun run() = runBlocking {
         val classesFromPath = loadClassesFromPath(classLoader, classRootDirectory)
         classesFromPath.filterNot { it.java.isInterface }.filter { clazz ->
             clazz.qualifiedName != null
@@ -84,7 +85,7 @@ class BunchTestGeneratorCommand : GenerateTestsAbstractCommand(
         }
     }
 
-    private fun generateTestsForClass(targetClassFqn: String) {
+    private suspend fun generateTestsForClass(targetClassFqn: String) {
         val started = now()
         val workingDirectory = getWorkingDirectory(targetClassFqn)
             ?: throw IllegalStateException("Error: Cannot find the target class in the classpath")
@@ -109,7 +110,7 @@ class BunchTestGeneratorCommand : GenerateTestsAbstractCommand(
                     targetMethods,
                     searchDirectory = workingDirectory,
                     chosenClassesToMockAlways = (Mocker.defaultSuperClassesToMockAlwaysNames + classesToMockAlways)
-                        .mapTo(mutableSetOf()) { ClassId(it) }
+                        .mapNotNullTo(mutableSetOf()) { utContext.classpath.findClassOrNull(it) }
                 )
 
                 val testClassBody = generateTest(classUnderTest, testClassName, testSets)

utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt

@@ -1,11 +1,7 @@
 package org.utbot.cli
 
 import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.parameters.options.check
-import com.github.ajalt.clikt.parameters.options.default
-import com.github.ajalt.clikt.parameters.options.multiple
-import com.github.ajalt.clikt.parameters.options.option
-import com.github.ajalt.clikt.parameters.options.unique
+import com.github.ajalt.clikt.parameters.options.*
 import com.github.ajalt.clikt.parameters.types.choice
 import com.github.ajalt.clikt.parameters.types.long
 import mu.KotlinLogging
@@ -16,20 +12,11 @@ import org.utbot.common.PathUtil.toURL
 import org.utbot.common.toPath
 import org.utbot.engine.Mocker
 import org.utbot.framework.UtSettings
-import org.utbot.framework.codegen.ForceStaticMocking
-import org.utbot.framework.codegen.MockitoStaticMocking
-import org.utbot.framework.codegen.NoStaticMocking
-import org.utbot.framework.codegen.StaticsMocking
+import org.utbot.framework.codegen.*
 import org.utbot.framework.codegen.model.CodeGenerator
-import org.utbot.framework.codegen.testFrameworkByName
-import org.utbot.framework.plugin.api.ClassId
-import org.utbot.framework.plugin.api.CodegenLanguage
-import org.utbot.framework.plugin.api.MockStrategyApi
-import org.utbot.framework.plugin.api.TreatOverflowAsError
-import org.utbot.framework.plugin.api.TestCaseGenerator
-import org.utbot.framework.plugin.api.UtMethod
-import org.utbot.framework.plugin.api.UtMethodTestSet
+import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.id
+import org.utbot.jcdb.api.ClassId
 import org.utbot.summary.summarize
 import java.io.File
 import java.lang.reflect.Method
@@ -206,7 +193,7 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
             forceStaticMocking == ForceStaticMocking.FORCE && staticsMocking is NoStaticMocking
         return CodeGenerator(
             testFramework = testFrameworkByName(testFramework),
-            classUnderTest = classUnderTest.id,
+            classUnderTest = classUnderTest.java.id,
             codegenLanguage = codegenLanguage,
             staticsMocking = staticsMocking,
             forceStaticMocking = forceStaticMocking,

utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt

@@ -1,29 +1,26 @@
 package org.utbot.cli
 
 import com.github.ajalt.clikt.parameters.arguments.argument
-import com.github.ajalt.clikt.parameters.options.check
-import com.github.ajalt.clikt.parameters.options.default
-import com.github.ajalt.clikt.parameters.options.flag
-import com.github.ajalt.clikt.parameters.options.option
-import com.github.ajalt.clikt.parameters.options.required
+import com.github.ajalt.clikt.parameters.options.*
 import com.github.ajalt.clikt.parameters.types.choice
+import kotlinx.coroutines.runBlocking
+import mu.KotlinLogging
 import org.utbot.common.PathUtil.toPath
+import org.utbot.common.filterWhen
 import org.utbot.engine.Mocker
-import org.utbot.framework.plugin.api.ClassId
+import org.utbot.framework.UtSettings
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.framework.plugin.api.UtMethodTestSet
 import org.utbot.framework.plugin.api.util.UtContext
+import org.utbot.framework.plugin.api.util.utContext
 import org.utbot.framework.plugin.api.util.withUtContext
+import org.utbot.framework.util.isKnownSyntheticMethod
 import org.utbot.sarif.SarifReport
 import org.utbot.sarif.SourceFindingStrategyDefault
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.time.temporal.ChronoUnit
 import kotlin.reflect.KClass
-import mu.KotlinLogging
-import org.utbot.common.filterWhen
-import org.utbot.framework.UtSettings
-import org.utbot.framework.util.isKnownSyntheticMethod
 
 
 private val logger = KotlinLogging.logger {}
@@ -84,7 +81,7 @@ class GenerateTestsCommand :
     )
         .flag(default = false)
 
-    override fun run() {
+    override fun run(): Unit = runBlocking {
         val started = now()
         val workingDirectory = getWorkingDirectory(targetClassFqn)
             ?: throw Exception("Cannot find the target class in the classpath")
@@ -113,7 +110,7 @@ class GenerateTestsCommand :
                     Paths.get(sourceCodeFile),
                     searchDirectory = workingDirectory,
                     chosenClassesToMockAlways = (Mocker.defaultSuperClassesToMockAlwaysNames + classesToMockAlways)
-                        .mapTo(mutableSetOf()) { ClassId(it) }
+                        .mapNotNullTo (mutableSetOf()) { utContext.classpath.findClassOrNull(it) }
                 )
                 val testClassBody = generateTest(classUnderTest, testClassName, testSets)
 

utbot-framework-api/build.gradle

@@ -26,6 +26,9 @@ dependencies {
     // TODO do we really need apache commons?
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: commons_lang_version
     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: 'a5c479bcf8'
 }
 
 compileKotlin {

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

@@ -221,7 +221,7 @@ object UtSettings {
      *
      * True by default.
      */
-    var useConcreteExecution by getBooleanProperty(true)
+    var useConcreteExecution by getBooleanProperty(false)
 
     /**
      * Enable check of full coverage for methods with code generations tests.
@@ -313,7 +313,7 @@ object UtSettings {
      *
      * False by default (for saving disk space).
      */
-    var logConcreteExecutionErrors by getBooleanProperty(false)
+    var logConcreteExecutionErrors by getBooleanProperty(true)
 
     /**
      * Number of branch instructions using for clustering executions in the test minimization phase.