Skip to content

Avoid using TestNg on JDK versions less than 11 #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Avoid using TestNg on JDK versions less than 11 #319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@ import com.intellij.ui.layout.Row
import com.intellij.ui.layout.panel
import com.intellij.util.IncorrectOperationException
import com.intellij.util.io.exists
import com.intellij.util.ui.JBUI.size
import com.intellij.util.lang.JavaVersion
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.JBUI.size
import com.intellij.util.ui.UIUtil
import java.awt.BorderLayout
import java.nio.file.Files
Expand Down Expand Up @@ -221,6 +222,13 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
contextHelpLabel?.let { add(it, BorderLayout.LINE_END) }
})

private fun findSdkVersion(): Int {
val projectSdk = ModuleRootManager.getInstance(model.testModule).sdk
val sdkVersion = JavaVersion.tryParse(projectSdk?.versionString)
?: error("No sdk found in ${model.testModule}")
return sdkVersion.feature
}

private fun findTestPackageComboValue(): String {
val packageNames = model.srcClasses.map { it.packageName }.distinct()
return if (packageNames.size == 1) packageNames.first() else SAME_PACKAGE_LABEL
Expand Down Expand Up @@ -710,9 +718,9 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m

parametrizedTestSources.addActionListener { event ->
val comboBox = event.source as ComboBox<*>
val item = comboBox.item as ParametrizedTestSource
val parametrizedTestSource = comboBox.item as ParametrizedTestSource

val areMocksSupported = item == ParametrizedTestSource.DO_NOT_PARAMETRIZE
val areMocksSupported = parametrizedTestSource == ParametrizedTestSource.DO_NOT_PARAMETRIZE

mockStrategies.isEnabled = areMocksSupported
staticsMocking.isEnabled = areMocksSupported && mockStrategies.item != MockStrategyApi.NO_MOCKS
Expand All @@ -723,7 +731,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
staticsMocking.item = NoStaticMocking
}

updateTestFrameworksList(item)
updateTestFrameworksList(parametrizedTestSource)
}

cbSpecifyTestPackage.addActionListener {
Expand All @@ -744,10 +752,17 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
//We would like to remove JUnit4 from framework list in parametrized mode
private fun updateTestFrameworksList(parametrizedTestSource: ParametrizedTestSource) {
//We do not support parameterized tests for JUnit4
val enabledTestFrameworks = when (parametrizedTestSource) {
var enabledTestFrameworks = when (parametrizedTestSource) {
ParametrizedTestSource.DO_NOT_PARAMETRIZE -> TestFramework.allItems
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() < 11) {
enabledTestFrameworks = enabledTestFrameworks.filterNot { it == TestNg }
}

var defaultItem = when (parametrizedTestSource) {
ParametrizedTestSource.DO_NOT_PARAMETRIZE -> TestFramework.defaultItem
ParametrizedTestSource.PARAMETRIZE -> TestFramework.parametrizedDefaultItem
Expand Down