From c48838363af9e584a2c00a682b5d9c5714c3d031 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 21 Jun 2022 16:54:46 +0300 Subject: [PATCH] Existing test framework should be pre-selected at the very first start #155 --- .../intellij/plugin/ui/GenerateTestsDialogWindow.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 f8971422e2..36b0343775 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 @@ -773,18 +773,17 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m ParametrizedTestSource.DO_NOT_PARAMETRIZE -> TestFramework.allItems ParametrizedTestSource.PARAMETRIZE -> TestFramework.allItems.filterNot { it == Junit4 } } - - enabledTestFrameworks.forEach { - it.isInstalled = findFrameworkLibrary(model.project, model.testModule, it) != null - } - - val defaultItem = when (parametrizedTestSource) { + var defaultItem = when (parametrizedTestSource) { ParametrizedTestSource.DO_NOT_PARAMETRIZE -> TestFramework.defaultItem ParametrizedTestSource.PARAMETRIZE -> TestFramework.parametrizedDefaultItem } + enabledTestFrameworks.forEach { + it.isInstalled = findFrameworkLibrary(model.project, model.testModule, it) != null + if (it.isInstalled && !defaultItem.isInstalled) defaultItem = it + } testFrameworks.model = DefaultComboBoxModel(enabledTestFrameworks.toTypedArray()) - testFrameworks.item = if (currentFrameworkItem in enabledTestFrameworks) currentFrameworkItem else defaultItem + testFrameworks.item = if (currentFrameworkItem in enabledTestFrameworks && currentFrameworkItem.isInstalled) currentFrameworkItem else defaultItem testFrameworks.renderer = object : ColoredListCellRenderer() { override fun customizeCellRenderer( list: JList, value: TestFramework?,