From c4867ad5c1ce1786168203f63fb0e53157bb071c Mon Sep 17 00:00:00 2001 From: Kirill Shishin Date: Fri, 7 Jul 2023 11:24:44 +0300 Subject: [PATCH 1/2] Fix bug with testFramework list presentation --- .../org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt index 46ddb0920f..50e3941f55 100644 --- a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt +++ b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt @@ -880,7 +880,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m springTestType.item = if (isSpringConfigSelected()) settings.springTestType else SpringTestType.defaultItem updateSpringSettings() - updateTestFrameworkList(settings.springTestType) + updateTestFrameworkList(springTestType.item) } ProjectType.Python, ProjectType.JavaScript -> { } From 8fc46d790c86102052dbdf8a1f95aa4e0174c276 Mon Sep 17 00:00:00 2001 From: Kirill Shishin Date: Fri, 7 Jul 2023 11:49:45 +0300 Subject: [PATCH 2/2] Rename method --- .../intellij/plugin/ui/GenerateTestsDialogWindow.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt index 50e3941f55..ef3f6a7f73 100644 --- a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt +++ b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt @@ -880,7 +880,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m springTestType.item = if (isSpringConfigSelected()) settings.springTestType else SpringTestType.defaultItem updateSpringSettings() - updateTestFrameworkList(springTestType.item) + updateTestFrameworksList(springTestType.item) } ProjectType.Python, ProjectType.JavaScript -> { } @@ -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 -> { @@ -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, defaultItem: TestFramework = TestFramework.defaultItem, ) {