UnitTestBot · tamarinvs19 · Nov 9, 2022 · Oct 5, 2022 · Oct 5, 2022 · Oct 5, 2022
diff --git a/utbot-cli-python/src/README.md b/utbot-cli-python/src/README.md
@@ -0,0 +1,101 @@
+## Build
+
+.jar file can be built in Github Actions with script `publish-plugin-and-cli-from-branch`.
+
+## Requirements
+
+ - Required Java version: 11.
+
+ - Prefered Python version: 3.8 or 3.9.
+
+    Make sure that your Python has `pip` installed (this is usually the case). [Read more about pip installation](https://pip.pypa.io/en/stable/installation/).
+
+    Before running utbot install pip requirements (or use `--install-requirements` flag in `generate_python` command):
+
+        python -m pip install mypy==0.971 astor typeshed-client coverage
+
+## Basic usage
+
+Generate tests:
+
+    java -jar utbot-cli.jar generate_python dir/file_with_sources.py -p <PYTHON_PATH> -o generated_tests.py -s dir
+
+This will generate tests for top-level functions from `file_with_sources.py`.
+
+Run generated tests:
+
+    java -jar utbot-cli.jar run_python generated_tests.py -p <PYTHON_PATH>
+
+### `generate_python` options
+
+- `-s, --sys-path <dir1>,<dir2>`              
+
+  (required) Directories to add to `sys.path`. One of directories must contain the file with the methods under test.
+
+  `sys.path` is a list of strings that specifies the search path for modules. It must include paths for all user modules that are used in imports.
+
+- `-p, --python-path <path>`           
+
+  (required) Path to Python interpreter.
+
+- `-o, --output <filename>`                
+
+  (required) File for generated tests.
+
+- `--coverage <filename>`                  
+
+  File to write coverage report.
+
+- `-c, --class <class>`
+
+  Specify top-level (ordinary, not nested) class under test. Without this option tests will be generated for top-level functions.
+
+- `-m, --methods <method1>,<method2>`
+
+  Specify methods under test.
+
+- `--install-requirements`           
+
+  Install Python requirements if missing.
+
+- `--do-not-minimize`                
+
+  Turn off minimization of the number of generated tests.
+
+- `--do-not-check-requirements`
+
+  Turn off Python requirements check (to speed up).
+
+- `--visit-only-specified-source`
+
+  Do not search for classes and imported modules in other Python files from `--sys-path` option.
+
+- `-t, --timeout INT`                
+
+  Specify the maximum time in milliseconds to spend on generating tests (60000 by default).
+
+- `--timeout-for-run INT`            
+
+  Specify the maximum time in milliseconds to spend on one function run (2000 by default).
+
+- `--test-framework [pytest|Unittest]`
+
+  Test framework to be used.
+
+### `run_python` options
+
+- `-p, --python-path <path>`
+
+  (required) Path to Python interpreter.
+
+- `--test-framework [pytest|Unittest]`
+
+  Test framework of tests to run.
+
+- `-o, --output <filename>`
+
+  Specify file for report.
+
+## Problems
+
+- Unittest can not run tests from parent directories 
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/CodeGenerator.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/CodeGenerator.kt
@@ -108,7 +108,7 @@ open class CodeGenerator(
         }
     }
 
-    fun renderClassFile(file: AbstractCgClassFile<*>): String {
+    fun renderClassFile(file: CgClassFile): String {
         val renderer = CgAbstractRenderer.makeRenderer(context)
         file.accept(renderer)
         return renderer.toString()

diff --git a/.../main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt b/.../main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt
@@ -1,5 +1,6 @@
 package org.utbot.framework.codegen.model.constructor.tree
 
+import org.utbot.framework.UtSettings
 import org.utbot.framework.codegen.ParametrizedTestSource
 import org.utbot.framework.codegen.model.constructor.CgMethodTestSet
 import org.utbot.framework.codegen.model.constructor.TestClassModel
@@ -65,8 +66,8 @@ open class CgTestClassConstructor(val context: CgContext) :
         }
     }
 
-    open fun constructTestClass(testClassModel: TestClassModel): CgTestClass {
-        return buildTestClass {
+    open fun constructTestClass(testClassModel: TestClassModel): CgClass {
+        return buildClass {
             id = currentTestClass
 
             if (currentTestClass != outerMostTestClass) {

diff --git a/...framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt b/...framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt
@@ -101,7 +101,7 @@ import org.utbot.framework.plugin.api.util.shortClassId
 
 abstract class CgAbstractRenderer(
     val context: CgRendererContext,
-    private val printer: CgPrinter = CgPrinterImpl()
+    val printer: CgPrinter = CgPrinterImpl()
 ) : CgVisitor<Unit>,
     CgPrinter by printer {
 
@@ -112,6 +112,7 @@ abstract class CgAbstractRenderer(
 
     protected open val regionStart: String = "///region"
     protected open val regionEnd: String = "///endregion"
+    protected var isInterrupted = false
 
     protected abstract val langPackage: String
 
@@ -850,7 +851,7 @@ abstract class CgAbstractRenderer(
         }
     }
 
-    protected fun renderClassFileImports(element: AbstractCgClassFile<*>) {
+    protected open fun renderClassFileImports(element: CgClassFile) {
         val regularImports = element.imports.filterIsInstance<RegularImport>()
         val staticImports = element.imports.filterIsInstance<StaticImport>()
 

diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogWindow.kt
@@ -62,7 +62,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) {
     init {
         model.pathToNode = nodeInterp.interpreterSystemDependentPath.replace("\\", "/")
         model.pathToNPM = model.pathToNode.substringBeforeLast("/") + "/" + "npm"
-        //TODO: fix.
+        //TODO: Find out how to find pathToNode from IDEA settings without extra actions from the user
         model.pathToNode = "node"
         title = "Generate Tests with UtBot"
 //        initTestFrameworkPresenceThread = thread(start = true) {

diff --git a/...-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationController.kt b/...-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationController.kt
@@ -96,10 +96,6 @@ import org.utbot.intellij.plugin.util.RunConfigurationHelper
 import org.utbot.intellij.plugin.util.extractClassMethodsIncludingNested
 import org.utbot.sarif.Sarif
 import org.utbot.sarif.SarifReport
-import java.nio.file.Path
-import java.util.concurrent.CancellationException
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 object CodeGenerationController {
     private val logger = KotlinLogging.logger {}

diff --git a/utbot-js/src/main/kotlin/api/JsTestGenerator.kt b/utbot-js/src/main/kotlin/api/JsTestGenerator.kt
@@ -7,9 +7,14 @@ import com.oracle.js.parser.ScriptEnvironment
 import com.oracle.js.parser.Source
 import com.oracle.js.parser.ir.ClassNode
 import com.oracle.js.parser.ir.FunctionNode
+import framework.api.js.JsClassId
+import framework.api.js.JsMethodId
+import framework.api.js.JsMultipleClassId
+import framework.api.js.util.isJsBasic
+import framework.api.js.util.jsErrorClassId
 import fuzzer.JsFuzzer
 import fuzzer.providers.JsObjectModelProvider
-import java.io.File
+import org.graalvm.polyglot.Context
 import org.utbot.framework.codegen.model.constructor.CgMethodTestSet
 import org.utbot.framework.plugin.api.EnvironmentModels
 import org.utbot.framework.plugin.api.ExecutableId
@@ -20,12 +25,6 @@ import org.utbot.framework.plugin.api.UtExecutionResult
 import org.utbot.framework.plugin.api.UtExecutionSuccess
 import org.utbot.framework.plugin.api.UtExplicitlyThrownException
 import org.utbot.framework.plugin.api.UtModel
-import framework.api.js.JsClassId
-import framework.api.js.JsMethodId
-import framework.api.js.JsMultipleClassId
-import framework.api.js.util.isJsBasic
-import framework.api.js.util.jsErrorClassId
-import org.graalvm.polyglot.Context
 import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.isStatic
 import org.utbot.framework.plugin.api.util.voidClassId
@@ -47,6 +46,7 @@ import settings.JsTestGenerationSettings.dummyClassName
 import utils.PathResolver
 import utils.constructClass
 import utils.toJsAny
+import java.io.File
 
 
 class JsTestGenerator(
@@ -103,11 +103,7 @@ class JsTestGenerator(
         val methods = makeMethodsToTest()
         if (methods.isEmpty()) throw IllegalArgumentException("No methods to test were found!")
         methods.forEach { funcNode ->
-            try {
-                makeTestsForMethod(classId, funcNode, classNode, context, testSets, paramNames)
-            } catch (e: Exception) {
-                throw e
-            }
+            makeTestsForMethod(classId, funcNode, classNode, context, testSets, paramNames)
         }
         val importPrefix = makeImportPrefix()
         val codeGen = JsCodeGenerator(
@@ -140,7 +136,7 @@ class JsTestGenerator(
             )
         val testsForGenerator = mutableListOf<UtExecution>()
         val errorsForGenerator = mutableMapOf<String, Int>()
-        executionResults.forEachIndexed {index, value ->
+        executionResults.forEachIndexed { index, value ->
             if (value == "Error:Timeout") {
                 errorsForGenerator["Timeout in generating test for ${
                     fuzzedValues[index]
@@ -356,4 +352,4 @@ class JsTestGenerator(
             it.value is FunctionNode
         }?.map { it.value as FunctionNode } ?: throw IllegalStateException("Can't extract methods of class $className")
     }
-}
+}
diff --git a/utbot-js/src/main/kotlin/api/JsUtModelConstructor.kt b/utbot-js/src/main/kotlin/api/JsUtModelConstructor.kt
@@ -17,7 +17,7 @@ import framework.api.js.util.jsUndefinedClassId
 
 class JsUtModelConstructor : UtModelConstructorInterface {
 
-    // TODO SEVERE: This is a very dirty prototype version. Expand!
+    // TODO SEVERE: Requires substantial expansion to other types
     @Suppress("NAME_SHADOWING")
     override fun construct(value: Any?, classId: ClassId): UtModel {
         val classId = classId as JsClassId
@@ -60,4 +60,4 @@ class JsUtModelConstructor : UtModelConstructorInterface {
             instantiationCall = instantiationCall,
         )
     }
-}
+}
diff --git a/utbot-js/src/main/kotlin/framework/codegen/JsDomain.kt b/utbot-js/src/main/kotlin/framework/codegen/JsDomain.kt
@@ -25,7 +25,6 @@ object Mocha : TestFramework(id = "Mocha", displayName = "Mocha") {
     override val methodSourceAnnotationFqn: String
         get() = throw UnsupportedOperationException("Parameterized tests are not supported for Mocha")
 
-    //TODO MINOR: think
     override val nestedClassesShouldBeStatic: Boolean
         get() = false
     override val argListClassId: ClassId

diff --git a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt
@@ -89,7 +89,7 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP
     }
 
 
-    override fun visit(element: CgTestClass) {
+    override fun visit(element: CgClass) {
         element.body.accept(this)
     }
 
@@ -162,7 +162,7 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP
         element.values.renderElements(elementsInLine)
     }
 
-    override fun visit(element: CgTestClassFile) {
+    override fun visit(element: CgClassFile) {
         element.imports.filterIsInstance<RegularImport>().forEach {
             renderRegularImport(it)
         }
@@ -248,13 +248,9 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP
         // TODO: Should we render throw statement right here?
     }
 
-    override fun visit(element: AbstractCgClass<*>) {
-        TODO("Not yet implemented")
-    }
-
-    override fun visit(element: CgTestClassBody) {
+    override fun visit(element: CgClassBody) {
         // render regions for test methods
-        for ((i, region) in (element.testMethodRegions + element.nestedClassRegions).withIndex()) {
+        for ((i, region) in (element.methodRegions + element.nestedClassRegions).withIndex()) {
             if (i != 0) println()
 
             region.accept(this)
@@ -363,7 +359,7 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP
         TODO("Not yet implemented")
     }
 
-    override fun renderClassModality(aClass: AbstractCgClass<*>) {
+    override fun renderClassModality(aClass: CgClass) {
         TODO("Not yet implemented")
     }
 

diff --git a/utbot-js/src/main/kotlin/service/BasicCoverageService.kt b/utbot-js/src/main/kotlin/service/BasicCoverageService.kt
@@ -14,7 +14,7 @@ class BasicCoverageService(
     private val context: ServiceContext,
     private val scriptTexts: List<String>,
     private val testCaseIndices: IntRange,
-): ICoverageService {
+) : ICoverageService {
 
     private val errors = mutableListOf<Int>()
     private var baseCoverage = emptyList<Int>()
@@ -46,8 +46,6 @@ class BasicCoverageService(
                 }
             }
             return res
-        } catch (e: Exception) {
-            throw Exception("Could not get coverage of test cases!")
         } finally {
             removeTempFiles()
         }
@@ -142,4 +140,4 @@ class BasicCoverageService(
         file.writeText(scriptText)
         file.createNewFile()
     }
-}
+}
diff --git a/...n/kotlin/org/utbot/python/framework/codegen/model/constructor/visitor/CgPythonRenderer.kt b/...n/kotlin/org/utbot/python/framework/codegen/model/constructor/visitor/CgPythonRenderer.kt
@@ -20,8 +20,13 @@ import org.utbot.python.framework.api.python.pythonBuiltinsModuleName
 import org.utbot.python.framework.api.python.util.pythonAnyClassId
 import org.utbot.python.framework.codegen.model.tree.*
 
-internal class CgPythonRenderer(context: CgRendererContext, printer: CgPrinter = CgPrinterImpl()) :
-    CgAbstractRenderer(context, printer), CgPythonVisitor<Unit> {
+internal class CgPythonRenderer(
+    context: CgRendererContext,
+    printer: CgPrinter = CgPrinterImpl()
+) :
+    CgAbstractRenderer(context, printer),
+    CgPythonVisitor<Unit> {
+
     override val regionStart: String = "# region"
     override val regionEnd: String = "# endregion"
 
@@ -38,7 +43,7 @@ internal class CgPythonRenderer(context: CgRendererContext, printer: CgPrinter =
     override val ClassId.methodsAreAccessibleAsTopLevel: Boolean
         get() = false
 
-    override fun visit(element: CgTestClassFile) {
+    override fun visit(element: CgClassFile) {
         renderClassFileImports(element)
 
         println()
@@ -47,7 +52,7 @@ internal class CgPythonRenderer(context: CgRendererContext, printer: CgPrinter =
         element.declaredClass.accept(this)
     }
 
-    override fun visit(element: AbstractCgClass<*>) {
+    override fun visit(element: CgClass) {
         print("class ")
         print(element.simpleName)
         if (element.superclass != null) {
@@ -114,9 +119,9 @@ internal class CgPythonRenderer(context: CgRendererContext, printer: CgPrinter =
         element.expression.accept(this)
     }
 
-    override fun visit(element: CgTestClassBody) {
+    override fun visit(element: CgClassBody) {
         // render regions for test methods
-        for ((i, region) in (element.testMethodRegions + element.nestedClassRegions).withIndex()) {
+        for ((i, region) in (element.methodRegions + element.nestedClassRegions).withIndex()) {
             if (i != 0) println()
 
             region.accept(this)
@@ -233,9 +238,8 @@ internal class CgPythonRenderer(context: CgRendererContext, printer: CgPrinter =
         throw UnsupportedOperationException()
     }
 
-    private fun renderClassFileImports(element: CgTestClassFile) {
+    override fun renderClassFileImports(element: CgClassFile) {
         element.imports
-            .toSet()
             .filterIsInstance<PythonImport>()
             .sortedBy { it.order }
             .forEach { renderPythonImport(it) }
@@ -354,7 +358,7 @@ internal class CgPythonRenderer(context: CgRendererContext, printer: CgPrinter =
         throw UnsupportedOperationException()
     }
 
-    override fun renderClassModality(aClass: AbstractCgClass<*>) {
+    override fun renderClassModality(aClass: CgClass) {
         throw UnsupportedOperationException()
     }