Improve failed assertSame/NotSame messages, correct tests

JetBrains · Oct 13, 2017 · 485ca10 · 485ca10
1 parent e611b9a
commit 485ca10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -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