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

Stop using deprecated APIs

Browse Source
This commit is contained in:
Ilya Ryzhenkov
2014-12-02 15:41:22 +03:00
parent 2b8ffeda28
commit be717f48f8
45 changed files with 111 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/StdLibIssuesTest.kt
+3 -3
View File
@@ -10,10 +10,10 @@ private fun listDifference<T>(first : List<T>, second : List<T>) : List<T> {
class StdLibIssuesTest {
test fun test_KT_1131() {
val data = arrayList("blah", "foo", "bar")
val filterValues = arrayList("bar", "something", "blah")
val data = arrayListOf("blah", "foo", "bar")
val filterValues = arrayListOf("bar", "something", "blah")
expect(arrayList("foo")) {
expect(arrayListOf("foo")) {
val answer = listDifference(data, filterValues)
println("Found answer ${answer}")
answer
libraries/stdlib/test/collections/MapJVMTest.kt
+1 -1
View File
@@ -33,7 +33,7 @@ class MapJVMTest {
test fun toProperties() {
val map = mapOf("a" to "A", "b" to "B")
val prop = map.toProperties()
assertEquals(2, prop.size)
assertEquals(2, prop.size())
assertEquals("A", prop.getProperty("a", "fail"))
assertEquals("B", prop.getProperty("b", "fail"))
}
libraries/stdlib/test/collections/MapTest.kt
+17 -17
View File
@@ -36,18 +36,18 @@ class MapTest {
test fun sizeAndEmpty() {
val data = hashMapOf<String, Int>()
assertTrue { data.empty }
assertEquals(data.size, 0)
assertTrue { data.none() }
assertEquals(data.size(), 0)
}
test fun setViaIndexOperators() {
val map = hashMapOf<String, String>()
assertTrue { map.empty }
assertEquals(map.size, 0)
assertTrue { map.none() }
assertEquals(map.size(), 0)
map["name"] = "James"
assertTrue { !map.empty }
assertTrue { map.any() }
assertEquals(map.size(), 1)
assertEquals("James", map["name"])
}
@@ -119,21 +119,21 @@ class MapTest {
test fun createUsingPairs() {
val map = mapOf(Pair("a", 1), Pair("b", 2))
assertEquals(2, map.size)
assertEquals(2, map.size())
assertEquals(1, map["a"])
assertEquals(2, map["b"])
}
test fun createFromIterable() {
val map = listOf(Pair("a", 1), Pair("b", 2)).toMap()
assertEquals(2, map.size)
assertEquals(2, map.size())
assertEquals(1, map.get("a"))
assertEquals(2, map.get("b"))
}
test fun createWithSelector() {
val map = listOf("a", "bb", "ccc").toMap { it.length }
assertEquals(3, map.size)
assertEquals(3, map.size())
assertEquals("a", map.get(1))
assertEquals("bb", map.get(2))
assertEquals("ccc", map.get(3))
@@ -141,14 +141,14 @@ class MapTest {
test fun createWithSelectorAndOverwrite() {
val map = listOf("aa", "bb", "ccc").toMap { it.length }
assertEquals(2, map.size)
assertEquals(2, map.size())
assertEquals("bb", map.get(2))
assertEquals("ccc", map.get(3))
}
test fun createUsingTo() {
val map = mapOf("a" to 1, "b" to 2)
assertEquals(2, map.size)
assertEquals(2, map.size())
assertEquals(1, map["a"])
assertEquals(2, map["b"])
}
@@ -164,21 +164,21 @@ class MapTest {
test fun filter() {
val map = mapOf(Pair("b", 3), Pair("c", 2), Pair("a", 2))
val filteredByKey = map.filter { it.key == "b" }
assertEquals(1, filteredByKey.size)
assertEquals(1, filteredByKey.size())
assertEquals(3, filteredByKey["b"])
val filteredByKey2 = map.filterKeys { it == "b" }
assertEquals(1, filteredByKey2.size)
assertEquals(1, filteredByKey2.size())
assertEquals(3, filteredByKey2["b"])
val filteredByValue = map.filter { it.value == 2 }
assertEquals(2, filteredByValue.size)
assertEquals(2, filteredByValue.size())
assertEquals(null, filteredByValue["b"])
assertEquals(2, filteredByValue["c"])
assertEquals(2, filteredByValue["a"])
val filteredByValue2 = map.filterValues { it == 2 }
assertEquals(2, filteredByValue2.size)
assertEquals(2, filteredByValue2.size())
assertEquals(null, filteredByValue2["b"])
assertEquals(2, filteredByValue2["c"])
assertEquals(2, filteredByValue2["a"])
@@ -187,20 +187,20 @@ class MapTest {
test fun filterNot() {
val map = mapOf(Pair("b", 3), Pair("c", 2), Pair("a", 2))
val filteredByKey = map.filterNot { it.key == "b" }
assertEquals(2, filteredByKey.size)
assertEquals(2, filteredByKey.size())
assertEquals(null, filteredByKey["b"])
assertEquals(2, filteredByKey["c"])
assertEquals(2, filteredByKey["a"])
val filteredByValue = map.filterNot { it.value == 2 }
assertEquals(1, filteredByValue.size)
assertEquals(1, filteredByValue.size())
assertEquals(3, filteredByValue["b"])
}
test fun plusAssign() {
val extended = hashMapOf(Pair("b", 3))
extended += ("c" to 2)
assertEquals(2, extended.size)
assertEquals(2, extended.size())
assertEquals(2, extended["c"])
assertEquals(3, extended["b"])
}
libraries/stdlib/test/iterators/FunctionIteratorTest.kt
+4 -4
View File
@@ -10,17 +10,17 @@ class FunctionIteratorTest {
Test fun iterateOverFunction() {
var count = 3
val iter = iterate<Int> {
val iter = stream<Int> {
count--
if (count >= 0) count else null
}
val list = iter.toList()
assertEquals(arrayList(2, 1, 0), list)
assertEquals(arrayListOf(2, 1, 0), list)
}
Test fun iterateOverFunction2() {
val values = iterate<Int>(3) { n -> if (n > 0) n - 1 else null }
assertEquals(arrayList(3, 2, 1, 0), values.toList())
val values = stream<Int>(3) { n -> if (n > 0) n - 1 else null }
assertEquals(arrayListOf(3, 2, 1, 0), values.toList())
}
}
libraries/stdlib/test/iterators/IteratorsJVMTest.kt
+2 -2
View File
@@ -11,7 +11,7 @@ class IteratorsJVMTest {
fun intToBinaryDigits() = { (i: Int) ->
val binary = Integer.toBinaryString(i)!!
var index = 0
iterate<Char> { if (index < binary.length()) binary.get(index++) else null }
stream<Char> { if (index < binary.length()) binary.get(index++) else null }
}
val expected = arrayListOf(
@@ -27,7 +27,7 @@ class IteratorsJVMTest {
}
test fun flatMapOnIterator() {
val result = listOf(1, 2).iterator().flatMap { i -> (0..i).iterator()}
val result = streamOf(1, 2).flatMap { i -> (0..i).stream()}
assertEquals(listOf(0, 1, 0, 1, 2), result.toList())
}
}
libraries/stdlib/test/iterators/IteratorsTest.kt
+29 -29
View File
@@ -5,67 +5,67 @@ import org.junit.Test as test
import kotlin.test.fails
import java.util.ArrayList
fun fibonacci(): Iterator<Int> {
fun fibonacci(): Stream<Int> {
// fibonacci terms
var index = 0; var a = 0; var b = 1
return iterate<Int> { when (index++) { 0 -> a; 1 -> b; else -> { val result = a + b; a = b; b = result; result } } }
return stream<Int> { when (index++) { 0 -> a; 1 -> b; else -> { val result = a + b; a = b; b = result; result } } }
}
class IteratorsTest {
test fun filterAndTakeWhileExtractTheElementsWithinRange() {
assertEquals(arrayList(144, 233, 377, 610, 987), fibonacci().filter { it > 100 }.takeWhile { it < 1000 }.toList())
assertEquals(arrayListOf(144, 233, 377, 610, 987), fibonacci().filter { it > 100 }.takeWhile { it < 1000 }.toList())
}
test fun foldReducesTheFirstNElements() {
val sum = { (a: Int, b: Int) -> a + b }
assertEquals(arrayList(13, 21, 34, 55, 89).fold(0, sum), fibonacci().filter { it > 10 }.take(5).fold(0, sum))
assertEquals(arrayListOf(13, 21, 34, 55, 89).fold(0, sum), fibonacci().filter { it > 10 }.take(5).fold(0, sum))
}
test fun takeExtractsTheFirstNElements() {
assertEquals(arrayList(0, 1, 1, 2, 3, 5, 8, 13, 21, 34), fibonacci().take(10).toList())
assertEquals(arrayListOf(0, 1, 1, 2, 3, 5, 8, 13, 21, 34), fibonacci().take(10).toList())
}
test fun mapAndTakeWhileExtractTheTransformedElements() {
assertEquals(arrayList(0, 3, 3, 6, 9, 15), fibonacci().map { it * 3 }.takeWhile { (i: Int) -> i < 20 }.toList())
assertEquals(arrayListOf(0, 3, 3, 6, 9, 15), fibonacci().map { it * 3 }.takeWhile { (i: Int) -> i < 20 }.toList())
}
test fun joinConcatenatesTheFirstNElementsAboveAThreshold() {
assertEquals("13, 21, 34, 55, 89, ...", fibonacci().filter { it > 10 }.makeString(separator = ", ", limit = 5))
assertEquals("13, 21, 34, 55, 89, ...", fibonacci().filter { it > 10 }.joinToString(separator = ", ", limit = 5))
}
test fun plus() {
val iter = arrayList("foo", "bar").iterator()
val iter = arrayListOf("foo", "bar").stream()
val iter2 = iter + "cheese"
assertEquals(arrayList("foo", "bar", "cheese"), iter2.toList())
assertEquals(arrayListOf("foo", "bar", "cheese"), iter2.toList())
// lets use a mutable variable
var mi : Iterator<String> = arrayList("a", "b").iterator()
var mi = streamOf("a", "b")
mi += "c"
assertEquals(arrayList("a", "b", "c"), mi.toList())
assertEquals(arrayListOf("a", "b", "c"), mi.toList())
}
test fun plusCollection() {
val a = arrayList("foo", "bar")
val b = arrayList("cheese", "wine")
val iter = a.iterator() + b.iterator()
assertEquals(arrayList("foo", "bar", "cheese", "wine"), iter.toList())
val a = arrayListOf("foo", "bar")
val b = arrayListOf("cheese", "wine")
val iter = a.stream() + b.stream()
assertEquals(arrayListOf("foo", "bar", "cheese", "wine"), iter.toList())
// lets use a mutable variable
var ml : Iterator<String> = arrayList("a").iterator()
ml += a.iterator()
var ml = arrayListOf("a").stream()
ml += a.stream()
ml += "beer"
ml += b
ml += "z"
assertEquals(arrayList("a", "foo", "bar", "beer", "cheese", "wine", "z"), ml.toList())
assertEquals(arrayListOf("a", "foo", "bar", "beer", "cheese", "wine", "z"), ml.toList())
}
test fun requireNoNulls() {
val iter = arrayList<String?>("foo", "bar").iterator()
val iter = arrayListOf<String?>("foo", "bar").stream()
val notNull = iter.requireNoNulls()
assertEquals(arrayList("foo", "bar"), notNull.toList())
assertEquals(arrayListOf("foo", "bar"), notNull.toList())
val iterWithNulls = arrayList("foo", null, "bar").iterator()
val iterWithNulls = arrayListOf("foo", null, "bar").stream()
val notNull2 = iterWithNulls.requireNoNulls()
fails {
// should throw an exception as we have a null
@@ -74,23 +74,23 @@ class IteratorsTest {
}
test fun toStringJoinsNoMoreThanTheFirstTenElements() {
assertEquals("0, 1, 1, 2, 3, 5, 8, 13, 21, 34, ...", fibonacci().makeString(limit = 10))
assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().filter { it > 10 }.makeString(limit = 10))
assertEquals("144, 233, 377, 610, 987", fibonacci().filter { it > 100 }.takeWhile { it < 1000 }.makeString())
assertEquals("0, 1, 1, 2, 3, 5, 8, 13, 21, 34, ...", fibonacci().joinToString(limit = 10))
assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().filter { it > 10 }.joinToString(limit = 10))
assertEquals("144, 233, 377, 610, 987", fibonacci().filter { it > 100 }.takeWhile { it < 1000 }.joinToString())
}
test fun pairIterator() {
val pairStr = (fibonacci() zip fibonacci().map { i -> i*2 }).makeString(limit = 10)
val pairStr = (fibonacci() zip fibonacci().map { i -> i*2 }).joinToString(limit = 10)
assertEquals("(0, 0), (1, 2), (1, 2), (2, 4), (3, 6), (5, 10), (8, 16), (13, 26), (21, 42), (34, 68), ...", pairStr)
}
test fun skippingIterator() {
assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().skip(7).makeString(limit = 10))
assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().skip(3).skip(4).makeString(limit = 10))
assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().drop(7).joinToString(limit = 10))
assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().drop(3).drop(4).joinToString(limit = 10))
}
test fun iterationOverIterator() {
val c = arrayList(0, 1, 2, 3, 4, 5)
val c = arrayListOf(0, 1, 2, 3, 4, 5)
var s = ""
for (i in c.iterator()) {
s = s + i.toString()
@@ -104,7 +104,7 @@ class IteratorsTest {
}
test fun iterableExtension() {
val c = arrayList(0, 1, 2, 3, 4, 5)
val c = arrayListOf(0, 1, 2, 3, 4, 5)
val d = ArrayList<Int>()
c.iterator().takeWhileTo(d, {i -> i < 4 })
assertEquals(4, d.size())
libraries/stdlib/test/js/MapJsTest.kt
+6 -7
View File
@@ -126,20 +126,19 @@ abstract class MapJsTest {
val data = emptyMap()
assertTrue(data.isEmpty())
assertTrue(data.empty)
assertTrue(data.none())
assertEquals(0, data.size())
assertEquals(0, data.size)
assertEquals(0, data.size())
}
test fun sizeAndEmpty() {
val data = createTestMap()
assertFalse(data.isEmpty())
assertFalse(data.empty)
assertFalse(data.none())
assertEquals(KEYS.size(), data.size())
assertEquals(KEYS.size(), data.size)
}
// #KT-3035
@@ -200,7 +199,7 @@ 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() {
@@ -271,14 +270,14 @@ abstract class MapJsTest {
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/text/StringJVMTest.kt
+1 -1
View File
@@ -217,7 +217,7 @@ class StringJVMTest {
// group characters by their case
val data = "abAbaABcD"
val result = data.groupBy { it.isLowerCase() }
assertEquals(2, result.size)
assertEquals(2, result.size())
assertEquals(listOf('a','b','b','a','c'), result.get(true))
}