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

MapTest: Uncomment cases that pass now, add more cases.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-11-29 06:31:02 +03:00
parent 459c5fed8c
commit eaf64fb225
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jre8/test/collections/MapTest.kt
+32 -19
View File
@@ -69,43 +69,56 @@ class MapTest {
} }
@Test fun computeIfAbsent() { @Test fun computeIfAbsent() {
val map = mutableMapOf(2 to "x", 3 to null) val map = mutableMapOf(2 to "x")
assertEquals("x", map.computeIfAbsent(2) { it.toString() }) assertEquals("x", map.computeIfAbsent(2) { it.toString() })
assertEquals("3", map.computeIfAbsent(3) { it.toString() }) assertEquals("3", map.computeIfAbsent(3) { it.toString() })
assertEquals(null, map.computeIfAbsent(0) { null }) // prohibited: map.computeIfAbsent(0) { null }
val map2 = mutableMapOf(2 to "x", 3 to null)
assertEquals("x", map2.computeIfAbsent(2) { it.toString() })
assertEquals("3", map2.computeIfAbsent(3) { it.toString() })
assertEquals(null, map2.computeIfAbsent(0) { null })
assertFalse(0 in map2)
} }
@Test fun computeIfPresent() { @Test fun computeIfPresent() {
val map = mutableMapOf(2 to "x") val map = mutableMapOf(2 to "x")
assertEquals("2x", map.computeIfPresent(2) { k, v -> k.toString() + v }) assertEquals("2x", map.computeIfPresent(2) { k, v -> k.toString() + v })
assertEquals(null, map.computeIfPresent(3) { k, v -> k.toString() + v }) assertEquals(null, map.computeIfPresent(3) { k, v -> k.toString() + v })
// fails due to KT-12144 assertEquals(null, map.computeIfPresent(2) { k, v -> null })
// assertEquals(null, map.computeIfPresent(2) { k, v -> null }) assertFalse(2 in map)
// assertFalse(2 in map)
val map2 = mutableMapOf<Int, String?>(2 to "x")
assertEquals("2x", map2.computeIfPresent(2) { k, v -> k.toString() + v })
assertEquals(null, map2.computeIfPresent(3) { k, v -> k.toString() + v })
assertEquals(null, map2.computeIfPresent(2) { k, v -> null })
assertFalse(2 in map2)
} }
@Test fun compute() { @Test fun compute() {
val map = mutableMapOf(2 to "x") val map = mutableMapOf(2 to "x")
assertEquals("2x", map.compute(2) { k, v -> k.toString() + v }) assertEquals("2x", map.compute(2) { k, v -> k.toString() + v })
// fails due to KT-12144 assertEquals(null, map.compute(2) { k, v -> null })
// assertEquals(null, map.compute(2) { k, v -> null }) assertFalse { 2 in map }
// assertFalse { 2 in map }
assertEquals("1null", map.compute(1) { k, v -> k.toString() + v }) assertEquals("1null", map.compute(1) { k, v -> k.toString() + v })
} }
@Test fun merge() { @Test fun merge() {
val map = mutableMapOf(2 to "x") val map = mutableMapOf(2 to "x")
// fails due to KT-12144 assertEquals("y", map.merge(3, "y") { old, new -> null })
// assertEquals("y", map.merge(3, "y") { old, new -> null }) assertEquals(null, map.merge(3, "z") { old, new ->
// assertEquals(null, map.merge(3, "z") { old, new -> assertEquals("y", old)
// assertEquals("y", old) assertEquals("z", new)
// assertEquals("z", new) null
// null })
// }) assertFalse(3 in map)
// assertFalse(3 in map)
val map2 = mutableMapOf<Int, Any?>(1 to null) // fails due to KT-12144
// new value must be V!! val map2 = mutableMapOf<Int, String?>(1 to null)
assertFails { map2.merge(1, null) { k, v -> 2 } } // new value must be V&Any
assertEquals("e", map2.merge(1, "e") { old, new -> (old.length + new.length).toString() ?: null })
assertEquals("3", map2.merge(1, "fg") { old, new -> (old.length + new.length).toString() ?: null })
assertEquals(null, map2.merge(1, "3") { old, new -> null })
assertFalse(1 in map)
} }
} }