kotlin-test: Make assertFailsWith<reified T: Throwable>() common

libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt

@@ -114,13 +114,7 @@ fun assertFails(message: String?, block: () -> Unit): Throwable {
  *  Since inline method doesn't allow to trace where it was invoked, it is required to pass a [message] to distinguish this method call from others.
  */
 @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)
-    val exception = assertFails(message, block)
-    val messagePrefix = if (message == null) "" else "$message. "
-
-    assertTrue(exception is T, "${messagePrefix}An exception thrown is not of the expected type: $exception")
-    return exception as T
-}
 
 /** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */
 fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, block: () -> Unit): T = assertFailsWith(exceptionClass, null, block)

libraries/kotlin.test/js/src/main/kotlin/JsImpl.kt

@@ -27,18 +27,7 @@ impl fun todo(block: () -> Unit) {
     println("TODO at " + block)
 }
 
-/*
-/** Asserts that a [block] fails with a specific exception of type [T] being thrown.
- *  Since inline method doesn't allow to trace where it was invoked, it is required to pass a [message] to distinguish this method call from others.
- */
-inline fun <reified T : Throwable> assertFailsWith(message: String? = null, noinline block: () -> Unit): T {
-    val exception = assertFails(message, block)
-    val messagePrefix = if (message == null) "" else "$message. "
 
-    assertTrue(exception is T, "${messagePrefix}An exception thrown is not of the expected type: $exception")
-    return exception as T
-}
-*/
 /** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */
 impl fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T {
     val exception = assertFails(message, block)

libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt

@@ -45,13 +45,6 @@ private fun <T : Throwable> assertFailsWithImpl(exceptionClass: Class<T>, messag
 /** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */
 impl fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T = assertFailsWithImpl(exceptionClass.java, message, block)
 
-/*
-/** Asserts that a [block] fails with a specific exception of type [T] being thrown.
- *  Since inline method doesn't allow to trace where it was invoked, it is required to pass a [message] to distinguish this method call from others.
- */
-@InlineOnly
-inline fun <reified T : Throwable> assertFailsWith(message: String? = null, noinline block: () -> Unit): T = assertFailsWith(T::class, message, block)
-*/
 
 /**
  * Comments out a [block] of test code until it is implemented while keeping a link to the code