kotlin-test: Add documentation for value returned by assertFailsWith
A follow-up after https://youtrack.jetbrains.com/issue/KT-27418 Co-authored-by: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
This commit is contained in:
committed by
Ilya Gorbunov
parent
16918fa25e
commit
3c46bb9d03
@@ -99,13 +99,21 @@ fun <@OnlyInputTypes T> expect(expected: T, message: String?, block: () -> T) {
|
|||||||
assertEquals(expected, block(), message)
|
assertEquals(expected, block(), message)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Asserts that given function [block] fails by throwing an exception. */
|
/**
|
||||||
|
* Asserts that given function [block] fails by throwing an exception.
|
||||||
|
*
|
||||||
|
* @return An exception that was expected to be thrown and was successfully caught.
|
||||||
|
* The returned exception can be inspected further, for example by asserting its property values.
|
||||||
|
*/
|
||||||
fun assertFails(block: () -> Unit): Throwable = assertFails(null, block)
|
fun assertFails(block: () -> Unit): Throwable = assertFails(null, block)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Asserts that given function [block] fails by throwing an exception.
|
* Asserts that given function [block] fails by throwing an exception.
|
||||||
*
|
*
|
||||||
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
||||||
|
*
|
||||||
|
* @return An exception that was expected to be thrown and was successfully caught.
|
||||||
|
* The returned exception can be inspected further, for example by asserting its property values.
|
||||||
*/
|
*/
|
||||||
@SinceKotlin("1.1")
|
@SinceKotlin("1.1")
|
||||||
fun assertFails(message: String?, block: () -> Unit): Throwable {
|
fun assertFails(message: String?, block: () -> Unit): Throwable {
|
||||||
@@ -121,12 +129,20 @@ fun assertFails(message: String?, block: () -> Unit): Throwable {
|
|||||||
/** Asserts that a [block] fails with a specific exception of type [T] being thrown.
|
/** Asserts that a [block] fails with a specific exception of type [T] being thrown.
|
||||||
*
|
*
|
||||||
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
||||||
|
*
|
||||||
|
* @return An exception of the expected exception type [T] that successfully caught.
|
||||||
|
* The returned exception can be inspected further, for example by asserting its property values.
|
||||||
*/
|
*/
|
||||||
@InlineOnly
|
@InlineOnly
|
||||||
inline fun <reified T : Throwable> assertFailsWith(message: String? = null, noinline block: () -> Unit): T =
|
inline fun <reified T : Throwable> assertFailsWith(message: String? = null, noinline block: () -> Unit): T =
|
||||||
assertFailsWith(T::class, message, block)
|
assertFailsWith(T::class, message, block)
|
||||||
|
|
||||||
/** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */
|
/**
|
||||||
|
* Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown.
|
||||||
|
*
|
||||||
|
* @return An exception of the expected exception type [T] that successfully caught.
|
||||||
|
* The returned exception can be inspected further, for example by asserting its property values.
|
||||||
|
*/
|
||||||
fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, block: () -> Unit): T = assertFailsWith(exceptionClass, null, block)
|
fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, block: () -> Unit): T = assertFailsWith(exceptionClass, null, block)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,5 +17,8 @@ expect fun todo(block: () -> Unit)
|
|||||||
* Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown.
|
* Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown.
|
||||||
*
|
*
|
||||||
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
||||||
|
*
|
||||||
|
* @return An exception of the expected exception type [T] that successfully caught.
|
||||||
|
* The returned exception can be inspected further, for example by asserting its property values.
|
||||||
*/
|
*/
|
||||||
expect fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T
|
expect fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T
|
||||||
|
|||||||
@@ -21,6 +21,9 @@ actual fun todo(block: () -> Unit) {
|
|||||||
* Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown.
|
* Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown.
|
||||||
*
|
*
|
||||||
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
||||||
|
*
|
||||||
|
* @return An exception of the expected exception type [T] that successfully caught.
|
||||||
|
* The returned exception can be inspected further, for example by asserting its property values.
|
||||||
*/
|
*/
|
||||||
actual fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T {
|
actual fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T {
|
||||||
val exception = assertFails(message, block)
|
val exception = assertFails(message, block)
|
||||||
|
|||||||
@@ -36,6 +36,9 @@ private fun <T : Throwable> assertFailsWithImpl(exceptionClass: Class<T>, messag
|
|||||||
* Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown.
|
* Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown.
|
||||||
*
|
*
|
||||||
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
* If the assertion fails, the specified [message] is used unless it is null as a prefix for the failure message.
|
||||||
|
*
|
||||||
|
* @return An exception of the expected exception type [T] that successfully caught.
|
||||||
|
* The returned exception can be inspected further, for example by asserting its property values.
|
||||||
*/
|
*/
|
||||||
actual fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T =
|
actual fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T =
|
||||||
assertFailsWithImpl(exceptionClass.java, message, block)
|
assertFailsWithImpl(exceptionClass.java, message, block)
|
||||||
|
|||||||
Reference in New Issue
Block a user