Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reorder components in UI #1226

Merged
merged 4 commits into from
Oct 25, 2022
Merged

Reorder components in UI #1226

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb8ad13
Reorder components in UI
EgorkaKulikov Oct 24, 2022
9b028cc
Improve mocking value and disabling
EgorkaKulikov Oct 25, 2022
0dfb000
Merge branch 'main' into egor/reorder_components
EgorkaKulikov Oct 25, 2022
2bc2615
Fix bug
EgorkaKulikov Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
null
)
}
row { component(parametrizedTestSources) }
row("Mocking strategy:") {
makePanelWithHelpTooltip(
mockStrategies,
Expand All @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down