Skip to content

Set MockStrategy default value properly in Spring projects #2093

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 2 commits into from
Apr 4, 2023
Merged

Set MockStrategy default value properly in Spring projects #2093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
039eab1
Set MockStrategy default value properly in Spring projects
EgorkaKulikov Apr 4, 2023
81ee353
Test added
EgorkaKulikov Apr 4, 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
5 changes: 5 additions & 0 deletions utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,6 +1365,11 @@ enum class MockStrategyApi(
companion object : CodeGenerationSettingBox {
override val defaultItem = OTHER_PACKAGES
override val allItems: List<MockStrategyApi> = values().toList()

// Mock strategy gains more meaning in Spring Projects.
// We use OTHER_CLASSES strategy as default one in `No configuration` mode
// and as unique acceptable in other modes (combined with type replacement).
val springDefaultItem = OTHER_CLASSES
}
}

Expand Down
10 changes: 10 additions & 0 deletions utbot-framework-test/src/test/kotlin/org/utbot/framework/plugin/api/MockStrategyApiTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ internal class MockStrategyApiTest {
)
}

@Test
fun ensureDefaultStrategyIsOtherClassesInSpringApplication() {
assertEquals(
MockStrategyApi.OTHER_CLASSES,
MockStrategyApi.springDefaultItem,
"Expecting that ${MockStrategyApi.OTHER_CLASSES} is the default policy for Mocks in Spring application" +
"but ${MockStrategyApi.springDefaultItem} found"
)
}

@Test
fun testLabelToEnum() {
assertEquals(
Expand Down
15 changes: 10 additions & 5 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 @@ -712,7 +712,11 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
cbSpecifyTestPackage.isEnabled = model.srcClasses.all { cl -> cl.packageName.isNotEmpty() }

val settings = model.project.service<Settings>()
mockStrategies.item = settings.mockStrategy

mockStrategies.item = when (model.projectType) {
ProjectType.Spring -> MockStrategyApi.springDefaultItem
else -> settings.mockStrategy
}
staticsMocking.isSelected = settings.staticsMocking == MockitoStaticMocking
parametrizedTestSources.isSelected = settings.parametrizedTestSource == ParametrizedTestSource.PARAMETRIZE

Expand Down Expand Up @@ -1025,13 +1029,14 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
springConfig.addActionListener { _ ->
val isSpringConfigSelected = springConfig.item != NO_SPRING_CONFIGURATION_OPTION
if (isSpringConfigSelected) {
// Here mock strategy gains more meaning in Spring Projects.
// We use OTHER_CLASSES strategy combined with type replacement being enabled.
mockStrategies.item = MockStrategyApi.OTHER_CLASSES
mockStrategies.item = MockStrategyApi.springDefaultItem
mockStrategies.isEnabled = false
updateMockStrategyListForConfigGuidedTypeReplacements()
} else {
mockStrategies.item = MockStrategyApi.defaultItem
mockStrategies.item = when (model.projectType) {
ProjectType.Spring -> MockStrategyApi.springDefaultItem
else -> MockStrategyApi.defaultItem
}
mockStrategies.isEnabled = true
updateMockStrategyList()
}
Expand Down