Skip to content

Progress bar shows the progress stepwise and incorrectly #1196 #1215

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 1 commit into from
Oct 24, 2022
Merged

Progress bar shows the progress stepwise and incorrectly #1196 #1215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 54 additions & 34 deletions 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 @@ -19,6 +19,7 @@ import com.intellij.psi.PsiClass
import com.intellij.psi.PsiMethod
import com.intellij.refactoring.util.classMembers.MemberInfo
import com.intellij.task.ProjectTaskManager
import com.intellij.util.concurrency.AppExecutorUtil
import com.intellij.util.containers.nullize
import com.intellij.util.io.exists
import com.jetbrains.rd.util.lifetime.LifetimeDefinition
Expand Down Expand Up @@ -61,8 +62,12 @@ object UtTestsDialogProcessor {

fun updateIndicator(indicator: ProgressIndicator, range : ProgressRange, text: String? = null, fraction: Double? = null) {
invokeLater {
if (indicator.isCanceled) return@invokeLater
text?.let { indicator.text = it }
fraction?.let { indicator.fraction = indicator.fraction.coerceAtLeast(range.from + (range.to - range.from) * fraction.coerceIn(0.0, 1.0)) }
fraction?.let {
indicator.fraction =
indicator.fraction.coerceAtLeast(range.from + (range.to - range.from) * fraction.coerceIn(0.0, 1.0))
}
logger.debug("Phase ${indicator.text} with progress ${String.format("%.2f",indicator.fraction)}")
}
}
Expand Down Expand Up @@ -188,14 +193,12 @@ object UtTestsDialogProcessor {
continue
}

if (totalClasses > 1) {
updateIndicator(
indicator,
ProgressRange.SOLVING,
"Generate test cases for class $className",
processedClasses.toDouble() / totalClasses
)
}
updateIndicator(
indicator,
ProgressRange.SOLVING,
"Generate test cases for class $className",
processedClasses.toDouble() / totalClasses
)

// set timeout for concrete execution and for generated tests
UtSettings.concreteExecutionTimeoutInChildProcess =
Expand All @@ -216,33 +219,50 @@ object UtTestsDialogProcessor {
withStaticsSubstitutionRequired(true) {
val mockFrameworkInstalled = model.mockFramework?.isInstalled ?: true

val rdGenerateResult = proc.generate(
mockFrameworkInstalled,
model.staticsMocking.isConfigured,
model.conflictTriggers,
methods,
model.mockStrategy,
model.chosenClassesToMockAlways,
model.timeout,
model.timeout,
true,
UtSettings.useFuzzing,
project.service<Settings>().fuzzingValue,
searchDirectory.pathString
)

if (rdGenerateResult.notEmptyCases == 0) {
if (model.srcClasses.size > 1) {
logger.error { "Failed to generate any tests cases for class $className" }
} else {
showErrorDialogLater(
model.project,
errorMessage(className, secondsTimeout),
title = "Failed to generate unit tests for class $className"
val startTime = System.currentTimeMillis()
val timerHandler =
AppExecutorUtil.getAppScheduledExecutorService().scheduleWithFixedDelay({
val innerTimeoutRatio =
((System.currentTimeMillis() - startTime).toDouble() / model.timeout)
.coerceIn(0.0, 1.0)
updateIndicator(
indicator,
ProgressRange.SOLVING,
"Generate test cases for class $className",
(processedClasses.toDouble() + innerTimeoutRatio) / totalClasses
)
}, 0, 500, TimeUnit.MILLISECONDS)
try {
val rdGenerateResult = proc.generate(
mockFrameworkInstalled,
model.staticsMocking.isConfigured,
model.conflictTriggers,
methods,
model.mockStrategy,
model.chosenClassesToMockAlways,
model.timeout,
model.timeout,
true,
UtSettings.useFuzzing,
project.service<Settings>().fuzzingValue,
searchDirectory.pathString
)

if (rdGenerateResult.notEmptyCases == 0) {
if (model.srcClasses.size > 1) {
logger.error { "Failed to generate any tests cases for class $className" }
} else {
showErrorDialogLater(
model.project,
errorMessage(className, secondsTimeout),
title = "Failed to generate unit tests for class $className"
)
}
} else {
testSetsByClass[srcClass] = rdGenerateResult
}
} else {
testSetsByClass[srcClass] = rdGenerateResult
} finally {
timerHandler.cancel(true)
}
}
processedClasses++
Expand Down