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

Rename toMap and toMapBy to associate and associateBy

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-01-20 07:11:16 +03:00
parent 45c9cc4add
commit 8224a4e186
11 changed files with 622 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/collections/MapJVMTest.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class MapJVMTest {
}
@test fun iterateAndRemove() {
val map = (1..5).toMapBy({ it }, { 'a' + it }).toLinkedMap()
val map = (1..5).associateBy({ it }, { 'a' + it }).toLinkedMap()
val iterator = map.iterator()
while (iterator.hasNext()) {
if (iterator.next().key % 2 == 0)
libraries/stdlib/test/collections/MapTest.kt
+4 -4
View File
@@ -172,7 +172,7 @@ class MapTest {
}
@test fun createWithSelector() {
val map = listOf("a", "bb", "ccc").toMapBy { it.length }
val map = listOf("a", "bb", "ccc").associateBy { it.length }
assertEquals(3, map.size)
assertEquals("a", map.get(1))
assertEquals("bb", map.get(2))
@@ -180,14 +180,14 @@ class MapTest {
}
@test fun createWithSelectorAndOverwrite() {
val map = listOf("aa", "bb", "ccc").toMapBy { it.length }
val map = listOf("aa", "bb", "ccc").associateBy { it.length }
assertEquals(2, map.size)
assertEquals("bb", map.get(2))
assertEquals("ccc", map.get(3))
}
@test fun createWithSelectorForKeyAndValue() {
val map = listOf("a", "bb", "ccc").toMapBy({ it.length }, { it.toUpperCase() })
val map = listOf("a", "bb", "ccc").associateBy({ it.length }, { it.toUpperCase() })
assertEquals(3, map.size)
assertEquals("A", map[1])
assertEquals("BB", map[2])
@@ -195,7 +195,7 @@ class MapTest {
}
@test fun createWithPairSelector() {
val map = listOf("a", "bb", "ccc").toMap { it.length to it.toUpperCase() }
val map = listOf("a", "bb", "ccc").associate { it.length to it.toUpperCase() }
assertEquals(3, map.size)
assertEquals("A", map[1])
assertEquals("BB", map[2])