StdLib cleanup: replace fails with assertFails

This commit is contained in:
Ilya Gorbunov
2015-09-29 21:14:35 +03:00
parent c39327dd74
commit 404b228954
16 changed files with 69 additions and 75 deletions
@@ -163,7 +163,7 @@ class CollectionTest {
// TODO replace with more accurate version when KT-5987 will be fixed
// failsWith(javaClass<UnsupportedOperationException>()) {
fails {
assertFails {
run { arrayListOf<Int>().reduce { a, b -> a + b } }
}
}
@@ -176,7 +176,7 @@ class CollectionTest {
// TODO replace with more accurate version when KT-5987 will be fixed
// failsWith(javaClass<UnsupportedOperationException>()) {
fails {
assertFails {
run { arrayListOf<Int>().reduceRight { a, b -> a + b } }
}
}
@@ -302,7 +302,7 @@ class CollectionTest {
// TODO replace with more accurate version when KT-5987 will be fixed
// failsWith(javaClass<IllegalArgumentException>()) {
fails {
assertFails {
// should throw an exception as we have a null
hasNulls.requireNoNulls()
}
@@ -346,7 +346,7 @@ class CollectionTest {
assertEquals(listOf("foo", "bar"), coll.dropLast(1))
assertEquals(listOf("foo"), coll.dropLast(2))
fails { coll.dropLast(-1) }
assertFails { coll.dropLast(-1) }
}
@test fun dropLastWhile() {
@@ -365,7 +365,7 @@ class CollectionTest {
assertEquals(coll, coll.take(coll.size()))
assertEquals(coll, coll.take(coll.size() + 1))
fails { coll.take(-1) }
assertFails { coll.take(-1) }
}
@test fun takeWhile() {
@@ -385,7 +385,7 @@ class CollectionTest {
assertEquals(coll, coll.takeLast(coll.size()))
assertEquals(coll, coll.takeLast(coll.size() + 1))
fails { coll.takeLast(-1) }
assertFails { coll.takeLast(-1) }
}
@test fun takeLastWhile() {
@@ -420,7 +420,7 @@ class CollectionTest {
assertEquals("foo", data.first())
assertEquals(15, listOf(15, 19, 20, 25).first())
assertEquals('a', listOf('a').first())
fails { arrayListOf<Int>().first() }
assertFails { arrayListOf<Int>().first() }
}
@test fun last() {
@@ -428,7 +428,7 @@ class CollectionTest {
assertEquals("bar", data.last())
assertEquals(25, listOf(15, 19, 20, 25).last())
assertEquals('a', listOf('a').last())
fails { arrayListOf<Int>().last() }
assertFails { arrayListOf<Int>().last() }
}
@test fun subscript() {
@@ -437,7 +437,7 @@ class CollectionTest {
assertEquals("bar", list[1])
// lists throw an exception if out of range
fails {
assertFails {
assertEquals(null, list[2])
}
@@ -446,7 +446,7 @@ class CollectionTest {
list[1] = "thing"
// lists don't allow you to set past the end of the list
fails {
assertFails {
list[2] = "works"
}