Skip to content

Commit e635539

Browse files
Fix mockStrategies Spring related issues on UI (#2088)
* Fix mockStrategies value after selection and deselection * Fix mockStrategies item enabling
1 parent 6a1e3c3 commit e635539

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,11 @@ import com.intellij.ui.components.panels.HorizontalLayout
6161
import com.intellij.ui.components.panels.NonOpaquePanel
6262
import com.intellij.ui.layout.Cell
6363
import com.intellij.ui.layout.CellBuilder
64+
import com.intellij.ui.layout.ComboBoxPredicate
6465
import com.intellij.ui.layout.Row
66+
import com.intellij.ui.layout.enableIf
6567
import com.intellij.ui.layout.panel
68+
import com.intellij.ui.layout.selectedValueMatches
6669
import com.intellij.util.IncorrectOperationException
6770
import com.intellij.util.io.exists
6871
import com.intellij.util.lang.JavaVersion
@@ -117,6 +120,7 @@ import org.utbot.framework.plugin.api.MockFramework
117120
import org.utbot.framework.plugin.api.MockFramework.MOCKITO
118121
import org.utbot.framework.plugin.api.MockStrategyApi
119122
import org.utbot.framework.plugin.api.TreatOverflowAsError
123+
import org.utbot.framework.plugin.api.isSummarizationCompatible
120124
import org.utbot.framework.plugin.api.utils.MOCKITO_EXTENSIONS_FILE_CONTENT
121125
import org.utbot.framework.plugin.api.utils.MOCKITO_EXTENSIONS_FOLDER
122126
import org.utbot.framework.plugin.api.utils.MOCKITO_MOCKMAKER_FILE_NAME
@@ -336,7 +340,9 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
336340
ContextHelpLabel.create("Mock everything around the target class or the whole package except the system classes. " +
337341
"Otherwise, mock nothing. Mockito will be installed, if you don't have one.")
338342
)
339-
}
343+
}.enableIf(ComboBoxPredicate(springConfig) {
344+
model.projectType != ProjectType.Spring || springConfig.item == NO_SPRING_CONFIGURATION_OPTION
345+
})
340346
row { component(staticsMocking)}
341347
row {
342348
cell {
@@ -1025,6 +1031,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
10251031
mockStrategies.isEnabled = false
10261032
updateMockStrategyListForConfigGuidedTypeReplacements()
10271033
} else {
1034+
mockStrategies.item = MockStrategyApi.defaultItem
10281035
mockStrategies.isEnabled = true
10291036
updateMockStrategyList()
10301037
}

0 commit comments

Comments
 (0)