Merge branch 'main' into kononov-engine-process-idea

Author: Domonion

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

@@ -2,9 +2,13 @@ name: "UTBot Java: build and run tests"
 
 on:  
   push:
-    branches: [main]
+    branches:
+      - 'main'
+      - 'unit-test-bot/r**'
   pull_request:
-    branches: [main]
+    branches:
+      - 'main'
+      - 'unit-test-bot/r**'
 
 env:
   REGISTRY: ghcr.io

.github/workflows/publish-plugin-and-cli-from-branch.yml

@@ -18,6 +18,7 @@ on:
           default: no-postfix
           options:
           - no-postfix
+          - no-postfix-prod
           - alpha
           - beta
 
@@ -42,7 +43,12 @@ jobs:
           # defining or updating the environment variable and writing this to the GITHUB_ENV environment file."
           echo "VERSION="$(date +%Y).$(date +%-m).${GITHUB_RUN_NUMBER}"" >> $GITHUB_ENV
           echo "POSTFIX=${{ github.event.inputs.version-postfix }}" >> $GITHUB_ENV
-          
+
+      - name: Set production version
+        if: ${{ github.event.inputs.version-postfix == 'no-postfix-prod' || github.event.inputs.version-postfix == 'alpha' || github.event.inputs.version-postfix == 'beta' }}
+        run: |
+          echo "VERSION="$(date +%Y).$(date +%-m)"" >> $GITHUB_ENV
+
       - name: Create version with postfix
         if: ${{ (env.POSTFIX == 'alpha') || (env.POSTFIX == 'beta') }}
         run:

.github/workflows/publish-plugin-and-cli.yml

@@ -1,7 +1,9 @@
 name: "Plugin and CLI: publish as archives"
 on:
   push:
-    branches: [main]
+    branches:
+      - 'main'
+      - 'unit-test-bot/r**'
 
 jobs:
     publish_plugin_and_cli:

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

@@ -197,7 +197,7 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
         UtSettings.treatOverflowAsError = treatOverflowAsError == TreatOverflowAsError.AS_ERROR
 
         return TestCaseGenerator(
-            workingDirectory,
+            listOf(workingDirectory),
             classPathNormalized,
             System.getProperty("java.class.path"),
             JdkInfoDefaultProvider().info

utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt

@@ -114,7 +114,7 @@ object UtBotJavaApi {
 
         testSets.addAll(withUtContext(utContext) {
             val buildPath = FileUtil.isolateClassFiles(classUnderTest).toPath()
-            TestCaseGenerator(buildPath, classpath, dependencyClassPath, jdkInfo = JdkInfoDefaultProvider().info)
+            TestCaseGenerator(listOf(buildPath), classpath, dependencyClassPath, jdkInfo = JdkInfoDefaultProvider().info)
                 .generate(
                     methodsForAutomaticGeneration.map {
                         it.methodToBeTestedFromUserInput.executableId
@@ -174,7 +174,7 @@ object UtBotJavaApi {
 
         return withUtContext(UtContext(classUnderTest.classLoader)) {
             val buildPath = FileUtil.isolateClassFiles(classUnderTest).toPath()
-            TestCaseGenerator(buildPath, classpath, dependencyClassPath, jdkInfo = JdkInfoDefaultProvider().info)
+            TestCaseGenerator(listOf(buildPath), classpath, dependencyClassPath, jdkInfo = JdkInfoDefaultProvider().info)
                 .generate(
                     methodsForAutomaticGeneration.map {
                         it.methodToBeTestedFromUserInput.executableId

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt

@@ -834,7 +834,8 @@ internal abstract class CgAbstractRenderer(
     }
 
     protected open fun isAccessibleBySimpleNameImpl(classId: ClassId): Boolean =
-        classId in context.importedClasses || classId.packageName == context.classPackageName
+        classId in context.importedClasses ||
+                classId.simpleName !in context.importedClasses.map { it.simpleName } && classId.packageName == context.classPackageName
 
     protected abstract fun escapeNamePossibleKeywordImpl(s: String): String
 

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

@@ -52,14 +52,14 @@ import kotlin.reflect.KCallable
  * Generates test cases: one by one or a whole set for the method under test.
  *
  * Note: the instantiating of [TestCaseGenerator] may take some time,
- * because it requires initializing Soot for the current [buildDir] and [classpath].
+ * because it requires initializing Soot for the current [buildDirs] and [classpath].
  *
  * @param jdkInfo specifies the JRE and the runtime library version used for analysing system classes and user's code.
- * @param forceSootReload forces to reinitialize Soot even if the previous buildDir equals to [buildDir] and previous
+ * @param forceSootReload forces to reinitialize Soot even if the previous buildDirs equals to [buildDirs] and previous
  * classpath equals to [classpath]. This is the case for plugin scenario, as the source code may be modified.
  */
 open class TestCaseGenerator(
-    private val buildDir: Path,
+    private val buildDirs: List<Path>,
     private val classpath: String?,
     private val dependencyPaths: String,
     private val jdkInfo: JdkInfo,
@@ -71,21 +71,21 @@ open class TestCaseGenerator(
     private val timeoutLogger: KLogger = KotlinLogging.logger(logger.name + ".timeout")
 
     private val classpathForEngine: String
-        get() = buildDir.toString() + (classpath?.let { File.pathSeparator + it } ?: "")
+        get() = (buildDirs + listOfNotNull(classpath)).joinToString(File.pathSeparator)
 
     init {
         if (!isCanceled()) {
             checkFrameworkDependencies(dependencyPaths)
 
-            logger.trace("Initializing ${this.javaClass.name} with buildDir = $buildDir, classpath = $classpath")
+            logger.trace("Initializing ${this.javaClass.name} with buildDirs = ${buildDirs.joinToString(File.pathSeparator)}, classpath = $classpath")
 
 
             if (disableCoroutinesDebug) {
                 System.setProperty(kotlinx.coroutines.DEBUG_PROPERTY_NAME, kotlinx.coroutines.DEBUG_PROPERTY_VALUE_OFF)
             }
 
             timeoutLogger.trace().bracket("Soot initialization") {
-                SootUtils.runSoot(buildDir, classpath, forceSootReload, jdkInfo)
+                SootUtils.runSoot(buildDirs, classpath, forceSootReload, jdkInfo)
             }
 
             //warmup

utbot-framework/src/main/kotlin/org/utbot/framework/util/SootUtils.kt

@@ -1,41 +1,7 @@
 package org.utbot.framework.util
 
-import org.utbot.api.mock.UtMock
 import org.utbot.common.FileUtil
-import org.utbot.engine.UtNativeStringWrapper
 import org.utbot.engine.jimpleBody
-import org.utbot.engine.overrides.Boolean
-import org.utbot.engine.overrides.Byte
-import org.utbot.engine.overrides.Character
-import org.utbot.engine.overrides.Class
-import org.utbot.engine.overrides.Integer
-import org.utbot.engine.overrides.Long
-import org.utbot.engine.overrides.PrintStream
-import org.utbot.engine.overrides.Short
-import org.utbot.engine.overrides.System
-import org.utbot.engine.overrides.UtArrayMock
-import org.utbot.engine.overrides.UtLogicMock
-import org.utbot.engine.overrides.UtOverrideMock
-import org.utbot.engine.overrides.collections.AbstractCollection
-import org.utbot.engine.overrides.collections.AssociativeArray
-import org.utbot.engine.overrides.collections.Collection
-import org.utbot.engine.overrides.collections.List
-import org.utbot.engine.overrides.collections.RangeModifiableUnlimitedArray
-import org.utbot.engine.overrides.collections.UtArrayList
-import org.utbot.engine.overrides.collections.UtGenericAssociative
-import org.utbot.engine.overrides.collections.UtGenericStorage
-import org.utbot.engine.overrides.collections.UtHashMap
-import org.utbot.engine.overrides.collections.UtHashSet
-import org.utbot.engine.overrides.collections.UtLinkedList
-import org.utbot.engine.overrides.collections.UtLinkedListWithNullableCheck
-import org.utbot.engine.overrides.collections.UtOptional
-import org.utbot.engine.overrides.collections.UtOptionalDouble
-import org.utbot.engine.overrides.collections.UtOptionalInt
-import org.utbot.engine.overrides.collections.UtOptionalLong
-import org.utbot.engine.overrides.stream.*
-import org.utbot.engine.overrides.strings.UtString
-import org.utbot.engine.overrides.strings.UtStringBuffer
-import org.utbot.engine.overrides.strings.UtStringBuilder
 import org.utbot.engine.pureJavaSignature
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.services.JdkInfo
@@ -56,40 +22,40 @@ object SootUtils {
      *
      * @param jdkInfo specifies the JRE and the runtime library version used for analysing system classes and user's
      * code.
-     * @param forceReload forces to reinitialize Soot even if the [previousBuildDir] equals to the class buildDir.
+     * @param forceReload forces to reinitialize Soot even if the [previousBuildDirs] equals to the class buildDir.
      */
-    fun runSoot(clazz: java.lang.Class<*>, forceReload: kotlin.Boolean, jdkInfo: JdkInfo) {
+    fun runSoot(clazz: Class<*>, forceReload: Boolean, jdkInfo: JdkInfo) {
         val buildDir = FileUtil.locateClassPath(clazz) ?: FileUtil.isolateClassFiles(clazz)
         val buildDirPath = buildDir.toPath()
 
-        runSoot(buildDirPath, null, forceReload, jdkInfo)
+        runSoot(listOf(buildDirPath), null, forceReload, jdkInfo)
     }
 
 
     /**
      * @param jdkInfo specifies the JRE and the runtime library version used for analysing system classes and user's
      * code.
-     * @param forceReload forces to reinitialize Soot even if the [previousBuildDir] equals to [buildDirPath] and
+     * @param forceReload forces to reinitialize Soot even if the [previousBuildDirs] equals to [buildDirPaths] and
      * [previousClassPath] equals to [classPath].
      */
-    fun runSoot(buildDirPath: Path, classPath: String?, forceReload: kotlin.Boolean, jdkInfo: JdkInfo) {
+    fun runSoot(buildDirPaths: List<Path>, classPath: String?, forceReload: Boolean, jdkInfo: JdkInfo) {
         synchronized(this) {
-            if (buildDirPath != previousBuildDir || classPath != previousClassPath || forceReload) {
-                initSoot(buildDirPath, classPath, jdkInfo)
-                previousBuildDir = buildDirPath
+            if (buildDirPaths != previousBuildDirs || classPath != previousClassPath || forceReload) {
+                initSoot(buildDirPaths, classPath, jdkInfo)
+                previousBuildDirs = buildDirPaths
                 previousClassPath = classPath
             }
         }
     }
 
-    private var previousBuildDir: Path? = null
+    private var previousBuildDirs: List<Path>? = null
     private var previousClassPath: String? = null
 }
 
 /**
  * Convert code to Jimple
  */
-private fun initSoot(buildDir: Path, classpath: String?, jdkInfo: JdkInfo) {
+private fun initSoot(buildDirs: List<Path>, classpath: String?, jdkInfo: JdkInfo) {
     G.reset()
     val options = Options.v()
 
@@ -105,7 +71,7 @@ private fun initSoot(buildDir: Path, classpath: String?, jdkInfo: JdkInfo) {
                     + if (!classpath.isNullOrEmpty()) File.pathSeparator + "$classpath" else ""
         )
         set_src_prec(Options.src_prec_only_class)
-        set_process_dir(listOf("$buildDir"))
+        set_process_dir(buildDirs.map { it.toString() })
         set_keep_line_number(true)
         set_ignore_classpath_errors(true) // gradle/build/resources/main does not exists, but it's not a problem
         set_output_format(Options.output_format_jimple)
@@ -141,69 +107,69 @@ fun jimpleBody(method: ExecutableId): JimpleBody =
     method.sootMethod.jimpleBody()
 
 
-private fun addBasicClasses(vararg classes: java.lang.Class<*>) {
+private fun addBasicClasses(vararg classes: Class<*>) {
     classes.forEach {
         Scene.v().addBasicClass(it.name, SootClass.BODIES)
     }
 }
 
 private val classesToLoad = arrayOf(
-    AbstractCollection::class,
-    UtMock::class,
-    UtOverrideMock::class,
-    UtLogicMock::class,
-    UtArrayMock::class,
-    Boolean::class,
-    Byte::class,
-    Character::class,
-    Class::class,
-    Integer::class,
-    Long::class,
-    Short::class,
-    System::class,
-    UtOptional::class,
-    UtOptionalInt::class,
-    UtOptionalLong::class,
-    UtOptionalDouble::class,
-    UtArrayList::class,
-    UtArrayList.UtArrayListIterator::class,
-    UtLinkedList::class,
-    UtLinkedListWithNullableCheck::class,
-    UtLinkedList.UtLinkedListIterator::class,
-    UtLinkedList.ReverseIteratorWrapper::class,
-    UtHashSet::class,
-    UtHashSet.UtHashSetIterator::class,
-    UtHashMap::class,
-    UtHashMap.Entry::class,
-    UtHashMap.LinkedEntryIterator::class,
-    UtHashMap.LinkedEntrySet::class,
-    UtHashMap.LinkedHashIterator::class,
-    UtHashMap.LinkedKeyIterator::class,
-    UtHashMap.LinkedKeySet::class,
-    UtHashMap.LinkedValueIterator::class,
-    UtHashMap.LinkedValues::class,
-    RangeModifiableUnlimitedArray::class,
-    AssociativeArray::class,
-    UtGenericStorage::class,
-    UtGenericAssociative::class,
-    PrintStream::class,
-    UtNativeStringWrapper::class,
-    UtString::class,
-    UtStringBuilder::class,
-    UtStringBuffer::class,
-    Stream::class,
-    Arrays::class,
-    Collection::class,
-    List::class,
-    UtStream::class,
-    UtIntStream::class,
-    UtLongStream::class,
-    UtDoubleStream::class,
-    UtStream.UtStreamIterator::class,
-    UtIntStream.UtIntStreamIterator::class,
-    UtLongStream.UtLongStreamIterator::class,
-    UtDoubleStream.UtDoubleStreamIterator::class,
-    IntStream::class,
-    LongStream::class,
-    DoubleStream::class,
+    org.utbot.engine.overrides.collections.AbstractCollection::class,
+    org.utbot.api.mock.UtMock::class,
+    org.utbot.engine.overrides.UtOverrideMock::class,
+    org.utbot.engine.overrides.UtLogicMock::class,
+    org.utbot.engine.overrides.UtArrayMock::class,
+    org.utbot.engine.overrides.Boolean::class,
+    org.utbot.engine.overrides.Byte::class,
+    org.utbot.engine.overrides.Character::class,
+    org.utbot.engine.overrides.Class::class,
+    org.utbot.engine.overrides.Integer::class,
+    org.utbot.engine.overrides.Long::class,
+    org.utbot.engine.overrides.Short::class,
+    org.utbot.engine.overrides.System::class,
+    org.utbot.engine.overrides.collections.UtOptional::class,
+    org.utbot.engine.overrides.collections.UtOptionalInt::class,
+    org.utbot.engine.overrides.collections.UtOptionalLong::class,
+    org.utbot.engine.overrides.collections.UtOptionalDouble::class,
+    org.utbot.engine.overrides.collections.UtArrayList::class,
+    org.utbot.engine.overrides.collections.UtArrayList.UtArrayListIterator::class,
+    org.utbot.engine.overrides.collections.UtLinkedList::class,
+    org.utbot.engine.overrides.collections.UtLinkedListWithNullableCheck::class,
+    org.utbot.engine.overrides.collections.UtLinkedList.UtLinkedListIterator::class,
+    org.utbot.engine.overrides.collections.UtLinkedList.ReverseIteratorWrapper::class,
+    org.utbot.engine.overrides.collections.UtHashSet::class,
+    org.utbot.engine.overrides.collections.UtHashSet.UtHashSetIterator::class,
+    org.utbot.engine.overrides.collections.UtHashMap::class,
+    org.utbot.engine.overrides.collections.UtHashMap.Entry::class,
+    org.utbot.engine.overrides.collections.UtHashMap.LinkedEntryIterator::class,
+    org.utbot.engine.overrides.collections.UtHashMap.LinkedEntrySet::class,
+    org.utbot.engine.overrides.collections.UtHashMap.LinkedHashIterator::class,
+    org.utbot.engine.overrides.collections.UtHashMap.LinkedKeyIterator::class,
+    org.utbot.engine.overrides.collections.UtHashMap.LinkedKeySet::class,
+    org.utbot.engine.overrides.collections.UtHashMap.LinkedValueIterator::class,
+    org.utbot.engine.overrides.collections.UtHashMap.LinkedValues::class,
+    org.utbot.engine.overrides.collections.RangeModifiableUnlimitedArray::class,
+    org.utbot.engine.overrides.collections.AssociativeArray::class,
+    org.utbot.engine.overrides.collections.UtGenericStorage::class,
+    org.utbot.engine.overrides.collections.UtGenericAssociative::class,
+    org.utbot.engine.overrides.PrintStream::class,
+    org.utbot.engine.UtNativeStringWrapper::class,
+    org.utbot.engine.overrides.strings.UtString::class,
+    org.utbot.engine.overrides.strings.UtStringBuilder::class,
+    org.utbot.engine.overrides.strings.UtStringBuffer::class,
+    org.utbot.engine.overrides.stream.Stream::class,
+    org.utbot.engine.overrides.stream.Arrays::class,
+    org.utbot.engine.overrides.collections.Collection::class,
+    org.utbot.engine.overrides.collections.List::class,
+    org.utbot.engine.overrides.stream.UtStream::class,
+    org.utbot.engine.overrides.stream.UtIntStream::class,
+    org.utbot.engine.overrides.stream.UtLongStream::class,
+    org.utbot.engine.overrides.stream.UtDoubleStream::class,
+    org.utbot.engine.overrides.stream.UtStream.UtStreamIterator::class,
+    org.utbot.engine.overrides.stream.UtIntStream.UtIntStreamIterator::class,
+    org.utbot.engine.overrides.stream.UtLongStream.UtLongStreamIterator::class,
+    org.utbot.engine.overrides.stream.UtDoubleStream.UtDoubleStreamIterator::class,
+    org.utbot.engine.overrides.stream.IntStream::class,
+    org.utbot.engine.overrides.stream.LongStream::class,
+    org.utbot.engine.overrides.stream.DoubleStream::class,
 ).map { it.java }.toTypedArray()