Skip to content

Commit ce29482

Browse files
Vassiliy-Kudryashovdenis-fokin
authored andcommitted
Test Generation Timeout is not saved in project utbot-settings.xml #1935 (#1950)
(cherry picked from commit eb7747d)
1 parent 410b439 commit ce29482

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ object UtTestsDialogProcessor {
109109
srcClasses,
110110
extractMembersFromSrcClasses,
111111
focusedMethods,
112-
UtSettings.utBotGenerationTimeoutInMillis,
112+
project.service<Settings>().generationTimeoutInMillis
113113
)
114114
if (model.getAllTestSourceRoots().isEmpty() && project.isBuildWithGradle) {
115115
val errorMessage = """
@@ -308,7 +308,7 @@ object UtTestsDialogProcessor {
308308
Messages.showInfoMessage(
309309
model.project,
310310
"No methods for test generation were found among selected items",
311-
"No methods found"
311+
"No Methods Found"
312312
)
313313
}
314314
return

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/settings/Settings.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ private fun fromGenerateTestsModel(model: GenerateTestsModel): Settings.State {
2626
fuzzingValue = model.fuzzingValue,
2727
runGeneratedTestsWithCoverage = model.runGeneratedTestsWithCoverage,
2828
commentStyle = model.commentStyle,
29+
generationTimeoutInMillis = model.timeout,
2930
summariesGenerationType = model.summariesGenerationType
3031
)
3132
}

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ private const val RECENTS_KEY = "org.utbot.recents"
153153
private const val SAME_PACKAGE_LABEL = "same as for sources"
154154

155155
private const val WILL_BE_INSTALLED_LABEL = " (will be installed)"
156-
private const val WILL_BE_CONFIGURED_LABEL = " (will be configured)"
157-
private const val MINIMUM_TIMEOUT_VALUE_IN_SECONDS = 1
158156

159157
private const val ACTION_GENERATE = "Generate Tests"
160158
private const val ACTION_GENERATE_AND_RUN = "Generate and Run"
@@ -174,7 +172,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
174172
findTestPackageComboValue(),
175173
model.project,
176174
RECENTS_KEY,
177-
"Choose destination package"
175+
"Choose Destination Package"
178176
)
179177

180178
private val testSourceFolderField = TestFolderComboWithBrowseButton(model)
@@ -184,12 +182,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
184182
private val mockStrategies = createComboBox(MockStrategyApi.values())
185183
private val staticsMocking = JCheckBox("Mock static methods")
186184
private val timeoutSpinner =
187-
JBIntSpinner(
188-
TimeUnit.MILLISECONDS.toSeconds(UtSettings.utBotGenerationTimeoutInMillis).toInt(),
189-
MINIMUM_TIMEOUT_VALUE_IN_SECONDS,
190-
Int.MAX_VALUE,
191-
MINIMUM_TIMEOUT_VALUE_IN_SECONDS
192-
).also {
185+
JBIntSpinner(TimeUnit.MILLISECONDS.toSeconds(model.timeout).toInt(), 1, Int.MAX_VALUE, 1).also {
193186
when(val editor = it.editor) {
194187
is JSpinner.DefaultEditor -> {
195188
when(val formatter = editor.textField.formatter) {
@@ -617,7 +610,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
617610
private fun showTestRootAbsenceErrorMessage() =
618611
Messages.showErrorDialog(
619612
"Test source root is not configured or is located out of content entry!",
620-
"Generation error"
613+
"Generation Error"
621614
)
622615

623616
private fun getOrCreateTestRoot(testSourceRoot: VirtualFile): Boolean {

utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/settings/CommonSettings.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
6464
var runGeneratedTestsWithCoverage: Boolean = false,
6565
var commentStyle: JavaDocCommentStyle = JavaDocCommentStyle.defaultItem,
6666
var summariesGenerationType: SummariesGenerationType = UtSettings.summaryGenerationType,
67+
var generationTimeoutInMillis: Long = UtSettings.utBotGenerationTimeoutInMillis,
6768
var enableExperimentalLanguagesSupport: Boolean = false,
6869
) {
6970

@@ -90,6 +91,7 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
9091
if (runGeneratedTestsWithCoverage != other.runGeneratedTestsWithCoverage) return false
9192
if (commentStyle != other.commentStyle) return false
9293
if (summariesGenerationType != other.summariesGenerationType) return false
94+
if (generationTimeoutInMillis != other.generationTimeoutInMillis) return false
9395

9496
return true
9597
}
@@ -110,6 +112,7 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
110112
result = 31 * result + fuzzingValue.hashCode()
111113
result = 31 * result + if (runGeneratedTestsWithCoverage) 1 else 0
112114
result = 31 * result + summariesGenerationType.hashCode()
115+
result = 31 * result + generationTimeoutInMillis.hashCode()
113116

114117
return result
115118
}
@@ -132,6 +135,12 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
132135
state.hangingTestsTimeout = value
133136
}
134137

138+
var generationTimeoutInMillis : Long
139+
get() = state.generationTimeoutInMillis
140+
set(value) {
141+
state.generationTimeoutInMillis = value
142+
}
143+
135144
val staticsMocking: StaticsMocking get() = state.staticsMocking
136145

137146
val runInspectionAfterTestGeneration: Boolean get() = state.runInspectionAfterTestGeneration

0 commit comments

Comments
 (0)