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

StdLib cleanup, deprecated symbol usage: size() and length()

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-11-14 05:56:57 +03:00
parent 21e2e68ed4
commit 07654eb82b
59 changed files with 730 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/js/JsArrayScript.kt
+1 -1
View File
@@ -6,7 +6,7 @@ fun testSize(): Int {
val a2 = arrayOf("foo")
val a3 = arrayOf("foo", "bar")
return a1.size() + a2.size() + a3.size()
return a1.size + a2.size + a3.size
}
fun testToListToString(): String {
libraries/stdlib/test/js/JsArrayTest.kt
+4 -4
View File
@@ -11,9 +11,9 @@ class JsArrayTest {
val a2 = arrayOf("foo")
val a3 = arrayOf("foo", "bar")
assertEquals(0, a1.size())
assertEquals(1, a2.size())
assertEquals(2, a3.size())
assertEquals(0, a1.size)
assertEquals(1, a2.size)
assertEquals(2, a3.size)
assertEquals("[]", a1.toList().toString())
assertEquals("[foo]", a2.toList().toString())
@@ -25,7 +25,7 @@ class JsArrayTest {
var c: Collection<String> = arrayOf("A", "B", "C").toList()
var a = ArrayList(c)
assertEquals(3, a.size())
assertEquals(3, a.size)
assertEquals("A", a[0])
assertEquals("B", a[1])
assertEquals("C", a[2])
libraries/stdlib/test/js/MapJsTest.kt
+14 -14
View File
@@ -85,7 +85,7 @@ abstract class MapJsTest {
val b = data.getOrElse("foo"){3}
assertEquals(3, b)
assertEquals(0, data.size())
assertEquals(0, data.size)
}
@test fun getOrPut() {
@@ -96,7 +96,7 @@ abstract class MapJsTest {
val b = data.getOrPut("foo"){3}
assertEquals(2, b)
assertEquals(1, data.size())
assertEquals(1, data.size)
}
@test fun emptyMapGet() {
@@ -137,8 +137,8 @@ abstract class MapJsTest {
assertTrue(data.isEmpty())
assertTrue(data.none())
assertEquals(0, data.size())
assertEquals(0, data.size())
assertEquals(0, data.size)
assertEquals(0, data.size)
}
@test fun sizeAndEmpty() {
@@ -147,7 +147,7 @@ abstract class MapJsTest {
assertFalse(data.isEmpty())
assertFalse(data.none())
assertEquals(KEYS.size(), data.size())
assertEquals(KEYS.size, data.size)
}
// #KT-3035
@@ -208,16 +208,16 @@ abstract class MapJsTest {
val map = createTestMap()
val newMap = emptyMutableMap()
newMap.putAll(map)
assertEquals(KEYS.size(), newMap.size())
assertEquals(KEYS.size, newMap.size)
}
@test fun mapRemove() {
val map = createTestMutableMap()
val last = KEYS.size() - 1
val last = KEYS.size - 1
val first = 0
val mid = KEYS.size() / 2
val mid = KEYS.size / 2
assertEquals(KEYS.size(), map.size())
assertEquals(KEYS.size, map.size)
assertEquals(null, map.remove("foo"))
assertEquals(VALUES[mid], map.remove(KEYS[mid]))
@@ -225,7 +225,7 @@ abstract class MapJsTest {
assertEquals(VALUES[last], map.remove(KEYS[last]))
assertEquals(VALUES[first], map.remove(KEYS[first]))
assertEquals(KEYS.size() - 3, map.size())
assertEquals(KEYS.size - 3, map.size)
}
@test fun mapClear() {
@@ -264,25 +264,25 @@ abstract class MapJsTest {
@test fun setViaIndexOperators() {
val map = HashMap<String, String>()
assertTrue{ map.isEmpty() }
assertEquals(map.size(), 0)
assertEquals(map.size, 0)
map["name"] = "James"
assertTrue{ !map.isEmpty() }
assertEquals(map.size(), 1)
assertEquals(map.size, 1)
assertEquals("James", map["name"])
}
@test fun createUsingPairs() {
val map = mapOf(Pair("a", 1), Pair("b", 2))
assertEquals(2, map.size())
assertEquals(2, map.size)
assertEquals(1, map.get("a"))
assertEquals(2, map.get("b"))
}
@test fun createUsingTo() {
val map = mapOf("a" to 1, "b" to 2)
assertEquals(2, map.size())
assertEquals(2, map.size)
assertEquals(1, map.get("a"))
assertEquals(2, map.get("b"))
}
libraries/stdlib/test/js/SetJsTest.kt
+12 -12
View File
@@ -80,8 +80,8 @@ abstract class SetJsTest {
@Test
fun size() {
assertEquals(2, data.size())
assertEquals(0, empty.size())
assertEquals(2, data.size)
assertEquals(0, empty.size)
}
@Test
@@ -132,9 +132,9 @@ abstract class SetJsTest {
fun add() {
val data = createTestMutableSet()
assertTrue(data.add("baz"))
assertEquals(3, data.size())
assertEquals(3, data.size)
assertFalse(data.add("baz"))
assertEquals(3, data.size())
assertEquals(3, data.size)
assertTrue(data.containsAll(arrayListOf("foo", "bar", "baz")))
}
@@ -142,9 +142,9 @@ abstract class SetJsTest {
fun remove() {
val data = createTestMutableSet()
assertTrue(data.remove("foo"))
assertEquals(1, data.size())
assertEquals(1, data.size)
assertFalse(data.remove("foo"))
assertEquals(1, data.size())
assertEquals(1, data.size)
assertTrue(data.contains("bar"))
}
@@ -152,9 +152,9 @@ abstract class SetJsTest {
fun addAll() {
val data = createTestMutableSet()
assertTrue(data.addAll(arrayListOf("foo", "bar", "baz", "boo")))
assertEquals(4, data.size())
assertEquals(4, data.size)
assertFalse(data.addAll(arrayListOf("foo", "bar", "baz", "boo")))
assertEquals(4, data.size())
assertEquals(4, data.size)
assertTrue(data.containsAll(arrayListOf("foo", "bar", "baz", "boo")))
}
@@ -163,12 +163,12 @@ abstract class SetJsTest {
val data = createTestMutableSet()
assertFalse(data.removeAll(arrayListOf("baz")))
assertTrue(data.containsAll(arrayListOf("foo", "bar")))
assertEquals(2, data.size())
assertEquals(2, data.size)
assertTrue(data.removeAll(arrayListOf("foo")))
assertTrue(data.contains("bar"))
assertEquals(1, data.size())
assertEquals(1, data.size)
assertTrue(data.removeAll(arrayListOf("foo", "bar")))
assertEquals(0, data.size())
assertEquals(0, data.size)
val data2 = createTestMutableSet()
assertFalse(data.removeAll(arrayListOf("foo", "bar", "baz")))
@@ -184,7 +184,7 @@ abstract class SetJsTest {
val data2 = createTestMutableSet()
assertTrue(data2.retainAll(arrayListOf("foo")))
assertTrue(data2.contains("foo"))
assertEquals(1, data2.size())
assertEquals(1, data2.size)
}
@Test