Add cli processor for sbft

tamarinvs19 · tamarinvs19 · commit cdce10601bd8 · 2023-11-07T17:10:50.000+03:00
diff --git a/utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/Application.kt b/utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/Application.kt
@@ -10,6 +10,7 @@ import mu.KotlinLogging
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.core.config.Configurator
 import org.slf4j.event.Level
+import org.utbot.cli.language.python.sbft.SbftGenerateTestsCommand
 import java.util.*
 import kotlin.system.exitProcess
 
@@ -29,10 +30,13 @@ class UtBotPythonCli : CliktCommand(name = "UnitTestBot Python Command Line Inte
 
 fun main(args: Array<String>) = try {
     UtBotPythonCli().subcommands(
-        PythonGenerateTestsCommand(),
-        PythonRunTestsCommand(),
-        PythonTypeInferenceCommand()
+        SbftGenerateTestsCommand()
     ).main(args)
+//    UtBotPythonCli().subcommands(
+//        PythonGenerateTestsCommand(),
+//        PythonRunTestsCommand(),
+//        PythonTypeInferenceCommand()
+//    ).main(args)
 } catch (ex: Throwable) {
     ex.printStackTrace()
     exitProcess(1)
diff --git a/utbot-python-executor/src/main/python/utbot_executor/pyproject.toml b/utbot-python-executor/src/main/python/utbot_executor/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utbot-executor"
-version = "1.9.0.dev10"
+version = "1.9.0"
 description = ""
 authors = ["Vyacheslav Tamarin <vyacheslav.tamarin@yandex.ru>"]
 readme = "README.md"
diff --git a/utbot-python-executor/src/main/resources/utbot_executor_version b/utbot-python-executor/src/main/resources/utbot_executor_version
@@ -1 +1 @@
-1.9.0.dev10
+1.9.0
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationConfig.kt b/utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationConfig.kt
@@ -23,7 +23,7 @@ class PythonTestGenerationConfig(
     val timeout: Long,
     val timeoutForRun: Long,
     val testFramework: TestFramework,
-    val testSourceRootPath: Path,
+    val testSourceRootPath: Path?,
     val withMinimization: Boolean,
     val isCanceled: () -> Boolean,
     val runtimeExceptionTestsBehaviour: RuntimeExceptionTestsBehaviour,
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationProcessor.kt b/utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationProcessor.kt
@@ -98,7 +98,13 @@ abstract class PythonTestGenerationProcessor {
         return notEmptyTests
     }
 
-    fun testCodeGenerate(testSets: List<PythonTestSet>): String {
+    fun testCodeGenerateSplitImports(testSets: List<PythonTestSet>): Pair<String, Set<PythonImport>> {
+        val allImports = collectImports(testSets)
+        val code = testCodeGenerate(testSets, true)
+        return code to allImports
+    }
+
+    fun testCodeGenerate(testSets: List<PythonTestSet>, skipImports: Boolean = false): String {
         val containingClassName = getContainingClassName(testSets)
         val classId = PythonClassId(configuration.testFileInformation.moduleName, containingClassName)
 
@@ -123,7 +129,7 @@ abstract class PythonTestGenerationProcessor {
             methodIds[testSet.method] as ExecutableId to params
         }.toMutableMap()
 
-        val allImports = collectImports(testSets)
+        val allImports = if (skipImports) emptySet() else collectImports(testSets)
 
         val context = UtContext(this::class.java.classLoader)
         withUtContext(context) {
