diff --git a/libraries/stdlib/test/PreconditionsTest.kt b/libraries/stdlib/test/PreconditionsTest.kt index a62746d4963..4af505558ca 100644 --- a/libraries/stdlib/test/PreconditionsTest.kt +++ b/libraries/stdlib/test/PreconditionsTest.kt @@ -17,14 +17,14 @@ class PreconditionsTest() { val error = assertFailsWith(IllegalArgumentException::class) { require(false) } - assertNotNull(error.getMessage()) + assertNotNull(error.message) } @test fun failingRequireWithLazyMessage() { val error = assertFailsWith(IllegalArgumentException::class) { require(false) { "Hello" } } - assertEquals("Hello", error.getMessage()) + assertEquals("Hello", error.message) } @test fun passingCheck() { @@ -39,14 +39,14 @@ class PreconditionsTest() { val error = assertFailsWith(IllegalStateException::class) { check(false) } - assertNotNull(error.getMessage()) + assertNotNull(error.message) } @test fun failingCheckWithLazyMessage() { val error = assertFailsWith(IllegalStateException::class) { check(false) { "Hello" } } - assertEquals("Hello", error.getMessage()) + assertEquals("Hello", error.message) } @test fun requireNotNull() { @@ -67,7 +67,7 @@ class PreconditionsTest() { val obj: Any? = null requireNotNull(obj) { "Message" } } - assertEquals("Message", error.getMessage()) + assertEquals("Message", error.message) var lazyCalled: Boolean = false requireNotNull("not null") { @@ -104,7 +104,7 @@ class PreconditionsTest() { assert(false) } if (error is AssertionError) { - assertEquals("Assertion failed", error.getMessage()) + assertEquals("Assertion failed", error.message) } else { fail("Invalid exception type: " + error) } @@ -115,7 +115,7 @@ class PreconditionsTest() { error("There was a problem") } if (error is IllegalStateException) { - assertEquals("There was a problem", error.getMessage()) + assertEquals("There was a problem", error.message) } else { fail("Invalid exception type: " + error) } @@ -130,7 +130,7 @@ class PreconditionsTest() { assert(false) { "Hello" } } if (error is AssertionError) { - assertEquals("Hello", error.getMessage()) + assertEquals("Hello", error.message) } else { fail("Invalid exception type: " + error) } @@ -141,7 +141,7 @@ class PreconditionsTest() { assert(false) { "Hello" } } if (error is AssertionError) { - assertEquals("Hello", error.getMessage()) + assertEquals("Hello", error.message) } else { fail("Invalid exception type: " + error) } diff --git a/libraries/stdlib/test/io/Files.kt b/libraries/stdlib/test/io/Files.kt index 909fa730285..694d2c0d959 100644 --- a/libraries/stdlib/test/io/Files.kt +++ b/libraries/stdlib/test/io/Files.kt @@ -733,7 +733,7 @@ class FilesTest { srcFile.copyTo(dstFile) assert(false) } catch (e: FileAlreadyExistsException) { - println(e.getMessage()) + println(e.message) } var len = srcFile.copyTo(dstFile, overwrite = true) diff --git a/libraries/stdlib/test/test/TestJVMTest.kt b/libraries/stdlib/test/test/TestJVMTest.kt index db6a583dea4..ce3678e1da7 100644 --- a/libraries/stdlib/test/test/TestJVMTest.kt +++ b/libraries/stdlib/test/test/TestJVMTest.kt @@ -11,7 +11,7 @@ class TestJVMTest { block() } catch (e: AssertionError) { - checkAssertion(e.getMessage()) + checkAssertion(e.message) return } fail("Expected AssertionError to be thrown.") diff --git a/libraries/stdlib/test/utils/TODOTest.kt b/libraries/stdlib/test/utils/TODOTest.kt index 7aea131a54d..904452c9251 100644 --- a/libraries/stdlib/test/utils/TODOTest.kt +++ b/libraries/stdlib/test/utils/TODOTest.kt @@ -33,7 +33,7 @@ class TODOTest { private fun assertNotImplementedWithMessage(message: String, block: () -> Unit) { val e = assertFails(block) assertTrue(e is NotImplementedError) - assertTrue(message in e!!.getMessage()!!) + assertTrue(message in e!!.message!!) }