Skip to content

Don't throw MultipleFailuresError if failure list is empty #315

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
evant merged 1 commit into from
Aug 24, 2020
Merged

Don't throw MultipleFailuresError if failure list is empty #315

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
8 changes: 4 additions & 4 deletions assertk/src/commonMain/kotlin/assertk/failure.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ internal class SoftFailure(
}

private fun compositeErrorMessage(errors: List<Throwable>): Throwable {
return if (errors.size == 1) {
errors.first()
} else {
MultipleFailuresError(message, errors).apply {
return when(errors.size) {
0 -> AssertionFailedError(message)
1 -> errors.first()
else -> MultipleFailuresError(message, errors).apply {
errors.forEach(this::addSuppressed)
}
}
Expand Down
11 changes: 11 additions & 0 deletions assertk/src/commonTest/kotlin/test/assertk/assertions/IterableTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,17 @@ class IterableTest {
)
}

@Test fun exactly_too_few_inside_all_fails() {
val error = assertFails {
assertThat(listOf(5, 4, 3) as Iterable<Int>).all {
exactly(2) { it.isGreaterThan(2) }
}
}
assertEquals(
"""expected to pass exactly 2 times""".trimMargin(), error.message
)
}

@Test fun exactly_times_passed_passes() {
assertThat(listOf(0, 1, 2) as Iterable<Int>).exactly(2) { it.isGreaterThan(0) }
}
Expand Down