Fix after rebase problems

UnitTestBot · tamarinvs19 · Nov 9, 2022 · Oct 5, 2022 · Oct 5, 2022 · Oct 5, 2022
commit 074d0d18b904ea213c746ad1260bcd8cdc5889ce
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,7 @@ allprojects {
     tasks {
         withType<JavaCompile> {
             sourceCompatibility = "1.8"
-            targetCompatibility = "11"
+            targetCompatibility = "1.8"
             options.encoding = "UTF-8"
             options.compilerArgs = options.compilerArgs + "-Xlint:all"
         }

diff --git a/gradle.properties b/gradle.properties
@@ -3,17 +3,19 @@ kotlin.code.style=official
 # IU, IC, PC, PY, WS...
 # IC for AndroidStudio
 ideType=IU
+ideVersion=222.4167.29
 
 # In order to run Android Studion instead of Intellij Community,
 # specify the path to your Android Studio installation
 //androidStudioPath=D:/AS2021
 
-pythonCommunityPluginVersion=222.4167.37
 #Version numbers: https://plugins.jetbrains.com/plugin/631-python/versions
+pythonCommunityPluginVersion=222.4167.37
 pythonUltimatePluginVersion=222.4167.37
-
 # Version numbers: https://plugins.jetbrains.com/plugin/9568-go/versions
-goPluginVersion=212.5712.14
+goPluginVersion=222.4167.21
+
+kotlinPluginVersion=222-1.7.20-release-201-IJ4167.29
 
 junit5Version=5.8.0-RC1
 junit4Version=4.13.2

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
@@ -78,8 +78,8 @@ open class CodeGenerator(
             val testClassFile = CgTestClassConstructor(context).construct(testClassModel)
             CodeGeneratorResult(
                 generatedCode = renderClassFile(testClassFile),
-                testsGenerationReport = testClassFile.testsGenerationReport,
-                utilClassKind = UtilClassKind.fromCgContextOrNull(context)
+                utilClassKind = UtilClassKind.fromCgContextOrNull(context),
+                testsGenerationReport = testClassFile.testsGenerationReport
             )
         }
     }
@@ -111,14 +111,14 @@ open class CodeGenerator(
 
 /**
  * @property generatedCode the source code of the test class
- * @property utilClassKind the kind of util class if it is required, otherwise - null
  * @property testsGenerationReport some info about test generation process
+ * @property utilClassKind the kind of util class if it is required, otherwise - null
  */
 data class CodeGeneratorResult(
     val generatedCode: String,
     // null if no util class needed, e.g. when we are generating utils directly into test class
-    val utilClassKind: UtilClassKind?,
-    val testsGenerationReport: TestsGenerationReport
+    val testsGenerationReport: TestsGenerationReport,
+    val utilClassKind: UtilClassKind? = null,
 )
 
 /**

diff --git a/...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt b/...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
@@ -1072,7 +1072,7 @@ open class CgMethodConstructor(val context: CgContext) : CgContextOwner by conte
         return ClassIdArrayInfo(classId, nestedElementClassId, dimensions)
     }
 
-    protected fun assertEquality(expected: CgValue, actual: CgVariable) {
+    open fun assertEquality(expected: CgValue, actual: CgVariable) {
         when {
             expected.type.isArray -> {
                 // TODO: How to compare arrays of Float and Double wrappers?
@@ -1253,7 +1253,7 @@ open class CgMethodConstructor(val context: CgContext) : CgContextOwner by conte
         }
     }
 
-    protected fun createTestMethod(executableId: ExecutableId, execution: UtExecution): CgTestMethod =
+    open fun createTestMethod(executableId: ExecutableId, execution: UtExecution): CgTestMethod =
         withTestMethodScope(execution) {
             val testMethodName = nameGenerator.testMethodNameFor(executableId, execution.testMethodName)
             // TODO: remove this line when SAT-1273 is completed
@@ -1655,7 +1655,6 @@ open class CgMethodConstructor(val context: CgContext) : CgContextOwner by conte
         testSet.executions.any { it.result is UtExecutionFailure }
 
 
-    protected final fun testMethod(
     /**
      * Determines [CgTestMethodType] for current execution according to its success or failure.
      */

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
@@ -125,7 +125,7 @@ open class CgTestClassConstructor(val context: CgContext) :
         }
     }
 
-    open fun constructTestSet(testSet: CgMethodTestSet): List<CgRegion<CgMethod>>? {
+    fun constructTestSet(testSet: CgMethodTestSet): List<CgRegion<CgMethod>>? {
         if (testSet.executions.isEmpty()) {
             return null
         }

diff --git a/utbot-intellij-go/build.gradle.kts b/utbot-intellij-go/build.gradle.kts
@@ -3,6 +3,8 @@ val kotlinLoggingVersion: String? by rootProject
 val apacheCommonsTextVersion: String? by rootProject
 val jacksonVersion: String? by rootProject
 val ideType: String? by rootProject
+val ideVersion: String? by rootProject
+val kotlinPluginVersion: String? by rootProject
 val pythonCommunityPluginVersion: String? by rootProject
 val pythonUltimatePluginVersion: String? by rootProject
 val goPluginVersion: String? by rootProject
@@ -46,7 +48,7 @@ intellij {
 
     val jvmPlugins = listOf(
         "java",
-        "org.jetbrains.kotlin:212-1.7.10-release-333-IJ5457.46"
+        "org.jetbrains.kotlin:$kotlinPluginVersion"
     )
 
     val pythonCommunityPlugins = listOf(
@@ -75,6 +77,6 @@ intellij {
         }
     )
 
-    version.set("212.5712.43")
+    version.set(ideVersion)
     type.set(ideType)
 }
diff --git a/utbot-intellij-js/build.gradle.kts b/utbot-intellij-js/build.gradle.kts
@@ -3,6 +3,8 @@ val kotlinLoggingVersion: String? by rootProject
 val apacheCommonsTextVersion: String? by rootProject
 val jacksonVersion: String? by rootProject
 val ideType: String? by rootProject
+val ideVersion: String? by rootProject
+val kotlinPluginVersion: String? by rootProject
 val pythonCommunityPluginVersion: String? by rootProject
 val pythonUltimatePluginVersion: String? by rootProject
 val goPluginVersion: String? by rootProject
@@ -46,7 +48,7 @@ intellij {
 
     val jvmPlugins = listOf(
         "java",
-        "org.jetbrains.kotlin:212-1.7.10-release-333-IJ5457.46"
+        "org.jetbrains.kotlin:$kotlinPluginVersion"
     )
 
     val pythonCommunityPlugins = listOf(
@@ -75,6 +77,6 @@ intellij {
         }
     )
 
-    version.set("212.5712.43")
+    version.set(ideVersion)
     type.set(ideType)
 }
diff --git a/utbot-intellij-python/build.gradle.kts b/utbot-intellij-python/build.gradle.kts
@@ -3,6 +3,8 @@ val kotlinLoggingVersion: String? by rootProject
 val apacheCommonsTextVersion: String? by rootProject
 val jacksonVersion: String? by rootProject
 val ideType: String? by rootProject
+val ideVersion: String by rootProject
+val kotlinPluginVersion: String by rootProject
 val pythonCommunityPluginVersion: String? by rootProject
 val pythonUltimatePluginVersion: String? by rootProject
 val goPluginVersion: String? by rootProject
@@ -46,7 +48,7 @@ intellij {
 
     val jvmPlugins = listOf(
         "java",
-        "org.jetbrains.kotlin:212-1.7.10-release-333-IJ5457.46"
+        "org.jetbrains.kotlin:222-1.7.20-release-201-IJ4167.29"
     )
 
     val pythonCommunityPlugins = listOf(
@@ -75,6 +77,6 @@ intellij {
         }
     )
 
-    version.set("212.5712.43")
+    version.set(ideVersion)
     type.set(ideType)
 }
diff --git a/utbot-intellij/build.gradle.kts b/utbot-intellij/build.gradle.kts
@@ -3,6 +3,8 @@ val kotlinLoggingVersion: String? by rootProject
 val apacheCommonsTextVersion: String? by rootProject
 val jacksonVersion: String? by rootProject
 val ideType: String? by rootProject
+val ideVersion: String? by rootProject
+val kotlinPluginVersion: String? by rootProject
 val pythonCommunityPluginVersion: String? by rootProject
 val pythonUltimatePluginVersion: String? by rootProject
 val sootCommitHash: String? by rootProject
@@ -24,7 +26,7 @@ intellij {
 
     val jvmPlugins = mutableListOf(
         "java",
-        "org.jetbrains.kotlin:222-1.7.20-release-201-IJ4167.29"
+        "org.jetbrains.kotlin:$kotlinPluginVersion"
     )
 
     androidStudioPath?.let { jvmPlugins += androidPlugins }
@@ -55,7 +57,7 @@ intellij {
         }
     )
 
-    version.set("222.4167.29")
+    version.set(ideVersion)
     type.set(ideTypeOrAndroidStudio)
 }
 

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
@@ -56,22 +56,17 @@ import org.utbot.intellij.plugin.models.packageName
 import org.utbot.intellij.plugin.process.EngineProcess
 import org.utbot.intellij.plugin.process.RdTestGenerationResult
 import org.utbot.intellij.plugin.sarif.SarifReportIdea
-import org.utbot.intellij.plugin.sarif.SourceFindingStrategyIdea
 import org.utbot.intellij.plugin.ui.*
 import org.utbot.intellij.plugin.ui.utils.getOrCreateSarifReportsPath
 import org.utbot.intellij.plugin.ui.utils.showErrorDialogLater
 import org.utbot.intellij.plugin.ui.utils.suitableTestSourceRoots
-import org.utbot.intellij.plugin.util.IntelliJApiHelper.Target.*
-import org.utbot.intellij.plugin.util.IntelliJApiHelper.run
 import org.utbot.intellij.plugin.util.RunConfigurationHelper
 import org.utbot.intellij.plugin.util.extractClassMethodsIncludingNested
 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
-import kotlin.reflect.KClass
-import kotlin.reflect.full.functions
 import org.utbot.intellij.plugin.util.IntelliJApiHelper.Target.*
 import org.utbot.intellij.plugin.util.IntelliJApiHelper.run
 

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
@@ -37,10 +37,6 @@ import org.utbot.intellij.plugin.process.EngineProcess
 import org.utbot.intellij.plugin.process.RdTestGenerationResult
 import org.utbot.intellij.plugin.settings.Settings
 import org.utbot.intellij.plugin.ui.GenerateTestsDialogWindow
-import org.utbot.intellij.plugin.ui.utils.isBuildWithGradle
-import org.utbot.intellij.plugin.ui.utils.showErrorDialogLater
-import org.utbot.intellij.plugin.ui.utils.suitableTestSourceRoots
-import org.utbot.intellij.plugin.ui.utils.testModules
 import org.utbot.intellij.plugin.util.*
 import org.utbot.rd.terminateOnException
 import java.io.File
@@ -49,6 +45,8 @@ import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
 import kotlin.io.path.pathString
 import org.utbot.framework.plugin.api.util.LockFile
+import org.utbot.intellij.plugin.ui.utils.*
+import org.utbot.intellij.plugin.util.IntelliJApiHelper
 
 object UtTestsDialogProcessor {
     private val logger = KotlinLogging.logger {}

diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/language/JavaLanguage.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/language/JavaLanguage.kt
@@ -1,6 +1,5 @@
 package org.utbot.intellij.plugin.language
 
-import com.intellij.lang.Language
 import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -33,11 +32,11 @@ object JvmLanguageAssistant : LanguageAssistant(){
 
     override fun actionPerformed(e: AnActionEvent) {
         val project = e.project ?: return
-        val (srcClasses, focusedMethod, extractMembersFromSrcClasses) = getPsiTargets(e) ?: return
-        UtTestsDialogProcessor.createDialogAndGenerateTests(project, srcClasses, extractMembersFromSrcClasses, focusedMethod)
+        val (srcClasses, setOfFocusedMethods, extractMembersFromSrcClasses) = getPsiTargets(e) ?: return
+        UtTestsDialogProcessor.createDialogAndGenerateTests(project, srcClasses, extractMembersFromSrcClasses, setOfFocusedMethods)
     }
 
-    private fun getPsiTargets(e: AnActionEvent): Triple<Set<PsiClass>, MemberInfo?, Boolean>? {
+    private fun getPsiTargets(e: AnActionEvent): Triple<Set<PsiClass>, Set<MemberInfo>, Boolean>? {
         val project = e.project ?: return null
         val editor = e.getData(CommonDataKeys.EDITOR)
         if (editor != null) {
@@ -62,7 +61,7 @@ object JvmLanguageAssistant : LanguageAssistant(){
                     return null
                 }
 
-                return Triple(setOf(srcClass), focusedMethod, true)
+                return Triple(setOf(srcClass), if (focusedMethod == null) emptySet() else setOf(focusedMethod), true)
             }
         } else {
             // The action is being called from 'Project' tool window
@@ -106,7 +105,7 @@ object JvmLanguageAssistant : LanguageAssistant(){
                     .filter { folder -> !folder.rootType.isForTests && folder.file == commonSourceRoot}
                     .findAny().isPresent ) return null
 
-            return Triple(srcClasses.toSet(), selectedMethod, extractMembersFromSrcClasses)
+            return Triple(srcClasses.toSet(), if (selectedMethod == null) emptySet() else setOf(selectedMethod), extractMembersFromSrcClasses)
         }
         return null
     }

diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/GenerateTestsModel.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/GenerateTestsModel.kt
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.utbot.framework.plugin.api.JavaDocCommentStyle
 import org.utbot.framework.util.ConflictTriggers
 import org.utbot.intellij.plugin.settings.Settings
-import org.utbot.intellij.plugin.ui.utils.jdkVersion
 
 class GenerateTestsModel(
     project: Project,
@@ -38,24 +37,8 @@ class GenerateTestsModel(
     srcClasses
 ) {
 
-    fun setSourceRootAndFindTestModule(newTestSourceRoot: VirtualFile?) {
-        requireNotNull(newTestSourceRoot)
-        testSourceRoot = newTestSourceRoot
-        var target = newTestSourceRoot
-        while(target != null && target is FakeVirtualFile) {
-            target = target.parent
-        }
-        if (target == null) {
-            error("Could not find module for $newTestSourceRoot")
-        }
-
-        testModule = ModuleUtil.findModuleForFile(target, project)
-            ?: error("Could not find module for $newTestSourceRoot")
-    }
+    override var codegenLanguage = project.service<Settings>().codegenLanguage
 
-//    val codegenLanguage = project.service<Settings>().codegenLanguage
-
-    var testPackageName: String? = null
     lateinit var testFramework: TestFramework
     lateinit var mockStrategy: MockStrategyApi
     lateinit var mockFramework: MockFramework
@@ -71,14 +54,6 @@ class GenerateTestsModel(
 
     var runGeneratedTestsWithCoverage : Boolean = false
     var enableSummariesGeneration : Boolean = true
-
-    val jdkVersion: JavaSdkVersion?
-        get() = try {
-            testModule.jdkVersion()
-        } catch (e: IllegalStateException) {
-            // Just ignore it here, notification will be shown in org.utbot.intellij.plugin.ui.utils.ModuleUtilsKt.jdkVersionBy
-            null
-        }
 }
 
 val PsiClass.packageName: String

diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/sarif/SarifReportIdea.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/sarif/SarifReportIdea.kt
@@ -5,7 +5,6 @@ import com.intellij.psi.PsiClass
 import com.intellij.openapi.progress.ProgressIndicator
 import org.utbot.common.PathUtil.classFqnToPath
 import org.utbot.intellij.plugin.ui.utils.getOrCreateSarifReportsPath
-import com.intellij.openapi.vfs.VfsUtil
 import java.util.concurrent.CountDownLatch
 import mu.KotlinLogging
 import org.utbot.framework.plugin.api.ClassId

diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/utils/AndroidUtils.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/utils/AndroidUtils.kt
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PluginJdkInfoProvider.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PluginJdkInfoProvider.kt
@@ -8,6 +8,7 @@ import com.intellij.openapi.roots.ProjectRootManager
 import org.utbot.framework.plugin.services.JdkInfo
 import org.utbot.framework.plugin.services.JdkInfoDefaultProvider
 import org.utbot.framework.plugin.services.fetchJavaVersion
+import org.utbot.intellij.plugin.util.IntelliJApiHelper
 
 class PluginJdkInfoProvider(
     private val project: Project