Skip to content

Commit 9d2b31b

Browse files
authored
Go. Hide timeout per execution from dialog (#1910)
Hide timeout per execution from dialog
1 parent 9c898bb commit 9d2b31b

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

utbot-intellij-go/src/main/kotlin/org/utbot/intellij/plugin/language/go/ui/GenerateGoTestsDialogWindow.kt

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.utbot.intellij.plugin.language.go.ui
22

33
import com.goide.psi.GoFunctionOrMethodDeclaration
44
import com.goide.refactor.ui.GoDeclarationInfo
5+
import com.intellij.openapi.components.service
56
import com.intellij.openapi.ui.DialogPanel
67
import com.intellij.openapi.ui.DialogWrapper
78
import com.intellij.openapi.ui.ValidationInfo
@@ -12,13 +13,11 @@ import com.intellij.util.ui.JBUI
1213
import com.intellij.util.ui.UIUtil
1314
import org.utbot.go.logic.GoUtTestsGenerationConfig
1415
import org.utbot.intellij.plugin.language.go.models.GenerateGoTestsModel
16+
import org.utbot.intellij.plugin.settings.Settings
1517
import java.text.ParseException
1618
import java.util.concurrent.TimeUnit
1719
import javax.swing.JComponent
1820

19-
private const val MINIMUM_EACH_EXECUTION_TIMEOUT_MILLIS = 1
20-
private const val EACH_EXECUTION_TIMEOUT_MILLIS_SPINNER_STEP = 10
21-
2221
private const val MINIMUM_ALL_EXECUTION_TIMEOUT_SECONDS = 1
2322
private const val ALL_EXECUTION_TIMEOUT_SECONDS_SPINNER_STEP = 10
2423

@@ -38,13 +37,6 @@ class GenerateGoTestsDialogWindow(val model: GenerateGoTestsModel) : DialogWrapp
3837
Int.MAX_VALUE,
3938
ALL_EXECUTION_TIMEOUT_SECONDS_SPINNER_STEP
4039
)
41-
private val eachFunctionExecutionTimeoutMillisSpinner =
42-
JBIntSpinner(
43-
GoUtTestsGenerationConfig.DEFAULT_EACH_EXECUTION_TIMEOUT_MILLIS.toInt(),
44-
MINIMUM_EACH_EXECUTION_TIMEOUT_MILLIS,
45-
Int.MAX_VALUE,
46-
EACH_EXECUTION_TIMEOUT_MILLIS_SPINNER_STEP
47-
)
4840

4941
private lateinit var panel: DialogPanel
5042

@@ -65,10 +57,6 @@ class GenerateGoTestsDialogWindow(val model: GenerateGoTestsModel) : DialogWrapp
6557
component(allFunctionExecutionTimeoutSecondsSpinner)
6658
component(JBLabel("seconds"))
6759
}
68-
row("Timeout for each function execution:") {
69-
component(eachFunctionExecutionTimeoutMillisSpinner)
70-
component(JBLabel("ms"))
71-
}
7260
}
7361
updateFunctionsOrMethodsTable()
7462
return panel
@@ -77,11 +65,13 @@ class GenerateGoTestsDialogWindow(val model: GenerateGoTestsModel) : DialogWrapp
7765
override fun doOKAction() {
7866
model.selectedFunctions = targetFunctionsTable.selectedMemberInfos.fromInfos()
7967
try {
80-
eachFunctionExecutionTimeoutMillisSpinner.commitEdit()
8168
allFunctionExecutionTimeoutSecondsSpinner.commitEdit()
8269
} catch (_: ParseException) {
8370
}
84-
model.eachFunctionExecutionTimeoutMillis = eachFunctionExecutionTimeoutMillisSpinner.number.toLong()
71+
val settings = model.project.service<Settings>()
72+
with(settings) {
73+
model.eachFunctionExecutionTimeoutMillis = hangingTestsTimeout.timeoutMs
74+
}
8575
model.allFunctionExecutionTimeoutMillis =
8676
TimeUnit.SECONDS.toMillis(allFunctionExecutionTimeoutSecondsSpinner.number.toLong())
8777
super.doOKAction()

0 commit comments

Comments
 (0)