[Wasm] Remove unnecessary testHelpers and add assertions from stdlib

This commit is contained in:
Igor Laevsky
2021-10-08 19:48:40 +03:00
committed by TeamCityServer
parent e331a52e75
commit cb5bef1535
10 changed files with 33 additions and 43 deletions
@@ -0,0 +1,27 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package kotlin
// TODO: Make this dependant on the compiler flag (like -ea on JVM)
/**
* Throws an [AssertionError] if the [value] is false.
*/
@kotlin.internal.InlineOnly
public inline fun assert(value: Boolean) {
assert(value) { "Assertion failed" }
}
/**
* Throws an [AssertionError] calculated by [lazyMessage] if the [value] is false.
*/
@kotlin.internal.InlineOnly
public inline fun assert(value: Boolean, lazyMessage: () -> Any) {
if (!value) {
val message = lazyMessage()
throw AssertionError(message)
}
}
+1 -16
View File
@@ -8,20 +8,7 @@ package kotlin.test
import kotlin.internal.InlineOnly
import kotlin.internal.OnlyInputTypes
public fun assert(x: Boolean) {
if (!x) throw AssertionError("Assertion failed")
}
/** Asserts that the [expected] value is equal to the [actual] value, with an optional [message]. */
public fun <@OnlyInputTypes T> assertEquals(expected: T, actual: T, message: String? = null) {
if (expected != actual) throw AssertionError("assertEquals failed: expected:$expected, actual:$actual, message=$message")
}
/** Asserts that the [actual] value is not equal to the illegal value, with an optional [message]. */
public fun <@OnlyInputTypes T> assertNotEquals(illegal: T, actual: T, message: String? = null) {
if (illegal == actual) throw AssertionError("assertNotEquals failed: illegal:$illegal, actual:$actual, message=$message")
}
// TODO: Remove this once we support CLASS_REFERENCE IR node
@InlineOnly
public inline fun <reified T : Throwable> assertFailsWith(message: String? = null, block: () -> Unit): T {
var throwable: Throwable? = null
@@ -32,5 +19,3 @@ public inline fun <reified T : Throwable> assertFailsWith(message: String? = nul
}
return throwable as? T ?: throw AssertionError("assertFailsWith failed: $message")
}
public fun assertTrue(x: Boolean) = assert(x)
@@ -1,17 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package kotlin
import kotlin.internal.OnlyInputTypes
public fun assert(x: Boolean) {
if (!x) throw AssertionError("Assertion failed")
}
/** Asserts that the [expected] value is equal to the [actual] value, with an optional [message]. */
public fun <@OnlyInputTypes T> assertEquals(expected: T, actual: T, message: String? = null) {
if (expected != actual) throw AssertionError("assertEquals failed: expected:$expected, actual:$actual, message=$message")
}