Skip to content

Support profiles selection for Spring-guided test generation #2183

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
EgorkaKulikov merged 3 commits into from
Apr 25, 2023
Merged

Support profiles selection for Spring-guided test generation #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc19f7e
Support profiles selection for Spring-guided test generation
EgorkaKulikov Apr 24, 2023
9bfb073
Little corrections
EgorkaKulikov Apr 24, 2023
aa63483
Merge branch 'main' into egor/profile_from_ui
Vassiliy-Kudryashov Apr 24, 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
2 changes: 1 addition & 1 deletion utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ object UtTestsDialogProcessor {
classpathForClassLoader,
approach.config,
fileStorage,
profileExpression = null,
model.profileExpression,
)
}
}
Expand Down
1 change: 1 addition & 0 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/GenerateTestsModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class GenerateTestsModel(
lateinit var commentStyle: JavaDocCommentStyle

lateinit var typeReplacementApproach: TypeReplacementApproach
lateinit var profileExpression: String

val conflictTriggers: ConflictTriggers = ConflictTriggers()

Expand Down
46 changes: 40 additions & 6 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 @@ -63,6 +63,7 @@ import com.intellij.ui.components.panels.OpaquePanel
import com.intellij.ui.dsl.builder.Align
import com.intellij.ui.layout.ComboBoxPredicate
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.layout.selected
import com.intellij.util.IncorrectOperationException
import com.intellij.util.lang.JavaVersion
import com.intellij.util.ui.JBUI
Expand Down Expand Up @@ -152,7 +153,7 @@ import org.utbot.intellij.plugin.util.findSdkVersion
import java.io.File
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
import java.util.*
import javax.swing.JTextField
import kotlin.io.path.notExists

private const val RECENTS_KEY = "org.utbot.recents"
Expand All @@ -162,6 +163,7 @@ private const val SAME_PACKAGE_LABEL = "same as for sources"
private const val WILL_BE_INSTALLED_LABEL = " (will be installed)"

private const val NO_SPRING_CONFIGURATION_OPTION = "No configuration"
private const val DEFAULT_SPRING_PROFILE_NAME = "default"

private const val ACTION_GENERATE = "Generate Tests"
private const val ACTION_GENERATE_AND_RUN = "Generate and Run"
Expand Down Expand Up @@ -192,10 +194,13 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
private val javaConfigurationHelper = SpringConfigurationsHelper(".")
private val xmlConfigurationHelper = SpringConfigurationsHelper(File.separator)

private val springConfig = createComboBoxWithSeparatorsForSpringConfigs(shortenConfigurationNames())

private val mockStrategies = createComboBox(MockStrategyApi.values())
private val staticsMocking = JCheckBox("Mock static methods")

private val springConfig = createComboBoxWithSeparatorsForSpringConfigs(shortenConfigurationNames())
private val selectProfile = JCheckBox("Select active profiles")
private val profileExpression = JTextField(DEFAULT_SPRING_PROFILE_NAME, 23)

private val timeoutSpinner =
JBIntSpinner(TimeUnit.MILLISECONDS.toSeconds(model.timeout).toInt(), 1, Int.MAX_VALUE, 1).also {
when(val editor = it.editor) {
Expand Down Expand Up @@ -388,17 +393,33 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
row("Spring configuration:") {
cell(springConfig)
contextHelp(
"100% Symbolic execution mode.\n" +
"100% Symbolic execution mode.<br>" +
"Classes defined in Spring configuration will be used instead " +
"of interfaces and abstract classes.\n" +
"of interfaces and abstract classes.<br>" +
"Mocks will be used when necessary."
)
}
row {
cell(selectProfile)
contextHelp(
"Only selected profile will be active.<br>" +
"Otherwise, profile from the configuration class or default one is used."
)
}
indent {
row("Profile name(s):") {
cell(profileExpression).align(Align.FILL)
contextHelp(
"Profile name or expression like \"prod|web\" may be passed here.<br>" +
"If expression is incorrect, default profile will be used"
)
}.enabledIf(selectProfile.selected)
}
}
row("Mocking strategy:") {
cell(mockStrategies)
contextHelp(
"Mock everything around the target class or the whole package except the system classes. " +
"Mock everything around the target class or the whole package except the system classes.<br> " +
"Otherwise, mock nothing. Mockito will be installed, if you don't have one."
)
}.enabledIf(ComboBoxPredicate(springConfig) {
Expand Down Expand Up @@ -638,6 +659,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
TypeReplacementApproach.ReplaceIfPossible(fullConfigName)
}
}
model.profileExpression = profileExpression.text

val settings = model.project.service<Settings>()
with(settings) {
Expand Down Expand Up @@ -1034,16 +1056,26 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
mockStrategies.item = MockStrategyApi.springDefaultItem
mockStrategies.isEnabled = false
updateMockStrategyListForConfigGuidedTypeReplacements()

selectProfile.isEnabled = true
selectProfile.isSelected = false
} else {
mockStrategies.item = when (model.projectType) {
ProjectType.Spring -> MockStrategyApi.springDefaultItem
else -> MockStrategyApi.defaultItem
}
mockStrategies.isEnabled = true
updateMockStrategyList()

selectProfile.isEnabled = false
selectProfile.isSelected = false
}
}

selectProfile.addActionListener { _ ->
profileExpression.text = if (selectProfile.isSelected) "" else DEFAULT_SPRING_PROFILE_NAME
}

cbSpecifyTestPackage.addActionListener {
val testPackageName = findTestPackageComboValue()
val packageNameIsNeeded = testPackageField.isEnabled || testPackageName != SAME_PACKAGE_LABEL
Expand Down Expand Up @@ -1120,6 +1152,8 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
private fun updateSpringConfigurationEnabled() {
// We check for > 1 because there is already extra-dummy NO_SPRING_CONFIGURATION_OPTION option
springConfig.isEnabled = model.projectType == ProjectType.Spring && springConfig.itemCount > 1
selectProfile.isEnabled = false
selectProfile.isSelected = false
}

private fun staticsMockingConfigured(): Boolean {
Expand Down