@OnlyInputTypes for assertEquals and expect

This commit is contained in:
Ilya Gorbunov
2015-10-17 13:38:28 +03:00
parent 551e0181dc
commit 0b74698c16
2 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -31,12 +31,12 @@ public fun assertFalse(actual: Boolean, message: String? = null) {
} }
/** Asserts that the [expected] value is equal to the [actual] value, with an optional [message]. */ /** Asserts that the [expected] value is equal to the [actual] value, with an optional [message]. */
public fun assertEquals(expected: Any?, actual: Any?, message: String? = null) { public fun <@kotlin.internal.OnlyInputTypes T> assertEquals(expected: T, actual: T, message: String? = null) {
asserter.assertEquals(message, expected, actual) asserter.assertEquals(message, expected, actual)
} }
/** Asserts that the [actual] value is not equal to the illegal value, with an optional [message]. */ /** Asserts that the [actual] value is not equal to the illegal value, with an optional [message]. */
public fun assertNotEquals(illegal: Any?, actual: Any?, message: String? = null) { public fun <@kotlin.internal.OnlyInputTypes T> assertNotEquals(illegal: T, actual: T, message: String? = null) {
asserter.assertNotEquals(message, illegal, actual) asserter.assertNotEquals(message, illegal, actual)
} }
@@ -65,12 +65,12 @@ public fun fail(message: String? = null) {
} }
/** Asserts that given function [block] returns the given [expected] value. */ /** Asserts that given function [block] returns the given [expected] value. */
public fun <T> expect(expected: T, block: () -> T) { public fun <@kotlin.internal.OnlyInputTypes T> expect(expected: T, block: () -> T) {
assertEquals(expected, block()) assertEquals(expected, block())
} }
/** Asserts that given function [block] returns the given [expected] value and use the given [message] if it fails. */ /** Asserts that given function [block] returns the given [expected] value and use the given [message] if it fails. */
public fun <T> expect(expected: T, message: String?, block: () -> T) { public fun <@kotlin.internal.OnlyInputTypes T> expect(expected: T, message: String?, block: () -> T) {
assertEquals(expected, block(), message) assertEquals(expected, block(), message)
} }
+2 -2
View File
@@ -32,14 +32,14 @@ class TestJVMTest {
assertTrue { msg.contains(expected.toString()) } assertTrue { msg.contains(expected.toString()) }
assertTrue { msg.contains(actual.toString()) } assertTrue { msg.contains(actual.toString()) }
assertFalse { msg.startsWith(".") } assertFalse { msg.startsWith(".") }
}, { assertEquals(expected, actual) }) }, { assertEquals<Any>(expected, actual) })
expectAssertion( { msg -> expectAssertion( { msg ->
assertNotNull(msg); msg!! assertNotNull(msg); msg!!
assertTrue { msg.contains(message) } assertTrue { msg.contains(message) }
assertTrue { msg.contains(expected.toString()) } assertTrue { msg.contains(expected.toString()) }
assertTrue { msg.contains(actual.toString()) } assertTrue { msg.contains(actual.toString()) }
} , { assertEquals(expected, actual, message) }) } , { assertEquals<Any>(expected, actual, message) })
} }
@Test @Test