Skip to content

Commit dcb65f3

Browse files
Reorder components in UI (#1226)
1 parent 58609af commit dcb65f3

File tree

1 file changed

+21
-13
lines changed

1 file changed

+21
-13
lines changed

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
272272
null
273273
)
274274
}
275-
row { component(parametrizedTestSources) }
276275
row("Mocking strategy:") {
277276
makePanelWithHelpTooltip(
278277
mockStrategies,
@@ -281,6 +280,12 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
281280
)
282281
}
283282
row { component(staticsMocking)}
283+
row {
284+
cell {
285+
component(parametrizedTestSources)
286+
component(ContextHelpLabel.create("Parametrization is not supported in some configurations, e.g. if mocks are used."))
287+
}
288+
}
284289
row("Test generation timeout:") {
285290
cell {
286291
component(timeoutSpinner)
@@ -644,9 +649,8 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
644649
staticsMocking.isSelected = settings.staticsMocking == MockitoStaticMocking
645650
parametrizedTestSources.isSelected = settings.parametrizedTestSource == ParametrizedTestSource.PARAMETRIZE
646651

647-
val areMocksSupported = settings.parametrizedTestSource == ParametrizedTestSource.DO_NOT_PARAMETRIZE
648-
mockStrategies.isEnabled = areMocksSupported
649-
staticsMocking.isEnabled = areMocksSupported && mockStrategies.item != MockStrategyApi.NO_MOCKS
652+
mockStrategies.isEnabled = true
653+
staticsMocking.isEnabled = mockStrategies.item != MockStrategyApi.NO_MOCKS
650654

651655
codegenLanguages.item = model.codegenLanguage
652656

@@ -931,15 +935,19 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
931935
ParametrizedTestSource.DO_NOT_PARAMETRIZE
932936
}
933937

934-
val areMocksSupported = parametrizedTestSource == ParametrizedTestSource.DO_NOT_PARAMETRIZE
935-
936-
mockStrategies.isEnabled = areMocksSupported
937-
staticsMocking.isEnabled = areMocksSupported && mockStrategies.item != MockStrategyApi.NO_MOCKS
938-
if (!mockStrategies.isEnabled) {
939-
mockStrategies.item = MockStrategyApi.NO_MOCKS
940-
}
941-
if (!staticsMocking.isEnabled) {
942-
staticsMocking.isSelected = false
938+
when (parametrizedTestSource) {
939+
ParametrizedTestSource.PARAMETRIZE -> {
940+
mockStrategies.item = MockStrategyApi.NO_MOCKS
941+
staticsMocking.isEnabled = false
942+
staticsMocking.isSelected = false
943+
}
944+
ParametrizedTestSource.DO_NOT_PARAMETRIZE -> {
945+
mockStrategies.isEnabled = true
946+
if (mockStrategies.item != MockStrategyApi.NO_MOCKS) {
947+
staticsMocking.isEnabled = true
948+
staticsMocking.isSelected = true
949+
}
950+
}
943951
}
944952

945953
updateTestFrameworksList(parametrizedTestSource)

0 commit comments

Comments
 (0)