Code style refactoring

UnitTestBot · tamarinvs19 · Nov 9, 2022 · Oct 5, 2022 · Oct 5, 2022 · Oct 5, 2022
commit c7b69a10446c9df762e7eda9c811f071feb0a29b
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/Domain.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/Domain.kt
@@ -101,7 +101,7 @@ fun testFrameworkByName(testFramework: String): TestFramework =
  * This feature allows to enable additional mockito-core settings required for static mocking.
  * It is implemented via adding special file "MockMaker" into test project resources.
  */
-abstract class StaticsMocking(
+sealed class StaticsMocking(
     var isConfigured: Boolean = false,
     override val id: String,
     override val displayName: String,

diff --git a/...ork/src/main/kotlin/org/utbot/framework/codegen/model/constructor/name/CgNameGenerator.kt b/...ork/src/main/kotlin/org/utbot/framework/codegen/model/constructor/name/CgNameGenerator.kt
@@ -67,7 +67,7 @@ interface CgNameGenerator {
  * Class that generates names for methods and variables
  * To avoid name collisions it uses existing names information from CgContext
  */
-open class CgNameGeneratorImpl(val context: CgContext)
+class CgNameGeneratorImpl(val context: CgContext)
     : CgNameGenerator, CgContextOwner by context {
 
     override fun variableName(base: String, isMock: Boolean, isStatic: Boolean): String {
@@ -130,7 +130,7 @@ open class CgNameGeneratorImpl(val context: CgContext)
     /**
      * Creates a new indexed variable name by [base] name.
      */
-    fun nextIndexedVarName(base: String): String =
+    private fun nextIndexedVarName(base: String): String =
         infiniteInts()
             .map { "$base$it" }
             .first { it !in existingVariableNames }
@@ -140,20 +140,20 @@ open class CgNameGeneratorImpl(val context: CgContext)
      *
      * @param skipOne shows if we add "1" to first method name or not
      */
-    fun nextIndexedMethodName(base: String, skipOne: Boolean = false): String =
+    private fun nextIndexedMethodName(base: String, skipOne: Boolean = false): String =
         infiniteInts()
             .map { if (skipOne && it == 1) base else "$base$it" }
             .first { it !in existingMethodNames }
 
-    fun createNameFromKeyword(baseName: String): String = when(codegenLanguage) {
+    private fun createNameFromKeyword(baseName: String): String = when(codegenLanguage) {
         CodegenLanguage.JAVA -> nextIndexedVarName(baseName)
         CodegenLanguage.KOTLIN -> {
             // use backticks for first variable with keyword name and use indexed names for all next such variables
             if (baseName !in existingVariableNames) "`$baseName`" else nextIndexedVarName(baseName)
         }
     }
 
-    fun createExecutableName(executableId: ExecutableId): String {
+    private fun createExecutableName(executableId: ExecutableId): String {
         return when (executableId) {
             is ConstructorId -> executableId.classId.prettifiedName // TODO: maybe we need some suffix e.g. "Ctor"?
             is MethodId -> executableId.name

diff --git a/...main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt b/...main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt
@@ -86,7 +86,7 @@ interface CgCallableAccessManager {
     operator fun ClassId.get(fieldId: FieldId): CgStaticFieldAccess
 }
 
-class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableAccessManager,
+internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableAccessManager,
     CgContextOwner by context {
 
     private val statementConstructor by lazy { getStatementConstructorBy(context) }

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)
 }
 
-class CgFieldStateManagerImpl(val context: CgContext)
+internal class CgFieldStateManagerImpl(val context: CgContext)
     : CgContextOwner by context,
         CgFieldStateManager,
         CgCallableAccessManager by getCallableAccessManagerBy(context),

diff --git a/.../main/kotlin/org/utbot/framework/codegen/model/constructor/util/CgStatementConstructor.kt b/.../main/kotlin/org/utbot/framework/codegen/model/constructor/util/CgStatementConstructor.kt
@@ -186,7 +186,7 @@ interface CgStatementConstructor {
     fun wrapTypeIfRequired(baseType: ClassId): ClassId
 }
 
-class CgStatementConstructorImpl(context: CgContext) :
+internal class CgStatementConstructorImpl(context: CgContext) :
     CgStatementConstructor,
     CgContextOwner by context,
     CgCallableAccessManager by getCallableAccessManagerBy(context) {

diff --git a/...t-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt b/...t-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt
@@ -344,7 +344,7 @@ internal class CgKotlinRenderer(context: CgRendererContext, printer: CgPrinter =
         val elementsInLine = arrayElementsInLine(elementType)
 
         if (elementType.isPrimitive) {
-            val prefix = elementType.name.lowercase(Locale.getDefault())
+            val prefix = elementType.name.toLowerCase()
             print("${prefix}ArrayOf(")
             element.values.renderElements(elementsInLine)
             print(")")

diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/CgLanguageAssistant.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/CgLanguageAssistant.kt
@@ -6,6 +6,8 @@ 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.CgCallableAccessManager
 import org.utbot.framework.codegen.model.constructor.tree.CgCallableAccessManagerImpl
+import org.utbot.framework.codegen.model.constructor.tree.CgFieldStateManager
+import org.utbot.framework.codegen.model.constructor.tree.CgFieldStateManagerImpl
 import org.utbot.framework.codegen.model.constructor.tree.CgMethodConstructor
 import org.utbot.framework.codegen.model.constructor.tree.CgVariableConstructor
 import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
@@ -39,10 +41,11 @@ abstract class CgLanguageAssistant {
     open fun getNameGeneratorBy(context: CgContext): CgNameGenerator = CgNameGeneratorImpl(context)
     open fun getCallableAccessManagerBy(context: CgContext): CgCallableAccessManager =
         CgCallableAccessManagerImpl(context)
-
     open fun getStatementConstructorBy(context: CgContext): CgStatementConstructor = CgStatementConstructorImpl(context)
     open fun getVariableConstructorBy(context: CgContext): CgVariableConstructor = CgVariableConstructor(context)
     open fun getMethodConstructorBy(context: CgContext): CgMethodConstructor = CgMethodConstructor(context)
+    open fun getCgFieldStateManager(context: CgContext): CgFieldStateManager = CgFieldStateManagerImpl(context)
+
     abstract fun getLanguageTestFrameworkManager(): LanguageTestFrameworkManager
     abstract fun cgRenderer(context: CgRendererContext, printer: CgPrinter): CgAbstractRenderer
 }
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
@@ -22,7 +22,6 @@ import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Computable
-import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.psi.*
 import com.intellij.psi.codeStyle.CodeStyleManager
@@ -74,9 +73,6 @@ import java.nio.file.Path
 import java.util.concurrent.CancellationException
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
-import org.jetbrains.kotlin.idea.util.projectStructure.allModules
-import org.utbot.intellij.plugin.ui.utils.TestSourceRoot
-import org.utbot.intellij.plugin.ui.utils.isBuildWithGradle
 
 object CodeGenerationController {
     private val logger = KotlinLogging.logger {}
@@ -850,7 +846,7 @@ object CodeGenerationController {
         }
     }
 
-    fun unblockDocument(project: Project, document: Document) {
+    private fun unblockDocument(project: Project, document: Document) {
         PsiDocumentManager.getInstance(project).apply {
             commitDocument(document)
             doPostponedOperationsAndUnblockDocument(document)

diff --git a/...kotlin/org/utbot/python/framework/codegen/model/constructor/name/PythonCgNameGenerator.kt b/...kotlin/org/utbot/python/framework/codegen/model/constructor/name/PythonCgNameGenerator.kt
@@ -3,20 +3,62 @@ package org.utbot.python.framework.codegen.model.constructor.name
 import org.utbot.framework.codegen.PythonImport
 import org.utbot.framework.codegen.isLanguageKeyword
 import org.utbot.framework.codegen.model.constructor.context.CgContext
-import org.utbot.framework.codegen.model.constructor.name.CgNameGeneratorImpl
+import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
+import org.utbot.framework.codegen.model.constructor.name.CgNameGenerator
 import org.utbot.framework.plugin.api.ClassId
+import org.utbot.framework.plugin.api.ConstructorId
 import org.utbot.framework.plugin.api.ExecutableId
+import org.utbot.framework.plugin.api.MethodId
 import org.utbot.python.framework.api.python.NormalizedPythonAnnotation
 import org.utbot.python.framework.api.python.util.toSnakeCase
 
-class PythonCgNameGenerator(context_: CgContext) : CgNameGeneratorImpl(context_) {
+internal fun infiniteInts(): Sequence<Int> =
+    generateSequence(1) { it + 1 }
+
+class PythonCgNameGenerator(val context: CgContext)
+        : CgNameGenerator, CgContextOwner by context {
+
+    private fun nextIndexedVarName(base: String): String =
+        infiniteInts()
+            .map { "$base$it" }
+            .first { it !in existingVariableNames }
+
+    private fun nextIndexedMethodName(base: String, skipOne: Boolean = false): String =
+        infiniteInts()
+            .map { if (skipOne && it == 1) base else "$base$it" }
+            .first { it !in existingMethodNames }
+
+    private fun createNameFromKeyword(baseName: String): String =
+        nextIndexedVarName(baseName)
+
+    private fun createExecutableName(executableId: ExecutableId): String {
+        return when (executableId) {
+            is ConstructorId -> executableId.classId.prettifiedName
+            is MethodId -> executableId.name
+        }
+    }
 
     override fun nameFrom(id: ClassId): String =
         when (id) {
             is NormalizedPythonAnnotation -> "var"
             else -> id.simpleName.toSnakeCase()
         }
 
+    override fun variableName(base: String, isMock: Boolean, isStatic: Boolean): String {
+        val baseName = when {
+            isMock -> base + "_mock"
+            isStatic -> base + "_static"
+            else -> base
+        }
+        return when {
+            baseName in existingVariableNames -> nextIndexedVarName(baseName)
+            isLanguageKeyword(baseName, context.cgLanguageAssistant) -> createNameFromKeyword(baseName)
+            else -> baseName
+        }.also {
+            existingVariableNames = existingVariableNames.add(it)
+        }
+    }
+
     override fun variableName(type: ClassId, base: String?, isMock: Boolean): String {
         val baseName = base?.toSnakeCase() ?: nameFrom(type)
         val importedModuleNames = collectedImports.mapNotNull {
@@ -45,6 +87,14 @@ class PythonCgNameGenerator(context_: CgContext) : CgNameGeneratorImpl(context_)
         return name
     }
 
+    override fun parameterizedTestMethodName(dataProviderMethodName: String): String {
+        TODO("Not yet implemented")
+    }
+
+    override fun dataProviderMethodNameFor(executableId: ExecutableId): String {
+        TODO("Not yet implemented")
+    }
+
     override fun errorMethodNameFor(executableId: ExecutableId): String {
         val executableName = createExecutableName(executableId)
         val newName = when (val base = "test_${executableName.toSnakeCase()}_errors") {

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,7 +1,6 @@
 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.StateModificationInfo
@@ -42,7 +41,7 @@ class PythonCgMethodConstructor(context: CgContext) : CgMethodConstructor(contex
                 (context.cgLanguageAssistant as PythonCgLanguageAssistant).memoryObjects.clear()
 
                 val modificationInfo = StateModificationInfo()
-                val fieldStateManager = CgFieldStateManagerImpl(context)
+                val fieldStateManager = context.cgLanguageAssistant.getCgFieldStateManager(context)
                 // TODO: move such methods to another class and leave only 2 public methods: remember initial and final states
                 val mainBody = {
                     substituteStaticFields(statics)