Test report reworked (#522) by nikitavlaev · Pull Request #523 · UnitTestBot/UTBotJava · GitHub
Skip to content

Test report reworked (#522) #523

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
nikitavlaev merged 1 commit into from
Jul 18, 2022
Merged

Test report reworked (#522) #523

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt
View file
Open in desktop
88 changes: 33 additions & 55 deletions .../main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,29 @@ data class TestsGenerationReport(
get() = executables.firstOrNull()?.clazz
?: error("No executables found in test report")

// Summary message is generated lazily to avoid evaluation of classUnderTest
var summaryMessage: () -> String = { "Unit tests for $classUnderTest were generated successfully." }
val initialWarnings: MutableList<() -> String> = mutableListOf()
val hasWarnings: Boolean
get() = initialWarnings.isNotEmpty()

val detailedStatistics: String
get() = buildString {
appendHtmlLine("Class: ${classUnderTest.qualifiedName}")
val testMethodsStatistic = executables.map { it.countTestMethods() }
val errors = executables.map { it.countErrors() }
val overallErrors = errors.sum()

appendHtmlLine("Successful test methods: ${testMethodsStatistic.sumBy { it.successful }}")
appendHtmlLine(
"Failing because of unexpected exception test methods: ${testMethodsStatistic.sumBy { it.failing }}"
)
appendHtmlLine(
"Failing because of exceeding timeout test methods: ${testMethodsStatistic.sumBy { it.timeout }}"
)
appendHtmlLine(
"Failing because of possible JVM crash test methods: ${testMethodsStatistic.sumBy { it.crashes }}"
)
appendHtmlLine("Not generated because of internal errors test methods: $overallErrors")
}

fun addMethodErrors(testCase: UtTestCase, errors: Map<String, Int>) {
this.errors[testCase.method] = errors
Expand All @@ -216,61 +236,24 @@ data class TestsGenerationReport(
}
}

override fun toString(): String = buildString {
appendHtmlLine(summaryMessage())
appendHtmlLine()
initialWarnings.forEach { appendHtmlLine(it()) }
appendHtmlLine()
fun toString(isShort: Boolean): String = buildString {
appendHtmlLine("Target: ${classUnderTest.qualifiedName}")
if (initialWarnings.isNotEmpty()) {
initialWarnings.forEach { appendHtmlLine(it()) }
appendHtmlLine()
}

val testMethodsStatistic = executables.map { it.countTestMethods() }
val errors = executables.map { it.countErrors() }
val overallTestMethods = testMethodsStatistic.sumBy { it.count }
val overallErrors = errors.sum()

appendHtmlLine("Overall test methods: $overallTestMethods")
appendHtmlLine("Successful test methods: ${testMethodsStatistic.sumBy { it.successful }}")
appendHtmlLine(
"Failing because of unexpected exception test methods: ${testMethodsStatistic.sumBy { it.failing }}"
)
appendHtmlLine(
"Failing because of exceeding timeout test methods: ${testMethodsStatistic.sumBy { it.timeout }}"
)
appendHtmlLine(
"Failing because of possible JVM crash test methods: ${testMethodsStatistic.sumBy { it.crashes }}"
)
appendHtmlLine("Not generated because of internal errors test methods: $overallErrors")
}

// TODO: should we use TsvWriter from univocity instead of this manual implementation?
fun getFileContent(): String =
(listOf(getHeader()) + getLines()).joinToString(System.lineSeparator())

private fun getHeader(): String {
val columnNames = listOf(
"Executable/Number of test methods",
SUCCESSFUL,
FAILING,
TIMEOUT,
CRASH,
"Errors tests"
)

return columnNames.joinToString(TAB_SEPARATOR)
if (!isShort) {
appendHtmlLine(detailedStatistics)
}
}

private fun getLines(): List<String> =
executables.map { executable ->
val testMethodStatistic = executable.countTestMethods()
with(testMethodStatistic) {
listOf(
executable,
successful,
failing,
timeout,
crashes,
executable.countErrors()
).joinToString(TAB_SEPARATOR)
}
}
override fun toString(): String = toString(false)

private fun UtMethod<*>.countTestMethods(): TestMethodStatistic = TestMethodStatistic(
testMethodsNumber(successfulExecutions),
Expand All @@ -291,9 +274,4 @@ data class TestsGenerationReport(
private data class TestMethodStatistic(val successful: Int, val failing: Int, val timeout: Int, val crashes: Int) {
val count: Int = successful + failing + timeout + crashes
}

companion object {
private const val TAB_SEPARATOR: String = "\t"
const val EXTENSION: String = ".tsv"
}
}
1 change: 0 additions & 1 deletion ...ork/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ class GenerateTestsAndSarifReportFacade(
mergedSarifReportFile.writeText(mergedReport)
if (verbose) {
println("SARIF report was saved to \"${mergedSarifReportFile.path}\"")
println("You can open it using the VS Code extension \"Sarif Viewer\"")
}
}
}
Expand Down
48 changes: 14 additions & 34 deletions ...-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationController.kt
View file
Open in desktop
Loading