Deprecated with ERROR preconditions with eager message.

This commit is contained in:
Ilya Gorbunov
2015-11-07 16:25:36 +03:00
parent 07c570f35d
commit 3639afafce
11 changed files with 40 additions and 62 deletions
@@ -20,7 +20,7 @@ public fun assert(value: Boolean) {
* Throws an [AssertionError] with an optional [message] if the [value] is false
* and runtime assertions have been enabled on the JVM using the *-ea* JVM option.
*/
@Deprecated("Use assert with lazy message instead.", ReplaceWith("assert(value) { message }"))
@Deprecated("Use assert with lazy message instead.", ReplaceWith("assert(value) { message }"), DeprecationLevel.ERROR)
public fun assert(value: Boolean, message: Any = "Assertion failed") {
@Suppress("DEPRECATION")
if (ASSERTIONS_ENABLED) {
@@ -16,7 +16,7 @@ public fun require(value: Boolean): Unit = require(value) { "Failed requirement"
*
* @sample test.collections.PreconditionsTest.failingRequireWithMessage
*/
@Deprecated("Use require with lazy message instead.", ReplaceWith("require(value) { message }"))
@Deprecated("Use require with lazy message instead.", ReplaceWith("require(value) { message }"), DeprecationLevel.ERROR)
public fun require(value: Boolean, message: Any = "Failed requirement"): Unit {
if (!value) {
throw IllegalArgumentException(message.toString())
@@ -46,7 +46,7 @@ public fun <T:Any> requireNotNull(value: T?): T = requireNotNull(value) { "Requi
*
* @sample test.collections.PreconditionsTest.requireNotNull
*/
@Deprecated("Use requireNotNull with lazy message instead.", ReplaceWith("requireNotNull(value) { message }"))
@Deprecated("Use requireNotNull with lazy message instead.", ReplaceWith("requireNotNull(value) { message }"), DeprecationLevel.ERROR)
public fun <T:Any> requireNotNull(value: T?, message: Any = "Required value was null"): T {
if (value == null) {
throw IllegalArgumentException(message.toString())
@@ -80,7 +80,7 @@ public fun check(value: Boolean): Unit = check(value) { "Check failed" }
*
* @sample test.collections.PreconditionsTest.failingCheckWithMessage
*/
@Deprecated("Use check with lazy message instead.", ReplaceWith("check(value) { message }"))
@Deprecated("Use check with lazy message instead.", ReplaceWith("check(value) { message }"), DeprecationLevel.ERROR)
public fun check(value: Boolean, message: Any = "Check failed"): Unit {
if (!value) {
throw IllegalStateException(message.toString())
@@ -111,7 +111,7 @@ public fun <T:Any> checkNotNull(value: T?): T = checkNotNull(value) { "Required
*
* @sample test.collections.PreconditionsTest.checkNotNull
*/
@Deprecated("Use checkNotNull with lazy message instead.", ReplaceWith("checkNotNull(value) { message }"))
@Deprecated("Use checkNotNull with lazy message instead.", ReplaceWith("checkNotNull(value) { message }"), DeprecationLevel.ERROR)
public fun <T:Any> checkNotNull(value: T?, message: Any = "Required value was null"): T {
if (value == null) {
throw IllegalStateException(message.toString())
+2 -24
View File
@@ -20,17 +20,6 @@ class PreconditionsTest() {
assertNotNull(error.getMessage())
}
@test fun passingRequireWithMessage() {
require(true, "Hello")
}
@test fun failingRequireWithMessage() {
val error = assertFailsWith(IllegalArgumentException::class) {
require(false, "Hello")
}
assertEquals("Hello", error.getMessage())
}
@test fun failingRequireWithLazyMessage() {
val error = assertFailsWith(IllegalArgumentException::class) {
require(false) { "Hello" }
@@ -53,17 +42,6 @@ class PreconditionsTest() {
assertNotNull(error.getMessage())
}
@test fun passingCheckWithMessage() {
check(true, "Hello")
}
@test fun failingCheckWithMessage() {
val error = assertFailsWith(IllegalStateException::class) {
check(false, "Hello")
}
assertEquals("Hello", error.getMessage())
}
@test fun failingCheckWithLazyMessage() {
val error = assertFailsWith(IllegalStateException::class) {
check(false) { "Hello" }
@@ -144,12 +122,12 @@ class PreconditionsTest() {
}
@test fun passingAssertWithMessage() {
assert(true, "Hello")
assert(true) { "Hello" }
}
@test fun failingAssertWithMessage() {
val error = assertFails {
assert(false, "Hello")
assert(false) { "Hello" }
}
if (error is AssertionError) {
assertEquals("Hello", error.getMessage())