Make all remaining deprecations to be errors.

This commit is contained in:
Ilya Gorbunov
2016-01-26 22:11:56 +03:00
parent 263e1b4b5d
commit d46501e11b
19 changed files with 144 additions and 193 deletions
+1 -41
View File
@@ -26,6 +26,7 @@ class MapTest {
assertEquals("x", d)
}
@Suppress("INVISIBLE_MEMBER")
@test fun getOrImplicitDefault() {
val data: MutableMap<String, Int> = hashMapOf("bar" to 1)
assertTrue(assertFails { data.getOrImplicitDefault("foo") } is NoSuchElementException)
@@ -337,43 +338,6 @@ class MapTest {
@test fun plusMap() = testPlus { it + mapOf("C" to 3, "B" to 4) }
fun testMinus(doMinus: (Map<String, Int>) -> Map<String, Int>) {
val original = mapOf("A" to 1, "B" to 2)
val shortened = doMinus(original)
assertEquals("A" to 1, shortened.entries.single().toPair())
}
@test fun minus() = testMinus { it - "B" - "C" }
@test fun minusList() = testMinus { it - listOf("B", "C") }
@test fun minusArray() = testMinus { it - arrayOf("B", "C") }
@test fun minusSequence() = testMinus { it - sequenceOf("B", "C") }
@test fun minusSet() = testMinus { it - setOf("B", "C") }
fun testMinusAssign(doMinusAssign: (MutableMap<String, Int>) -> Unit) {
val original = hashMapOf("A" to 1, "B" to 2)
doMinusAssign(original)
assertEquals("A" to 1, original.entries.single().toPair())
}
/*
@test fun minusAssign() = testMinusAssign {
it.keys -= "B"
it.keys -= "C"
}
@test fun minusAssignList() = testMinusAssign { it.keys -= listOf("B", "C") }
@test fun minusAssignArray() = testMinusAssign { it.keys -= arrayOf("B", "C") }
@test fun minusAssignSequence() = testMinusAssign { it.keys -= sequenceOf("B", "C") }
*/
fun testIdempotent(operation: (Map<String, Int>) -> Map<String, Int>) {
val original = mapOf("A" to 1, "B" to 2)
@@ -389,16 +353,12 @@ class MapTest {
@test fun plusEmptyList() = testIdempotent { it + listOf() }
// @test fun minusEmptyList() = testIdempotent { it - listOf() }
@test fun plusEmptySet() = testIdempotent { it + setOf() }
// @test fun minusEmptySet() = testIdempotent { it - setOf() }
@test fun plusAssignEmptyList() = testIdempotentAssign { it += listOf() }
// @test fun minusAssignEmptyList() = testIdempotentAssign { it -= listOf() }
@test fun plusAssignEmptySet() = testIdempotentAssign { it += setOf() }
// @test fun minusAssignEmptySet() = testIdempotentAssign { it -= setOf() }
}
@@ -9,18 +9,18 @@ class SequenceJVMTest {
val src: Sequence<Any> = listOf(1, 2, 3.toDouble(), "abc", "cde").asSequence()
val intValues: Sequence<Int> = src.filterIsInstance<Int>()
assertEquals(listOf(1, 2), intValues.toArrayList())
assertEquals(listOf(1, 2), intValues.toList())
val doubleValues: Sequence<Double> = src.filterIsInstance<Double>()
assertEquals(listOf(3.0), doubleValues.toArrayList())
assertEquals(listOf(3.0), doubleValues.toList())
val stringValues: Sequence<String> = src.filterIsInstance<String>()
assertEquals(listOf("abc", "cde"), stringValues.toArrayList())
assertEquals(listOf("abc", "cde"), stringValues.toList())
val anyValues: Sequence<Any> = src.filterIsInstance<Any>()
assertEquals(src.toList(), anyValues.toArrayList())
assertEquals(src.toList(), anyValues.toList())
val charValues: Sequence<Char> = src.filterIsInstance<Char>()
assertEquals(0, charValues.toArrayList().size)
assertEquals(0, charValues.toList().size)
}
}