Skip to content

Fix mockStrategies Spring related issues on UI #2088

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

Merged
merged 3 commits into from
Apr 3, 2023
Merged

Fix mockStrategies Spring related issues on UI #2088

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe7d89c
Fix mockStrategies value after selection and deselection
EgorkaKulikov Apr 3, 2023
849ba70
Fix mockStrategies item enabling
EgorkaKulikov Apr 3, 2023
66dcdec
Merge branch 'main' into egor/ui_spring_mockstrategies_improving
Vassiliy-Kudryashov Apr 3, 2023
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
9 changes: 8 additions & 1 deletion 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 @@ -61,8 +61,11 @@ import com.intellij.ui.components.panels.HorizontalLayout
import com.intellij.ui.components.panels.NonOpaquePanel
import com.intellij.ui.layout.Cell
import com.intellij.ui.layout.CellBuilder
import com.intellij.ui.layout.ComboBoxPredicate
import com.intellij.ui.layout.Row
import com.intellij.ui.layout.enableIf
import com.intellij.ui.layout.panel
import com.intellij.ui.layout.selectedValueMatches
import com.intellij.util.IncorrectOperationException
import com.intellij.util.io.exists
import com.intellij.util.lang.JavaVersion
Expand Down Expand Up @@ -117,6 +120,7 @@ import org.utbot.framework.plugin.api.MockFramework
import org.utbot.framework.plugin.api.MockFramework.MOCKITO
import org.utbot.framework.plugin.api.MockStrategyApi
import org.utbot.framework.plugin.api.TreatOverflowAsError
import org.utbot.framework.plugin.api.isSummarizationCompatible
import org.utbot.framework.plugin.api.utils.MOCKITO_EXTENSIONS_FILE_CONTENT
import org.utbot.framework.plugin.api.utils.MOCKITO_EXTENSIONS_FOLDER
import org.utbot.framework.plugin.api.utils.MOCKITO_MOCKMAKER_FILE_NAME
Expand Down Expand Up @@ -336,7 +340,9 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
ContextHelpLabel.create("Mock everything around the target class or the whole package except the system classes. " +
"Otherwise, mock nothing. Mockito will be installed, if you don't have one.")
)
}
}.enableIf(ComboBoxPredicate(springConfig) {
model.projectType != ProjectType.Spring || springConfig.item == NO_SPRING_CONFIGURATION_OPTION
})
row { component(staticsMocking)}
row {
cell {
Expand Down Expand Up @@ -1025,6 +1031,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
mockStrategies.isEnabled = false
updateMockStrategyListForConfigGuidedTypeReplacements()
} else {
mockStrategies.item = MockStrategyApi.defaultItem
mockStrategies.isEnabled = true
updateMockStrategyList()
}
Expand Down