azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: use effects introduced by contracts of assert* functions

Browse Source
This commit is contained in:
Ilya Gorbunov
2019-12-27 23:16:40 +03:00
parent 04fe0dc795
commit 043eddb432
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kotlin.test/jvm/src/test/kotlin/TestJVMTest.kt
+4 -4
View File
@@ -30,14 +30,14 @@ class TestJVMTest {
@Test @Test
fun assertEqualsMessage() { fun assertEqualsMessage() {
expectAssertion({ msg -> expectAssertion({ msg ->
assertNotNull(msg); msg!! assertNotNull(msg)
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<Any>(expected, actual) }) }, { assertEquals<Any>(expected, actual) })
expectAssertion({ msg -> expectAssertion({ msg ->
assertNotNull(msg); msg!! assertNotNull(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()) }
@@ -47,13 +47,13 @@ class TestJVMTest {
@Test @Test
fun assertNotEqualsMessage() { fun assertNotEqualsMessage() {
expectAssertion({ msg -> expectAssertion({ msg ->
assertNotNull(msg); msg!! assertNotNull(msg)
assertTrue { msg.contains(actual.toString()) } assertTrue { msg.contains(actual.toString()) }
assertFalse { msg.startsWith(".") } assertFalse { msg.startsWith(".") }
}, { assertNotEquals(actual, actual) }) }, { assertNotEquals(actual, actual) })
expectAssertion({ msg -> expectAssertion({ msg ->
assertNotNull(msg); msg!! assertNotNull(msg)
assertTrue { msg.contains(message) } assertTrue { msg.contains(message) }
assertTrue { msg.contains(actual.toString()) } assertTrue { msg.contains(actual.toString()) }
}, { assertNotEquals(actual, actual, message) }) }, { assertNotEquals(actual, actual, message) })
libraries/stdlib/test/text/RegexTest.kt
+1 -1
View File
@@ -32,7 +32,7 @@ class RegexTest {
assertTrue(p in input) assertTrue(p in input)
val first = p.find(input) val first = p.find(input)
assertTrue(first != null); first!! assertNotNull(first)
assertEquals("123", first.value) assertEquals("123", first.value)
val second1 = first.next()!! val second1 = first.next()!!