Set projectType in CodeGenerator properly everywhere.

EgorkaKulikov · EgorkaKulikov · commit 2cc7ee9777f7 · 2023-03-21T11:14:22.000+03:00
diff --git a/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt b/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt
@@ -20,6 +20,7 @@ import org.utbot.framework.codegen.CodeGenerator
 import org.utbot.framework.codegen.domain.ForceStaticMocking
 import org.utbot.framework.codegen.domain.MockitoStaticMocking
 import org.utbot.framework.codegen.domain.NoStaticMocking
+import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.testFrameworkByName
 import org.utbot.framework.codegen.services.language.CgLanguageAssistant
@@ -211,6 +212,8 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
         return CodeGenerator(
             testFramework = testFrameworkByName(testFramework),
             classUnderTest = classUnderTest,
+            //TODO: Support Spring projects in utbot-cli if requested
+            projectType = ProjectType.PureJvm,
             codegenLanguage = codegenLanguage,
             cgLanguageAssistant = CgLanguageAssistant.getByCodegenLanguage(codegenLanguage),
             staticsMocking = staticsMocking,
diff --git a/utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt b/utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt
@@ -7,6 +7,7 @@ import org.utbot.framework.codegen.CodeGenerator
 import org.utbot.framework.codegen.domain.ForceStaticMocking
 import org.utbot.framework.codegen.domain.Junit5
 import org.utbot.framework.codegen.domain.NoStaticMocking
+import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.framework.codegen.services.language.CgLanguageAssistant
@@ -55,6 +56,7 @@ object UtBotJavaApi {
         classpath: String,
         dependencyClassPath: String,
         classUnderTest: Class<*>,
+        projectType: ProjectType = ProjectType.PureJvm,
         testFramework: TestFramework = Junit5,
         mockFramework: MockFramework = MockFramework.MOCKITO,
         codegenLanguage: CodegenLanguage = CodegenLanguage.JAVA,
@@ -82,6 +84,7 @@ object UtBotJavaApi {
         return withUtContext(utContext) {
             val codeGenerator = CodeGenerator(
                     classUnderTest = classUnderTest.id,
+                    projectType = projectType,
                     testFramework = testFramework,
                     mockFramework = mockFramework,
                     codegenLanguage = codegenLanguage,
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/CodeGenerator.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/CodeGenerator.kt
@@ -30,8 +30,7 @@ import java.time.format.DateTimeFormatter
 
 open class CodeGenerator(
     val classUnderTest: ClassId,
-    //TODO: support setting `projectType` in Sarif plugins, UtBotJava api, etc.
-    val projectType: ProjectType = PureJvm,
+    val projectType: ProjectType,
     paramNames: MutableMap<ExecutableId, List<String>> = mutableMapOf(),
     generateUtilClassFile: Boolean = false,
     testFramework: TestFramework = TestFramework.defaultItem,
@@ -82,10 +81,8 @@ open class CodeGenerator(
         return withCustomContext(testClassCustomName) {
             context.withTestClassFileScope {
                 when (context.projectType) {
-                    PureJvm,
-                    Python,
-                    JavaScript -> generateForSimpleClass(cgTestSets)
                     Spring -> generateForSpringClass(cgTestSets)
+                    else -> generateForSimpleClass(cgTestSets)
                 }
             }
         }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt
@@ -71,6 +71,7 @@ class GenerateTestsAndSarifReportFacade(
 
         return CodeGenerator(
             classUnderTest = targetClass.classUnderTest.id,
+            projectType = sarifProperties.projectType,
             testFramework = sarifProperties.testFramework,
             mockFramework = sarifProperties.mockFramework,
             staticsMocking = sarifProperties.staticsMocking,
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/SarifExtensionProvider.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/SarifExtensionProvider.kt
@@ -6,6 +6,8 @@ import org.utbot.framework.codegen.domain.Junit4
 import org.utbot.framework.codegen.domain.Junit5
 import org.utbot.framework.codegen.domain.MockitoStaticMocking
 import org.utbot.framework.codegen.domain.NoStaticMocking
+import org.utbot.framework.codegen.domain.ProjectType
+import org.utbot.framework.codegen.domain.ProjectType.*
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.framework.codegen.domain.TestNg
@@ -51,6 +53,8 @@ interface SarifExtensionProvider {
      */
     val testPrivateMethods: Boolean
 
+    val projectType: ProjectType
+
     val testFramework: TestFramework
 
     val mockFramework: MockFramework
@@ -76,6 +80,15 @@ interface SarifExtensionProvider {
 
     // transform functions
 
+    fun projectTypeParse(projectType: String): ProjectType =
+        when (projectType.toLowerCase()) {
+            "purejvm" -> PureJvm
+            "spring" -> Spring
+            "python" -> Python
+            "javascript" -> JavaScript
+            else -> error("Parameter projectType == '$projectType', but it can take only 'pureJvm', 'spring', 'python' or 'javascript'")
+        }
+
     fun testFrameworkParse(testFramework: String): TestFramework =
         when (testFramework.toLowerCase()) {
             "junit4" -> Junit4
diff --git a/utbot-gradle/src/main/kotlin/org/utbot/gradle/plugin/extension/SarifGradleExtension.kt b/utbot-gradle/src/main/kotlin/org/utbot/gradle/plugin/extension/SarifGradleExtension.kt
@@ -49,6 +49,12 @@ abstract class SarifGradleExtension {
     @get:Input
     abstract val testPrivateMethods: Property<Boolean>
 
+    /**
+     * Can be one of: 'purejvm', 'spring', 'python', 'javascript`.
+     */
+    @get:Input
+    abstract val projectType: Property<String>
+
     /**
      * Can be one of: 'junit4', 'junit5', 'testng'.
      */
diff --git a/utbot-gradle/src/main/kotlin/org/utbot/gradle/plugin/extension/SarifGradleExtensionProvider.kt b/utbot-gradle/src/main/kotlin/org/utbot/gradle/plugin/extension/SarifGradleExtensionProvider.kt
@@ -3,6 +3,7 @@ package org.utbot.gradle.plugin.extension
 import org.gradle.api.Project
 import org.utbot.common.PathUtil.toPath
 import org.utbot.framework.codegen.domain.ForceStaticMocking
+import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.framework.plugin.api.ClassId
@@ -57,6 +58,11 @@ class SarifGradleExtensionProvider(
             ?: extension.testPrivateMethods.orNull
             ?: false
 
+    override val projectType: ProjectType
+        get() = (taskParameters["projectType"] ?: extension.projectType.orNull)
+            ?.let(::projectTypeParse)
+            ?: ProjectType.PureJvm
+
     override val testFramework: TestFramework
         get() = (taskParameters["testFramework"] ?: extension.testFramework.orNull)
             ?.let(::testFrameworkParse)
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt
@@ -178,9 +178,6 @@ object UtTestsDialogProcessor {
                         val staticMockingConfigured = model.staticsMocking.isConfigured
 
                         val applicationContext = when (model.projectType) {
-                            PureJvm,
-                            Python,
-                            JavaScript -> ApplicationContext(mockFrameworkInstalled, staticMockingConfigured)
                             Spring -> {
                                 val shouldUseImplementors = when (model.typeReplacementApproach) {
                                     TypeReplacementApproach.DO_NOT_REPLACE -> false
@@ -195,6 +192,7 @@ object UtTestsDialogProcessor {
                                     shouldUseImplementors = shouldUseImplementors,
                                 )
                             }
+                            else -> ApplicationContext(mockFrameworkInstalled, staticMockingConfigured)
                         }
 
                         val process = EngineProcess.createBlocking(project, classNameToPath)
diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt
@@ -52,6 +52,7 @@ import kotlinx.coroutines.newSingleThreadContext
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeoutOrNull
 import org.utbot.framework.SummariesGenerationType
+import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.services.language.CgLanguageAssistant
 import org.utbot.framework.minimization.minimizeExecutions
 import org.utbot.framework.plugin.api.*
@@ -221,6 +222,7 @@ fun runGeneration(
 
     val codeGenerator = CodeGenerator(
             cut.classId,
+            projectType = ProjectType.PureJvm,
             testFramework = junitByVersion(junitVersion),
             staticsMocking = staticsMocking,
             forceStaticMocking = forceStaticMocking,
diff --git a/utbot-maven/src/main/kotlin/org/utbot/maven/plugin/GenerateTestsAndSarifReportMojo.kt b/utbot-maven/src/main/kotlin/org/utbot/maven/plugin/GenerateTestsAndSarifReportMojo.kt
@@ -80,6 +80,12 @@ class GenerateTestsAndSarifReportMojo : AbstractMojo() {
     @Parameter(defaultValue = "false")
     internal var testPrivateMethods: Boolean = false
 
+    /**
+     * Can be one of: 'purejvm', 'spring', 'python', 'javascript'.
+     */
+    @Parameter(defaultValue = "purejvm")
+    internal lateinit var projectType: String
+
     /**
      * Can be one of: 'junit4', 'junit5', 'testng'.
      */
diff --git a/utbot-maven/src/main/kotlin/org/utbot/maven/plugin/extension/SarifMavenConfigurationProvider.kt b/utbot-maven/src/main/kotlin/org/utbot/maven/plugin/extension/SarifMavenConfigurationProvider.kt
@@ -1,6 +1,7 @@
 package org.utbot.maven.plugin.extension
 
 import org.utbot.framework.codegen.domain.ForceStaticMocking
+import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.framework.plugin.api.ClassId
@@ -36,6 +37,9 @@ class SarifMavenConfigurationProvider(
     override val testPrivateMethods: Boolean
         get() = generateTestsAndSarifReportMojo.testPrivateMethods
 
+    override val projectType: ProjectType
+        get() = projectTypeParse(generateTestsAndSarifReportMojo.projectType)
+
     override val testFramework: TestFramework
         get() = testFrameworkParse(generateTestsAndSarifReportMojo.testFramework)
 
diff --git a/utbot-testing/src/main/kotlin/org/utbot/testing/TestCodeGeneratorPipeline.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/TestCodeGeneratorPipeline.kt
@@ -9,6 +9,7 @@ import org.utbot.framework.codegen.CodeGenerator
 import org.utbot.framework.codegen.CodeGeneratorResult
 import org.utbot.framework.codegen.domain.ForceStaticMocking
 import org.utbot.framework.codegen.domain.ParametrizedTestSource
+import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.framework.codegen.services.language.CgLanguageAssistant
@@ -265,6 +266,7 @@ class TestCodeGeneratorPipeline(private val testFrameworkConfiguration: TestFram
             val codeGenerator = with(testFrameworkConfiguration) {
                 CodeGenerator(
                     classUnderTest.id,
+                    projectType = ProjectType.PureJvm,
                     generateUtilClassFile = generateUtilClassFile,
                     paramNames = params,
                     testFramework = testFramework,

Original file line number	Diff line number	Diff line change
`@@ -178,9 +178,6 @@ object UtTestsDialogProcessor {`
`178`	`178`	`val staticMockingConfigured = model.staticsMocking.isConfigured`
`179`	`179`
`180`	`180`	`val applicationContext = when (model.projectType) {`
`181`		`- PureJvm,`
`182`		`- Python,`
`183`		`- JavaScript -> ApplicationContext(mockFrameworkInstalled, staticMockingConfigured)`
`184`	`181`	`Spring -> {`
`185`	`182`	`val shouldUseImplementors = when (model.typeReplacementApproach) {`
`186`	`183`	`TypeReplacementApproach.DO_NOT_REPLACE -> false`
`@@ -195,6 +192,7 @@ object UtTestsDialogProcessor {`
`195`	`192`	`shouldUseImplementors = shouldUseImplementors,`
`196`	`193`	`)`
`197`	`194`	`}`
	`195`	`+ else -> ApplicationContext(mockFrameworkInstalled, staticMockingConfigured)`
`198`	`196`	`}`
`199`	`197`
`200`	`198`	`val process = EngineProcess.createBlocking(project, classNameToPath)`