From fb8ad13f60334a6489b3de69b228330dd00f7674 Mon Sep 17 00:00:00 2001 From: Egor Kulikov Date: Mon, 24 Oct 2022 23:06:56 +0300 Subject: [PATCH 1/3] Reorder components in UI --- .../utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt | 7 ++++++- 1 file changed, 6 insertions(+), 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 4e1926356e..828a50b92e 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 @@ -272,7 +272,6 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m null ) } - row { component(parametrizedTestSources) } row("Mocking strategy:") { makePanelWithHelpTooltip( mockStrategies, @@ -281,6 +280,12 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m ) } row { component(staticsMocking)} + row { + cell { + component(parametrizedTestSources) + component(ContextHelpLabel.create("Parametrization is not supported in some configurations, e.g. if mocks are used.")) + } + } row("Test generation timeout:") { cell { component(timeoutSpinner) From 9b028ccd068550c9d3d9c15ca1052c7386438387 Mon Sep 17 00:00:00 2001 From: Egor Kulikov Date: Tue, 25 Oct 2022 12:51:32 +0300 Subject: [PATCH 2/3] Improve mocking value and disabling --- .../intellij/plugin/ui/GenerateTestsDialogWindow.kt | 9 +++------ 1 file changed, 3 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 828a50b92e..2342a9d537 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 @@ -936,14 +936,11 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m ParametrizedTestSource.DO_NOT_PARAMETRIZE } - val areMocksSupported = parametrizedTestSource == ParametrizedTestSource.DO_NOT_PARAMETRIZE - mockStrategies.isEnabled = areMocksSupported - staticsMocking.isEnabled = areMocksSupported && mockStrategies.item != MockStrategyApi.NO_MOCKS - if (!mockStrategies.isEnabled) { + val parametrizationEnabled = parametrizedTestSource == ParametrizedTestSource.PARAMETRIZE + if (parametrizationEnabled) { mockStrategies.item = MockStrategyApi.NO_MOCKS - } - if (!staticsMocking.isEnabled) { + staticsMocking.isEnabled = false staticsMocking.isSelected = false } From 2bc26157b3b9baa9b0c9abdc6561159279f570d4 Mon Sep 17 00:00:00 2001 From: Egor Kulikov Date: Tue, 25 Oct 2022 15:14:25 +0300 Subject: [PATCH 3/3] Fix bug --- .../plugin/ui/GenerateTestsDialogWindow.kt | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 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 2342a9d537..942fb7bda3 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 @@ -649,9 +649,8 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m staticsMocking.isSelected = settings.staticsMocking == MockitoStaticMocking parametrizedTestSources.isSelected = settings.parametrizedTestSource == ParametrizedTestSource.PARAMETRIZE - val areMocksSupported = settings.parametrizedTestSource == ParametrizedTestSource.DO_NOT_PARAMETRIZE - mockStrategies.isEnabled = areMocksSupported - staticsMocking.isEnabled = areMocksSupported && mockStrategies.item != MockStrategyApi.NO_MOCKS + mockStrategies.isEnabled = true + staticsMocking.isEnabled = mockStrategies.item != MockStrategyApi.NO_MOCKS codegenLanguages.item = model.codegenLanguage @@ -936,12 +935,19 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m ParametrizedTestSource.DO_NOT_PARAMETRIZE } - - val parametrizationEnabled = parametrizedTestSource == ParametrizedTestSource.PARAMETRIZE - if (parametrizationEnabled) { - mockStrategies.item = MockStrategyApi.NO_MOCKS - staticsMocking.isEnabled = false - staticsMocking.isSelected = false + when (parametrizedTestSource) { + ParametrizedTestSource.PARAMETRIZE -> { + mockStrategies.item = MockStrategyApi.NO_MOCKS + staticsMocking.isEnabled = false + staticsMocking.isSelected = false + } + ParametrizedTestSource.DO_NOT_PARAMETRIZE -> { + mockStrategies.isEnabled = true + if (mockStrategies.item != MockStrategyApi.NO_MOCKS) { + staticsMocking.isEnabled = true + staticsMocking.isSelected = true + } + } } updateTestFrameworksList(parametrizedTestSource)