Fix after merge bugs

UnitTestBot · tamarinvs19 · Nov 9, 2022 · Oct 5, 2022 · Oct 5, 2022 · Oct 5, 2022
commit 07081554d3d9995c673a12e64873b4c11fae5e4a
diff --git a/...ramework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/CgMethodTestSet.kt b/...ramework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/CgMethodTestSet.kt
@@ -31,22 +31,6 @@ data class CgMethodTestSet constructor(
     ) {
         executions = from.executions
     }
-    /**
-     * For JavaScript purposes.
-     * todo: consider to remove
-     */
-    constructor(
-        executableId: ExecutableId,
-        execs: List<UtExecution> = emptyList(),
-        errors: Map<String, Int> = emptyMap()
-    ) : this(
-        executableId,
-        null,
-        errors,
-        listOf(null to execs.indices)
-    ) {
-        executions = execs
-    }
 
     constructor(
         executableId: ExecutableId,

diff --git a/...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgFieldStateManager.kt b/...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgFieldStateManager.kt
@@ -38,7 +38,7 @@ interface CgFieldStateManager {
     fun rememberFinalEnvironmentState(info: StateModificationInfo)
 }
 
-internal class CgFieldStateManagerImpl(val context: CgContext)
+class CgFieldStateManagerImpl(val context: CgContext)
     : CgContextOwner by context,
         CgFieldStateManager,
         CgCallableAccessManager by getCallableAccessManagerBy(context),

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,23 +1,18 @@
 package org.utbot.framework.codegen.model.constructor.tree
 
-import org.utbot.framework.codegen.Junit4
-import org.utbot.framework.codegen.Junit5
 import org.utbot.framework.codegen.ParametrizedTestSource
-import org.utbot.framework.codegen.TestNg
 import org.utbot.framework.codegen.model.constructor.CgMethodTestSet
 import org.utbot.framework.codegen.model.constructor.TestClassModel
 import org.utbot.framework.codegen.model.constructor.builtin.TestClassUtilMethodProvider
 import org.utbot.framework.codegen.model.constructor.context.CgContext
 import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
 import org.utbot.framework.codegen.model.constructor.name.CgNameGenerator
-import org.utbot.framework.codegen.model.constructor.name.CgNameGeneratorImpl
 import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.clearContextRelatedStorage
 import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getMethodConstructorBy
 import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getNameGeneratorBy
 import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getStatementConstructorBy
 import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getTestFrameworkManagerBy
 import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
-import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructorImpl
 import org.utbot.framework.codegen.model.tree.CgAuxiliaryClass
 import org.utbot.framework.codegen.model.tree.CgExecutableUnderTestCluster
 import org.utbot.framework.codegen.model.tree.CgMethod
@@ -293,7 +288,7 @@ open class CgTestClassConstructor(val context: CgContext) :
     protected val CgMethodTestSet.allErrors: Map<String, Int>
         get() = errors + codeGenerationErrors.getOrDefault(this, mapOf())
 
-    internal object CgComponents {
+    object CgComponents {
         /**
          * Clears all stored data for current [CgContext].
          * As far as context is created per class under test,
@@ -318,20 +313,24 @@ open class CgTestClassConstructor(val context: CgContext) :
         private val variableConstructors: MutableMap<CgContext, CgVariableConstructor> = mutableMapOf()
         private val methodConstructors: MutableMap<CgContext, CgMethodConstructor> = mutableMapOf()
 
-        fun getNameGeneratorBy(context: CgContext) = nameGenerators.getOrPut(context) { CgNameGeneratorImpl(context) }
-        fun getCallableAccessManagerBy(context: CgContext) = callableAccessManagers.getOrPut(context) { CgCallableAccessManagerImpl(context) }
-        fun getStatementConstructorBy(context: CgContext) = statementConstructors.getOrPut(context) { CgStatementConstructorImpl(context) }
-
-        fun getTestFrameworkManagerBy(context: CgContext) = when (context.testFramework) {
-            is Junit4 -> testFrameworkManagers.getOrPut(context) { Junit4Manager(context) }
-            is Junit5 -> testFrameworkManagers.getOrPut(context) { Junit5Manager(context) }
-            is TestNg -> testFrameworkManagers.getOrPut(context) { TestNgManager(context) }
-            else -> throw UnsupportedOperationException()
+        fun getNameGeneratorBy(context: CgContext) = nameGenerators.getOrPut(context) {
+            context.codeGenLanguage.getNameGeneratorBy(context)
+        }
+        fun getCallableAccessManagerBy(context: CgContext) = callableAccessManagers.getOrPut(context) {
+            context.codeGenLanguage.getCallableAccessManagerBy(context)
+        }
+        fun getStatementConstructorBy(context: CgContext) = statementConstructors.getOrPut(context) {
+            context.codeGenLanguage.getStatementConstructorBy(context)
         }
 
+        fun getTestFrameworkManagerBy(context: CgContext) =
+            testFrameworkManagers.getOrDefault(context, context.codeGenLanguage.managerByFramework(context))
+
         fun getMockFrameworkManagerBy(context: CgContext) = mockFrameworkManagers.getOrPut(context) { MockFrameworkManager(context) }
         fun getVariableConstructorBy(context: CgContext) = variableConstructors.getOrPut(context) { CgVariableConstructor(context) }
-        fun getMethodConstructorBy(context: CgContext) = methodConstructors.getOrPut(context) { CgMethodConstructor(context) }
+        fun getMethodConstructorBy(context: CgContext) = methodConstructors.getOrPut(context) {
+            context.codeGenLanguage.getMethodConstructorBy(context)
+        }
     }
 }
 
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/minimization/Minimization.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/minimization/Minimization.kt
@@ -232,7 +232,6 @@ private fun UtModel.calculateSize(used: MutableSet<UtModel> = mutableSetOf()): I
         is PythonModel -> TODO()
         is GoUtModel -> TODO()
         is JsUtModel -> TODO()
-        else -> 0
         is UtLambdaModel -> 1 + capturedValues.sumOf { it.calculateSize(used) }
         // PythonModel, GoUtModel, JsUtModel may go here
         else -> 0

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
@@ -478,6 +478,7 @@ object CodeGenerationController {
         get() = when (this) {
             CodegenLanguage.JAVA -> JavaFileType.INSTANCE
             CodegenLanguage.KOTLIN -> KotlinFileType.INSTANCE
+            else -> throw UnsupportedOperationException()
         }
 
     private fun waitForCountDown(latch: CountDownLatch, timeout: Long = 5, timeUnit: TimeUnit = TimeUnit.SECONDS, indicator : ProgressIndicator, action: Runnable) {

diff --git a/utbot-python/src/main/kotlin/org/utbot/python/PythonEngine.kt b/utbot-python/src/main/kotlin/org/utbot/python/PythonEngine.kt
@@ -5,15 +5,12 @@ import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.python.NormalizedPythonAnnotation
 import org.utbot.framework.plugin.api.python.PythonTreeModel
 import org.utbot.framework.plugin.api.python.pythonAnyClassId
-import org.utbot.fuzzer.FuzzedConcreteValue
-import org.utbot.fuzzer.FuzzedMethodDescription
-import org.utbot.fuzzer.fuzz
+import org.utbot.fuzzer.*
 import org.utbot.python.code.AnnotationProcessor.getModulesFromAnnotation
 import org.utbot.python.providers.defaultPythonModelProvider
 import org.utbot.python.utils.camelToSnakeCase
 import org.utbot.summary.fuzzer.names.MethodBasedNameSuggester
 import org.utbot.summary.fuzzer.names.ModelBasedNameSuggester
-import org.utbot.fuzzer.FuzzedValue
 import java.lang.Long.max
 
 private val logger = KotlinLogging.logger {}
@@ -138,7 +135,7 @@ class PythonEngine(
                     }
 
                     yield(
-                        UtExecution(
+                        UtFuzzedExecution(
                             stateBefore = EnvironmentModels(jobResult.thisObject, jobResult.modelList, emptyMap()),
                             stateAfter = EnvironmentModels(jobResult.thisObject, jobResult.modelList, emptyMap()),
                             result = result,

diff --git a/utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/PythonDomain.kt b/utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/PythonDomain.kt
@@ -9,7 +9,7 @@ import org.utbot.framework.plugin.api.util.methodId
 import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.framework.plugin.api.util.voidClassId
 
-object Pytest : TestFramework(displayName = "pytest") {
+object Pytest : TestFramework(displayName = "pytest", id = "pytest") {
     override val mainPackage: String = "pytest"
     override val assertionsClass: ClassId = pythonNoneClassId
     override val arraysAssertionsClass: ClassId = assertionsClass
@@ -45,7 +45,7 @@ object Pytest : TestFramework(displayName = "pytest") {
     }
 }
 
-object Unittest : TestFramework(displayName = "Unittest") {
+object Unittest : TestFramework(displayName = "Unittest", id = "Unittest") {
     override val testSuperClass: ClassId = PythonClassId("unittest.TestCase")
     override val mainPackage: String = "unittest"
     override val assertionsClass: ClassId = PythonClassId("self")

diff --git a/...rg/utbot/python/framework/codegen/model/constructor/tree/PythonCgCallableAccessManager.kt b/...rg/utbot/python/framework/codegen/model/constructor/tree/PythonCgCallableAccessManager.kt
@@ -22,6 +22,14 @@ class PythonCgCallableAccessManagerImpl(val context: CgContext) : CgCallableAcce
     override fun ClassId.get(staticMethodId: MethodId): CgIncompleteMethodCall =
         CgIncompleteMethodCall(staticMethodId, CgThisInstance(pythonAnyClassId))
 
+    override fun CgExpression.get(fieldId: FieldId): CgExpression {
+        TODO("Not yet implemented")
+    }
+
+    override fun ClassId.get(fieldId: FieldId): CgStaticFieldAccess {
+        TODO("Not yet implemented")
+    }
+
     override fun ConstructorId.invoke(vararg args: Any?): CgExecutableCall {
         val resolvedArgs = args.resolve()
         val constructorCall = CgConstructorCall(this, resolvedArgs)

diff --git a/...in/org/utbot/python/framework/codegen/model/constructor/tree/PythonCgMethodConstructor.kt b/...in/org/utbot/python/framework/codegen/model/constructor/tree/PythonCgMethodConstructor.kt
@@ -1,8 +1,10 @@
 package org.utbot.python.framework.codegen.model.constructor.tree
 
 import org.utbot.framework.codegen.model.constructor.context.CgContext
+import org.utbot.framework.codegen.model.constructor.tree.CgFieldStateManagerImpl
 import org.utbot.framework.codegen.model.constructor.tree.CgMethodConstructor
 import org.utbot.framework.codegen.model.tree.*
+import org.utbot.framework.fields.ExecutionStateAnalyzer
 import org.utbot.framework.fields.StateModificationInfo
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.python.*
@@ -36,8 +38,9 @@ class PythonCgMethodConstructor(context: CgContext) : CgMethodConstructor(contex
                 rememberInitialStaticFields(statics)
                 context.codeGenLanguage.memoryObjects.clear()
 
-//                val stateAnalyzer = ExecutionStateAnalyzer(execution)
-                val modificationInfo = StateModificationInfo() // stateAnalyzer.findModifiedFields()
+                val stateAnalyzer = ExecutionStateAnalyzer(execution)
+                val modificationInfo = stateAnalyzer.findModifiedFields()
+                val fieldStateManager = CgFieldStateManagerImpl(context)
                 // TODO: move such methods to another class and leave only 2 public methods: remember initial and final states
                 val mainBody = {
                     substituteStaticFields(statics)
@@ -51,16 +54,10 @@ class PythonCgMethodConstructor(context: CgContext) : CgMethodConstructor(contex
                         val name = paramNames[executableId]?.get(index)
                         methodArguments += variableConstructor.getOrCreateVariable(param, name)
                     }
-//                    if (executableId is PythonMethodId) {
-//                        existingVariableNames += executableId.name
-//                        executableId.moduleName.split('.').forEach {
-//                            existingVariableNames += it
-//                        }
-//                    }
-                    rememberInitialEnvironmentState(modificationInfo)
+                    fieldStateManager.rememberInitialEnvironmentState(modificationInfo)
                     recordActualResult()
                     generateResultAssertions()
-                    rememberFinalEnvironmentState(modificationInfo)
+                    fieldStateManager.rememberFinalEnvironmentState(modificationInfo)
                     generateFieldStateAssertions()
                     if (executableId is PythonMethodId)
                         generatePythonTestComments(execution)

diff --git a/...org/utbot/python/framework/codegen/model/constructor/tree/PythonCgStatementConstructor.kt b/...org/utbot/python/framework/codegen/model/constructor/tree/PythonCgStatementConstructor.kt
@@ -4,14 +4,17 @@ import fj.data.Either
 import org.utbot.framework.codegen.model.constructor.context.CgContext
 import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
 import org.utbot.framework.codegen.model.constructor.tree.CgCallableAccessManager
-import org.utbot.framework.codegen.model.constructor.util.CgComponents
+import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getCallableAccessManagerBy
+import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getNameGeneratorBy
 import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
 import org.utbot.framework.codegen.model.constructor.util.ExpressionWithType
 import org.utbot.framework.codegen.model.tree.*
 import org.utbot.framework.codegen.model.util.buildExceptionHandler
 import org.utbot.framework.codegen.model.util.isAccessibleFrom
 import org.utbot.framework.codegen.model.util.resolve
 import org.utbot.framework.plugin.api.ClassId
+import org.utbot.framework.plugin.api.ExecutableId
+import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.util.*
 import org.utbot.python.framework.codegen.model.constructor.util.*
@@ -20,9 +23,9 @@ import java.util.*
 class PythonCgStatementConstructorImpl(context: CgContext) :
     CgStatementConstructor,
     CgContextOwner by context,
-    CgCallableAccessManager by CgComponents.getCallableAccessManagerBy(context) {
+    CgCallableAccessManager by getCallableAccessManagerBy(context) {
 
-    private val nameGenerator = CgComponents.getNameGeneratorBy(context)
+    private val nameGenerator = getNameGeneratorBy(context)
 
     override fun newVar(
         baseType: ClassId,
@@ -121,6 +124,18 @@ class PythonCgStatementConstructorImpl(context: CgContext) :
         currentBlock += buildCgForEachLoop(init)
     }
 
+    override fun getClassOf(classId: ClassId): CgExpression {
+        TODO("Not yet implemented")
+    }
+
+    override fun createFieldVariable(fieldId: FieldId): CgVariable {
+        TODO("Not yet implemented")
+    }
+
+    override fun createExecutableVariable(executableId: ExecutableId, arguments: List<CgExpression>): CgVariable {
+        TODO("Not yet implemented")
+    }
+
     override fun tryBlock(init: () -> Unit): CgTryCatch = tryBlock(init, null)
 
     override fun tryBlock(init: () -> Unit, resources: List<CgDeclaration>?): CgTryCatch =

diff --git a/...org/utbot/python/framework/codegen/model/constructor/tree/PythonCgTestClassConstructor.kt b/...org/utbot/python/framework/codegen/model/constructor/tree/PythonCgTestClassConstructor.kt
@@ -1,7 +1,5 @@
 package org.utbot.python.framework.codegen.model.constructor.tree
 
-import org.utbot.framework.codegen.ParametrizedTestSource
-import org.utbot.framework.codegen.model.constructor.CgMethodTestSet
 import org.utbot.framework.codegen.model.constructor.TestClassModel
 import org.utbot.framework.codegen.model.constructor.context.CgContext
 import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor
@@ -10,104 +8,9 @@ import org.utbot.framework.codegen.model.tree.*
 internal class PythonCgTestClassConstructor(context: CgContext) : CgTestClassConstructor(context) {
     override fun construct(testClassModel: TestClassModel): CgTestClassFile {
         return buildTestClassFile {
-            this.testClass = withTestClassScope { constructTestClass(testClassModel) }
+            this.declaredClass = withTestClassScope { constructTestClass(testClassModel) }
             imports.addAll(context.collectedImports)
             testsGenerationReport = this@PythonCgTestClassConstructor.testsGenerationReport
         }
     }
-
-    override fun constructTestClass(testClassModel: TestClassModel): CgTestClass {
-        return buildTestClass {
-            id = currentTestClass
-
-            if (currentTestClass != outerMostTestClass) {
-                isNested = true
-                isStatic = testFramework.nestedClassesShouldBeStatic
-                testFrameworkManager.annotationForNestedClasses?.let {
-                    currentTestClassContext.collectedTestClassAnnotations += it
-                }
-            }
-            if (testClassModel.nestedClasses.isNotEmpty()) {
-                testFrameworkManager.annotationForOuterClasses?.let {
-                    currentTestClassContext.collectedTestClassAnnotations += it
-                }
-            }
-
-            body = buildTestClassBody {
-                for (nestedClass in testClassModel.nestedClasses) {
-                    nestedClassRegions += CgSimpleRegion(
-                        "Tests for ${nestedClass.classUnderTest.simpleName}",
-                        listOf(
-                            withNestedClassScope(nestedClass) { constructTestClass(nestedClass) }
-                        )
-                    )
-                }
-
-                for (testSet in testClassModel.methodTestSets) {
-                    updateCurrentExecutable(testSet.executableId)
-                    val currentMethodUnderTestRegions = constructTestSet(testSet) ?: continue
-                    val executableUnderTestCluster = CgExecutableUnderTestCluster(
-                        "Test suites for executable $currentExecutable",
-                        currentMethodUnderTestRegions
-                    )
-                    testMethodRegions += executableUnderTestCluster
-                }
-
-                val additionalMethods = currentTestClassContext.cgDataProviderMethods
-
-                dataProvidersAndUtilMethodsRegion += CgStaticsRegion(
-                    "Data providers and utils methods",
-                    additionalMethods
-                )
-            }
-            // It is important that annotations, superclass and interfaces assignment is run after
-            // all methods are generated so that all necessary info is already present in the context
-            with (currentTestClassContext) {
-                annotations += collectedTestClassAnnotations
-                superclass = testFramework.testSuperClass
-                interfaces += collectedTestClassInterfaces
-            }
-        }
-    }
-
-    override fun constructTestSet(testSet: CgMethodTestSet): List<CgRegion<CgMethod>>? {
-        if (testSet.executions.isEmpty()) {
-            return null
-        }
-
-        allExecutions = testSet.executions
-
-        val (methodUnderTest, _, _, clustersInfo) = testSet
-        val regions = mutableListOf<CgRegion<CgMethod>>()
-
-        when (context.parametrizedTestSource) {
-            ParametrizedTestSource.DO_NOT_PARAMETRIZE -> {
-                for ((clusterSummary, executionIndices) in clustersInfo) {
-                    val currentTestCaseTestMethods = mutableListOf<CgTestMethod>()
-                    emptyLineIfNeeded()
-                    for (i in executionIndices) {
-                        runCatching {
-                            currentTestCaseTestMethods += methodConstructor.createTestMethod(methodUnderTest, testSet.executions[i])
-                        }.onFailure { e -> processFailure(testSet, e) }
-                    }
-                    val clusterHeader = clusterSummary?.header
-                    val clusterContent = clusterSummary?.content
-                        ?.split('\n')
-                        ?.let { CgTripleSlashMultilineComment(it) }
-                    regions += CgTestMethodCluster(clusterHeader, clusterContent, currentTestCaseTestMethods)
-
-                    testsGenerationReport.addTestsByType(testSet, currentTestCaseTestMethods)
-                }
-            }
-            ParametrizedTestSource.PARAMETRIZE -> {}
-        }
-
-        val errors = testSet.allErrors
-        if (errors.isNotEmpty()) {
-            regions += methodConstructor.errorMethod(testSet.executableId, errors)
-            testsGenerationReport.addMethodErrors(testSet, errors)
-        }
-
-        return regions
-    }
 }