Reorder components in UI (#1226)

UnitTestBot · Oct 25, 2022 · dcb65f3 · dcb65f3
1 parent 58609af
commit dcb65f3
Showing 1 changed file with 21 additions and 13 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
@@ -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)
@@ -644,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
 
@@ -931,15 +935,19 @@ 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) {
-                mockStrategies.item = MockStrategyApi.NO_MOCKS
-            }
-            if (!staticsMocking.isEnabled) {
-                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)