From 485ca10b840427c14a019e40d8ae909fd6ff3d33 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 12 Oct 2017 06:39:31 +0300
Subject: [PATCH] Improve failed assertSame/NotSame messages, correct tests

---
 .../common/src/main/kotlin/kotlin/test/Assertions.kt        | 4 ++--
 .../test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt
index 1491330ed07..8f159d992ab 100644
--- a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt
+++ b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt
@@ -191,7 +191,7 @@ interface Asserter {
      * @param message the message to report if the assertion fails.
      */
     fun assertSame(message: String?, expected: Any?, actual: Any?): Unit {
-        assertTrue({ messagePrefix(message) + "Expected <$expected>, actual <$actual>." }, actual === expected)
+        assertTrue({ messagePrefix(message) + "Expected <$expected>, actual <$actual> is not same." }, actual === expected)
     }
 
     /**
@@ -200,7 +200,7 @@ interface Asserter {
      * @param message the message to report if the assertion fails.
      */
     fun assertNotSame(message: String?, illegal: Any?, actual: Any?): Unit {
-        assertTrue({ messagePrefix(message) + "Illegal value: <$actual>." }, actual !== illegal)
+        assertTrue({ messagePrefix(message) + "Expected not same as <$actual>." }, actual !== illegal)
     }
 
     /**
diff --git a/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt
index 1f4b7241350..1199e1c2b82 100644
--- a/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt
+++ b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt
@@ -77,7 +77,7 @@ class BasicAssertionsTest {
     fun testAssertSameFails() {
         val instance1: Any = object {}
         val instance2: Any = object {}
-        checkFailedAssertion { assertEquals(instance1, instance2) }
+        checkFailedAssertion { assertSame(instance1, instance2) }
     }
 
     @Test
@@ -124,7 +124,7 @@ class BasicAssertionsTest {
     fun testAssertNotSame() {
         val instance1: Any = object {}
         val instance2: Any = object {}
-        assertNotEquals(instance1, instance2)
+        assertNotSame(instance1, instance2)
     }
 
     @Test()
@@ -135,7 +135,7 @@ class BasicAssertionsTest {
     @Test
     fun testAssertNotSameFails() {
         val instance: Any = object {}
-        checkFailedAssertion { assertNotEquals(instance, instance) }
+        checkFailedAssertion { assertNotSame(instance, instance) }
     }
 
     @Test