Skip to content

Fix bug with testFramework list presentation #2381

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 2 commits into from
Jul 7, 2023
Merged

Fix bug with testFramework list presentation #2381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4867ad
Fix bug with testFramework list presentation
tepa46 Jul 7, 2023
8fc46d7
Rename method
tepa46 Jul 7, 2023
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
12 changes: 6 additions & 6 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 @@ -880,7 +880,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
springTestType.item =
if (isSpringConfigSelected()) settings.springTestType else SpringTestType.defaultItem
updateSpringSettings()
updateTestFrameworkList(settings.springTestType)
updateTestFrameworksList(springTestType.item)
}
ProjectType.Python,
ProjectType.JavaScript -> { }
Expand Down Expand Up @@ -1167,7 +1167,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
val comboBox = event.source as ComboBox<*>
val item = comboBox.item as SpringTestType

updateTestFrameworkList(item)
updateTestFrameworksList(item)

when (item) {
UNIT_TEST -> {
Expand Down Expand Up @@ -1205,20 +1205,20 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
}
enabledTestFrameworks.forEach { if (it.isInstalled && !defaultItem.isInstalled) defaultItem = it }

updateTestFrameworkList(enabledTestFrameworks, defaultItem)
updateTestFrameworksList(enabledTestFrameworks, defaultItem)
}

private fun updateTestFrameworkList(springTestType: SpringTestType) {
private fun updateTestFrameworksList(springTestType: SpringTestType) {
// We do not support Spring integration tests for TestNg
val enabledTestFrameworks = when (springTestType) {
UNIT_TEST -> TestFramework.allItems
INTEGRATION_TEST -> TestFramework.allItems.filterNot { it == TestNg }
}

updateTestFrameworkList(enabledTestFrameworks)
updateTestFrameworksList(enabledTestFrameworks)
}

private fun updateTestFrameworkList(
private fun updateTestFrameworksList(
enabledTestFrameworks: List<TestFramework>,
defaultItem: TestFramework = TestFramework.defaultItem,
) {
Expand Down