From 0b74698c1615857ef925c2f952f8e83f52787c0f Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 17 Oct 2015 13:38:28 +0300
Subject: [PATCH] @OnlyInputTypes for assertEquals and expect

---
 libraries/stdlib/src/kotlin/test/Test.kt  | 8 ++++----
 libraries/stdlib/test/test/TestJVMTest.kt | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/test/Test.kt b/libraries/stdlib/src/kotlin/test/Test.kt
index 4ed3bdbeefd..864f1165632 100644
--- a/libraries/stdlib/src/kotlin/test/Test.kt
+++ b/libraries/stdlib/src/kotlin/test/Test.kt
@@ -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]. */
-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)
 }
 
 /** 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)
 }
 
@@ -65,12 +65,12 @@ public fun fail(message: String? = null) {
 }
 
 /** 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())
 }
 
 /** 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)
 }
 
diff --git a/libraries/stdlib/test/test/TestJVMTest.kt b/libraries/stdlib/test/test/TestJVMTest.kt
index 3e878cfe84c..db6a583dea4 100644
--- a/libraries/stdlib/test/test/TestJVMTest.kt
+++ b/libraries/stdlib/test/test/TestJVMTest.kt
@@ -32,14 +32,14 @@ class TestJVMTest {
             assertTrue { msg.contains(expected.toString()) }
             assertTrue { msg.contains(actual.toString()) }
             assertFalse { msg.startsWith(".") }
-        }, { assertEquals(expected, actual) })
+        }, { assertEquals<Any>(expected, actual) })
 
         expectAssertion( { msg ->
             assertNotNull(msg); msg!!
             assertTrue { msg.contains(message) }
             assertTrue { msg.contains(expected.toString()) }
             assertTrue { msg.contains(actual.toString()) }
-        } , { assertEquals(expected, actual, message) })
+        } , { assertEquals<Any>(expected, actual, message) })
     }
 
     @Test