kotlin.test: Rename jvm module to junit

libraries/kotlin.test/shared/src/main/kotlin.jvm/kotlin/test/TestAssertionsJVM.kt

@@ -6,10 +6,12 @@ import kotlin.jvm.internal.*
 import kotlin.reflect.*
 
 @Deprecated("Use assertFailsWith instead.", ReplaceWith("assertFailsWith(exceptionClass, block)"), kotlin.DeprecationLevel.ERROR)
-fun <T : Throwable> failsWith(exceptionClass: Class<T>, block: () -> Any): T = assertFailsWith(exceptionClass, { block() })
+fun <T : Throwable> failsWith(exceptionClass: Class<T>, block: () -> Any): T = assertFailsWith(exceptionClass) { block() }
 
 /** Asserts that a [block] fails with a specific exception being thrown. */
-fun <T : Throwable> assertFailsWith(exceptionClass: Class<T>, block: () -> Unit): T = assertFailsWith(exceptionClass, null, block)
+fun <T : Throwable> assertFailsWith(exceptionClass: Class<T>, block: () -> Unit): T {
+    return assertFailsWith(exceptionClass, null, block)
+}
 
 /** Asserts that a [block] fails with a specific exception being thrown. */
 fun <T : Throwable> assertFailsWith(exceptionClass: Class<T>, message: String?, block: () -> Unit): T {
@@ -28,9 +30,12 @@ fun <T : Throwable> assertFailsWith(exceptionClass: Class<T>, message: String?,
     throw IllegalStateException(msg + "Should have failed.")
 }
 
+/** 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)
+
 /** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */
 @Suppress("DEPRECATION")
-fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String? = null, block: () -> Unit): T = assertFailsWith(exceptionClass.javaClass, message, block)
+fun <T : Throwable> assertFailsWith(exceptionClass: KClass<T>, message: String?, block: () -> Unit): T = assertFailsWith(exceptionClass.javaClass, 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.

libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt

@@ -175,13 +175,3 @@ interface AsserterContributor {
     fun contribute(): Asserter?
 }
 
-internal fun <T, R> T.let(block: (T) -> R): R = block(this)
-
-internal fun <T> Iterable<T>.firstOrNull(predicate: (T) -> Boolean): T? {
-    for (e in this) {
-        if (predicate(e)) {
-            return e
-        }
-    }
-    return null
-}

libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/Utils.kt

@@ -0,0 +1,4 @@
+package kotlin.test
+
+internal fun <T, R> T.let(block: (T) -> R): R = block(this)
+

libraries/kotlin.test/shared/src/test/kotlin.jvm/BasicAssertionsJVMTest.kt

@@ -24,6 +24,13 @@ class BasicAssertionsJVMTest {
             throw IllegalArgumentException()
         }
     }
+    @Test
+    fun testFailsWithClassMessage() {
+        @Suppress("UNCHECKED_CAST")
+        assertFailsWith(Class.forName("java.lang.IllegalArgumentException") as Class<Throwable>) {
+            throw IllegalArgumentException()
+        }
+    }
 
     @Test
     fun testToDo() {