Skip to content
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

Jump to bottom

Inline lambdas passed to assertDoesNotThrows to support suspending functions #2684

Merged
merged 11 commits into from
Aug 17, 2021
Merged

Inline lambdas passed to assertDoesNotThrows to support suspending functions #2684

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3213dcf
Inline lambdas passed to assertDoesNotThrows to support suspending fu…
williamboman Aug 11, 2021
b8154ec
pass explicit type param to avoid unreachable code workaround
williamboman Aug 11, 2021
14407dd
overload function for Nothing return types
williamboman Aug 13, 2021
80aeb8d
remove reified types
williamboman Aug 13, 2021
67cd7a4
Merge remote-tracking branch 'upstream/main' into assert-does-not-thr…
williamboman Aug 13, 2021
de6c87c
move method to below all usage
williamboman Aug 13, 2021
d48eeb4
add dynamic tests
williamboman Aug 13, 2021
69b5a17
add to release notes
williamboman Aug 16, 2021
ba06ff1
Merge remote-tracking branch 'upstream/main' into assert-does-not-thr…
williamboman Aug 16, 2021
5fd5d97
Update documentation/src/docs/asciidoc/release-notes/release-notes-5.…
williamboman Aug 16, 2021
742d7af
s/getThrowingSupplier/evaluateAndWrap/
williamboman Aug 16, 2021
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
1 change: 1 addition & 0 deletions documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ on GitHub.

==== New Features and Improvements

* `assertDoesNotThrow` now supports calling suspending functions.
williamboman marked this conversation as resolved.
Show resolved Hide resolved
* `@TempDir` can now be used to create multiple temporary directories. Instead of creating
a single temporary directory per context (i.e. test class or method) every declaration
of the `@TempDir` annotation on a field or method parameter now results in a separate
Expand Down
21 changes: 16 additions & 5 deletions junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ inline fun <reified T : Throwable> assertThrows(noinline message: () -> String,
* @param R the result type of the [executable]
*/
@API(status = EXPERIMENTAL, since = "5.5")
fun <R> assertDoesNotThrow(executable: () -> R): R =
Assertions.assertDoesNotThrow(ThrowingSupplier(executable))
inline fun <R> assertDoesNotThrow(executable: () -> R): R =
Assertions.assertDoesNotThrow(getThrowingSupplier(executable))

/**
* Example usage:
Expand All @@ -172,7 +172,7 @@ fun <R> assertDoesNotThrow(executable: () -> R): R =
* @param R the result type of the [executable]
*/
@API(status = EXPERIMENTAL, since = "5.5")
fun <R> assertDoesNotThrow(message: String, executable: () -> R): R =
inline fun <R> assertDoesNotThrow(message: String, executable: () -> R): R =
assertDoesNotThrow({ message }, executable)

/**
Expand All @@ -186,8 +186,19 @@ fun <R> assertDoesNotThrow(message: String, executable: () -> R): R =
* @param R the result type of the [executable]
*/
@API(status = EXPERIMENTAL, since = "5.5")
fun <R> assertDoesNotThrow(message: () -> String, executable: () -> R): R =
Assertions.assertDoesNotThrow(ThrowingSupplier(executable), Supplier(message))
inline fun <R> assertDoesNotThrow(noinline message: () -> String, executable: () -> R): R =
Assertions.assertDoesNotThrow(
getThrowingSupplier(executable),
Supplier(message)
)

@PublishedApi
internal inline fun <R> getThrowingSupplier(executable: () -> R): ThrowingSupplier<R> = try {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about this method name which is "effectively public" due to @PublishedApi. Maybe evaluateAndWrap or sth. similar would be clearer.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's a good call, agreed.

742d7af

val result = executable()
ThrowingSupplier { result }
} catch (throwable: Throwable) {
ThrowingSupplier { throw throwable }
}

/**
* Example usage:
Expand Down
57 changes: 57 additions & 0 deletions junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,31 @@ class KotlinAssertionsTests {
val actual = assertDoesNotThrow { 1 }
assertEquals(1, actual)
},
dynamicTest("for no arguments variant (suspended)") {
runBlocking {
val actual = assertDoesNotThrow { suspend { 1 }() }
assertEquals(1, actual)
}
},
dynamicTest("for message variant") {
val actual = assertDoesNotThrow("message") { 2 }
assertEquals(2, actual)
},
dynamicTest("for message variant (suspended)") {
runBlocking {
val actual = assertDoesNotThrow("message") { suspend { 2 }() }
assertEquals(2, actual)
}
},
dynamicTest("for message supplier variant") {
val actual = assertDoesNotThrow({ "message" }) { 3 }
assertEquals(3, actual)
},
dynamicTest("for message supplier variant (suspended)") {
runBlocking {
val actual = assertDoesNotThrow({ "message" }) { suspend { 3 }() }
assertEquals(3, actual)
}
}
)),
dynamicContainer("fails when an exception is thrown", Stream.of(
Expand All @@ -94,6 +112,19 @@ class KotlinAssertionsTests {
assertMessageEquals(exception,
"Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
},
dynamicTest("for no arguments variant (suspended)") {
runBlocking {
val exception = assertThrows<AssertionError> {
assertDoesNotThrow {
suspend { fail("fail") }()
}
}
assertMessageEquals(
exception,
"Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
)
}
},
dynamicTest("for message variant") {
val exception = assertThrows<AssertionError> {
assertDoesNotThrow("Does not throw") {
Expand All @@ -103,6 +134,19 @@ class KotlinAssertionsTests {
assertMessageEquals(exception,
"Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
},
dynamicTest("for message variant (suspended)") {
runBlocking {
val exception = assertThrows<AssertionError> {
assertDoesNotThrow("Does not throw") {
suspend { fail("fail") }()
}
}
assertMessageEquals(
exception,
"Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
)
}
},
dynamicTest("for message supplier variant") {
val exception = assertThrows<AssertionError> {
assertDoesNotThrow({ "Does not throw" }) {
Expand All @@ -111,6 +155,19 @@ class KotlinAssertionsTests {
}
assertMessageEquals(exception,
"Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
},
dynamicTest("for message supplier variant (suspended)") {
runBlocking {
val exception = assertThrows<AssertionError> {
assertDoesNotThrow({ "Does not throw" }) {
suspend { fail("fail") }()
}
}
assertMessageEquals(
exception,
"Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
)
}
}
))
)
Expand Down