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

JS backend: added entrySet to HashMap implementations and fixed iteration over maps.

Browse Source
This commit is contained in:
Zalim Bashorov
2014-06-17 15:51:22 +04:00
parent 516af6c908
commit a2584dc6d7
2 changed files with 108 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/js/MapJsTest.kt
+53 -5
View File
@@ -6,12 +6,14 @@ import java.util.*
import org.junit.Test as test
class ComplexMapJsTest : MapJsTest() {
override fun <T : kotlin.Comparable<T>> Collection<T>.toNormalizedList(): List<T> = this.toSortedList()
// hashMapOf returns ComlpexHashMap because it is Generic
override fun emptyMutableMap(): MutableMap<String, Int> = hashMapOf<String, Int>()
override fun emptyMutableMap(): MutableMap<String, Int> = hashMapOf()
}
class PrimitiveMapJsTest : MapJsTest() {
override fun emptyMutableMap(): MutableMap<String, Int> = HashMap<String, Int>()
override fun <T : kotlin.Comparable<T>> Collection<T>.toNormalizedList(): List<T> = this.toSortedList()
override fun emptyMutableMap(): MutableMap<String, Int> = HashMap()
}
abstract class MapJsTest {
@@ -102,12 +104,26 @@ abstract class MapJsTest {
test fun mapValues() {
val map = createTestMap()
assertEquals(VALUES, map.values().toSortedList())
assertEquals(VALUES.toNormalizedList(), map.values().toNormalizedList())
}
test fun mapKeySet() {
val map = createTestMap()
assertEquals(KEYS.toSortedList(), map.keySet().toSortedList())
assertEquals(KEYS.toNormalizedList(), map.keySet().toNormalizedList())
}
test fun mapEntrySet() {
val map = createTestMap()
val actualKeys = ArrayList<String>()
val actualValues = ArrayList<Int>()
for (e in map.entrySet()) {
actualKeys.add(e.getKey())
actualValues.add(e.getValue())
}
assertEquals(KEYS.toNormalizedList(), actualKeys.toNormalizedList())
assertEquals(VALUES.toNormalizedList(), actualValues.toNormalizedList())
}
test fun mapContainsKey() {
@@ -196,6 +212,35 @@ abstract class MapJsTest {
assertEquals(2, map.get("b"))
}
test fun mapIteratorImplicitly() {
val map = createTestMap()
val actualKeys = ArrayList<String>()
val actualValues = ArrayList<Int>()
for (e in map) {
actualKeys.add(e.getKey())
actualValues.add(e.getValue())
}
assertEquals(KEYS.toNormalizedList(), actualKeys.toNormalizedList())
assertEquals(VALUES.toNormalizedList(), actualValues.toNormalizedList())
}
test fun mapIteratorExplicitly() {
val map = createTestMap()
val actualKeys = ArrayList<String>()
val actualValues = ArrayList<Int>()
val iterator = map.iterator()
for (e in iterator) {
actualKeys.add(e.getKey())
actualValues.add(e.getValue())
}
assertEquals(KEYS.toNormalizedList(), actualKeys.toNormalizedList())
assertEquals(VALUES.toNormalizedList(), actualValues.toNormalizedList())
}
/*
test fun createLinkedMap() {
val map = linkedMapOf("c" to 3, "b" to 2, "a" to 1)
@@ -312,7 +357,10 @@ abstract class MapJsTest {
// Helpers
fun emptyMap(): Map<String, Int> = HashMap<String, Int>()
abstract fun <T : kotlin.Comparable<T>> Collection<T>.toNormalizedList(): List<T>
fun emptyMap(): Map<String, Int> = emptyMutableMap()
abstract fun emptyMutableMap(): MutableMap<String, Int>
fun createTestMap(): Map<String, Int> = createTestMutableMap()