Skip to content

Commit 05f55b9

Browse files
Existing test framework should be pre-selected at the very first start #155 (#269)
1 parent 001ec4a commit 05f55b9

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -773,18 +773,17 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
773773
ParametrizedTestSource.DO_NOT_PARAMETRIZE -> TestFramework.allItems
774774
ParametrizedTestSource.PARAMETRIZE -> TestFramework.allItems.filterNot { it == Junit4 }
775775
}
776-
777-
enabledTestFrameworks.forEach {
778-
it.isInstalled = findFrameworkLibrary(model.project, model.testModule, it) != null
779-
}
780-
781-
val defaultItem = when (parametrizedTestSource) {
776+
var defaultItem = when (parametrizedTestSource) {
782777
ParametrizedTestSource.DO_NOT_PARAMETRIZE -> TestFramework.defaultItem
783778
ParametrizedTestSource.PARAMETRIZE -> TestFramework.parametrizedDefaultItem
784779
}
780+
enabledTestFrameworks.forEach {
781+
it.isInstalled = findFrameworkLibrary(model.project, model.testModule, it) != null
782+
if (it.isInstalled && !defaultItem.isInstalled) defaultItem = it
783+
}
785784

786785
testFrameworks.model = DefaultComboBoxModel(enabledTestFrameworks.toTypedArray())
787-
testFrameworks.item = if (currentFrameworkItem in enabledTestFrameworks) currentFrameworkItem else defaultItem
786+
testFrameworks.item = if (currentFrameworkItem in enabledTestFrameworks && currentFrameworkItem.isInstalled) currentFrameworkItem else defaultItem
788787
testFrameworks.renderer = object : ColoredListCellRenderer<TestFramework>() {
789788
override fun customizeCellRenderer(
790789
list: JList<out TestFramework>, value: TestFramework?,

0 commit comments

Comments
 (0)