@@ -116,14 +116,7 @@ import org.utbot.framework.plugin.api.MockFramework.MOCKITO
116
116
import org.utbot.framework.plugin.api.MockStrategyApi
117
117
import org.utbot.framework.plugin.api.TreatOverflowAsError
118
118
import org.utbot.framework.util.Conflict
119
- import org.utbot.intellij.plugin.models.GenerateTestsModel
120
- import org.utbot.intellij.plugin.models.id
121
- import org.utbot.intellij.plugin.models.jUnit4LibraryDescriptor
122
- import org.utbot.intellij.plugin.models.jUnit5LibraryDescriptor
123
- import org.utbot.intellij.plugin.models.jUnit5ParametrizedTestsLibraryDescriptor
124
- import org.utbot.intellij.plugin.models.mockitoCoreLibraryDescriptor
125
- import org.utbot.intellij.plugin.models.packageName
126
- import org.utbot.intellij.plugin.models.testNgLibraryDescriptor
119
+ import org.utbot.intellij.plugin.models.*
127
120
import org.utbot.intellij.plugin.settings.Settings
128
121
import org.utbot.intellij.plugin.ui.components.CodeGenerationSettingItemRenderer
129
122
import org.utbot.intellij.plugin.ui.components.TestFolderComboWithBrowseButton
@@ -314,15 +307,16 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
314
307
label?.let { add(it, BorderLayout .LINE_END ) }
315
308
})
316
309
317
- private fun findSdkVersion (): JavaVersion ? {
318
- val projectSdk = ModuleRootManager .getInstance(model.srcModule).sdk
319
- return JavaVersion .tryParse(projectSdk?.versionString)
310
+ private fun findSdkVersion (): JavaVersion {
311
+ val moduleSdk = ModuleRootManager .getInstance(model.srcModule).sdk
312
+ return JavaVersion .tryParse(moduleSdk?.versionString)
313
+ ? : error(" Cannot define sdk version in module ${model.srcModule} " )
320
314
}
321
315
322
316
override fun createTitlePane (): JComponent ? {
323
317
val sdkVersion = findSdkVersion()
324
318
// TODO:SAT-1571 investigate Android Studio specific sdk issues
325
- if (sdkVersion? .feature in minSupportedSdkVersion.. maxSupportedSdkVersion || IntelliJApiHelper .isAndroidStudio()) return null
319
+ if (sdkVersion.feature in minSupportedSdkVersion.. maxSupportedSdkVersion || IntelliJApiHelper .isAndroidStudio()) return null
326
320
isOKActionEnabled = false
327
321
return SdkNotificationPanel (model, sdkVersion)
328
322
}
@@ -373,7 +367,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
373
367
{ projectStructure.select(model.srcModule.name, ClasspathEditor .getName(), true ) }
374
368
375
369
val sdkVersion = findSdkVersion()
376
- val sdkFixed = isEdited && sdkVersion? .feature in minSupportedSdkVersion.. maxSupportedSdkVersion
370
+ val sdkFixed = isEdited && sdkVersion.feature in minSupportedSdkVersion.. maxSupportedSdkVersion
377
371
if (sdkFixed) {
378
372
this @SdkNotificationPanel.isVisible = false
379
373
isOKActionEnabled = true
@@ -721,11 +715,15 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
721
715
val libraryInProject =
722
716
findFrameworkLibrary(model.project, model.testModule, selectedTestFramework, LibrarySearchScope .Project )
723
717
val versionInProject = libraryInProject?.libraryName?.parseVersion()
718
+ val sdkVersion: Int? = findSdkVersion().feature
724
719
725
720
val libraryDescriptor = when (selectedTestFramework) {
726
721
Junit4 -> jUnit4LibraryDescriptor(versionInProject)
727
722
Junit5 -> jUnit5LibraryDescriptor(versionInProject)
728
- TestNg -> testNgLibraryDescriptor(versionInProject)
723
+ TestNg -> when (sdkVersion) {
724
+ minSupportedSdkVersion -> testNgOldLibraryDescriptor()
725
+ else -> testNgNewLibraryDescriptor(versionInProject)
726
+ }
729
727
}
730
728
731
729
selectedTestFramework.isInstalled = true
0 commit comments