Different versions of TestNg can be installed into project

Author: EgorkaKulikov

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/ExternalLibraryDescriptors.kt

@@ -7,7 +7,7 @@ val ExternalLibraryDescriptor.mavenCoordinates: String
     get() = "$libraryGroupId:$libraryArtifactId:${preferredVersion ?: RepositoryLibraryDescription.ReleaseVersionId}"
 
 val ExternalLibraryDescriptor.id: String
-        get() = "$libraryGroupId:$libraryArtifactId"
+    get() = "$libraryGroupId:$libraryArtifactId"
 
 //TODO: think about using JUnitExternalLibraryDescriptor from intellij-community sources (difficult to install)
 fun jUnit4LibraryDescriptor(versionInProject: String?) =
@@ -16,11 +16,20 @@ fun jUnit4LibraryDescriptor(versionInProject: String?) =
 fun jUnit5LibraryDescriptor(versionInProject: String?) =
     ExternalLibraryDescriptor("org.junit.jupiter", "junit-jupiter", "5.8.1", null, versionInProject ?: "5.8.1")
 
-fun testNgLibraryDescriptor(versionInProject: String?) =
-    ExternalLibraryDescriptor("org.testng", "testng", "7.6.0", null, versionInProject ?: "7.6.0")
-
 fun jUnit5ParametrizedTestsLibraryDescriptor(versionInProject: String?) =
     ExternalLibraryDescriptor("org.junit.jupiter", "junit-jupiter-params", "5.8.1", null, versionInProject ?: "5.8.1")
 
 fun mockitoCoreLibraryDescriptor(versionInProject: String?) =
-    ExternalLibraryDescriptor("org.mockito", "mockito-core", "3.5.0", "4.2.0", versionInProject ?: "4.2.0")
+    ExternalLibraryDescriptor("org.mockito", "mockito-core", "3.5.0", "4.2.0", versionInProject ?: "4.2.0")
+
+/**
+ * TestNg requires JDK 11 since version 7.6.0
+ * For projects with JDK 8 version 7.5.0 should be installed.
+ * See https://groups.google.com/g/testng-users/c/BAFB1vk-kok?pli=1 for more details.
+ */
+
+fun testNgNewLibraryDescriptor(versionInProject: String?) =
+    ExternalLibraryDescriptor("org.testng", "testng", "7.6.0", null, versionInProject ?: "7.6.0")
+
+fun testNgOldLibraryDescriptor() =
+    ExternalLibraryDescriptor("org.testng", "testng", "7.5.0", null, "7.5.0")

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt

@@ -123,7 +123,8 @@ import org.utbot.intellij.plugin.models.jUnit5LibraryDescriptor
 import org.utbot.intellij.plugin.models.jUnit5ParametrizedTestsLibraryDescriptor
 import org.utbot.intellij.plugin.models.mockitoCoreLibraryDescriptor
 import org.utbot.intellij.plugin.models.packageName
-import org.utbot.intellij.plugin.models.testNgLibraryDescriptor
+import org.utbot.intellij.plugin.models.testNgNewLibraryDescriptor
+import org.utbot.intellij.plugin.models.testNgOldLibraryDescriptor
 import org.utbot.intellij.plugin.settings.Settings
 import org.utbot.intellij.plugin.ui.components.CodeGenerationSettingItemRenderer
 import org.utbot.intellij.plugin.ui.components.TestFolderComboWithBrowseButton
@@ -314,15 +315,16 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
             label?.let { add(it, BorderLayout.LINE_END) }
         })
 
-    private fun findSdkVersion(): JavaVersion? {
-        val projectSdk = ModuleRootManager.getInstance(model.srcModule).sdk
-        return JavaVersion.tryParse(projectSdk?.versionString)
+    private fun findSdkVersion(): JavaVersion {
+        val moduleSdk = ModuleRootManager.getInstance(model.srcModule).sdk
+        return JavaVersion.tryParse(moduleSdk?.versionString)
+            ?: error("Cannot define sdk version in module ${model.srcModule}")
     }
 
     override fun createTitlePane(): JComponent? {
         val sdkVersion = findSdkVersion()
         //TODO:SAT-1571 investigate Android Studio specific sdk issues
-        if (sdkVersion?.feature in minSupportedSdkVersion..maxSupportedSdkVersion || IntelliJApiHelper.isAndroidStudio()) return null
+        if (sdkVersion.feature in minSupportedSdkVersion..maxSupportedSdkVersion || IntelliJApiHelper.isAndroidStudio()) return null
         isOKActionEnabled = false
         return SdkNotificationPanel(model, sdkVersion)
     }
@@ -373,7 +375,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
                     { projectStructure.select(model.srcModule.name, ClasspathEditor.getName(), true) }
 
                     val sdkVersion = findSdkVersion()
-                    val sdkFixed = isEdited && sdkVersion?.feature in minSupportedSdkVersion..maxSupportedSdkVersion
+                    val sdkFixed = isEdited && sdkVersion.feature in minSupportedSdkVersion..maxSupportedSdkVersion
                     if (sdkFixed) {
                         this@SdkNotificationPanel.isVisible = false
                         isOKActionEnabled = true
@@ -721,11 +723,15 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
         val libraryInProject =
             findFrameworkLibrary(model.project, model.testModule, selectedTestFramework, LibrarySearchScope.Project)
         val versionInProject = libraryInProject?.libraryName?.parseVersion()
+        val sdkVersion: Int? = findSdkVersion().feature
 
         val libraryDescriptor = when (selectedTestFramework) {
             Junit4 -> jUnit4LibraryDescriptor(versionInProject)
             Junit5 -> jUnit5LibraryDescriptor(versionInProject)
-            TestNg -> testNgLibraryDescriptor(versionInProject)
+            TestNg -> when (sdkVersion) {
+                minSupportedSdkVersion -> testNgOldLibraryDescriptor()
+                else -> testNgNewLibraryDescriptor(versionInProject)
+            }
         }
 
         selectedTestFramework.isInstalled = true
@@ -956,12 +962,6 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
             ParametrizedTestSource.PARAMETRIZE -> TestFramework.allItems.filterNot { it == Junit4 }
         }
 
-        //Will be removed after gradle-intelij-plugin version update upper than 2020.2
-        //TestNg will be reverted after https://github.com/UnitTestBot/UTBotJava/issues/309
-        if (findSdkVersion()?.let { it.feature < 11 } == true) {
-            enabledTestFrameworks = enabledTestFrameworks.filterNot { it == TestNg }
-        }
-
         var defaultItem = when (parametrizedTestSource) {
             ParametrizedTestSource.DO_NOT_PARAMETRIZE -> TestFramework.defaultItem
             ParametrizedTestSource.PARAMETRIZE -> TestFramework.parametrizedDefaultItem