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/ExceptionTest.kt
+1 -1
View File
@@ -39,6 +39,6 @@ class ExceptionTest {
}
val bytes = assertNotNull(byteBuffer.toByteArray())
assertTrue(bytes.size() > 10)
assertTrue(bytes.size > 10)
}
}
libraries/stdlib/test/OldStdlibTest.kt
+1 -1
View File
@@ -14,7 +14,7 @@ class OldStdlibTest() {
@test fun testCollectionSize() {
assertTrue {
listOf(0, 1, 2).size() == 3
listOf(0, 1, 2).size == 3
}
}
libraries/stdlib/test/TuplesTest.kt
+2 -2
View File
@@ -41,7 +41,7 @@ class PairTest {
@test fun pairHashSet() {
val s = hashSetOf(Pair(1, "a"), Pair(1, "b"), Pair(1, "a"))
assertEquals(2, s.size())
assertEquals(2, s.size)
assertTrue(s.contains(p))
}
@@ -92,7 +92,7 @@ class TripleTest {
@test fun tripleHashSet() {
val s = hashSetOf(Triple(1, "a", 0.07), Triple(1, "b", 0.07), Triple(1, "a", 0.07))
assertEquals(2, s.size())
assertEquals(2, s.size)
assertTrue(s.contains(t))
}
libraries/stdlib/test/collections/ArraysJVMTest.kt
+3 -3
View File
@@ -10,14 +10,14 @@ class ArraysJVMTest {
val y: Array<out String>? = null
val xArray = x.orEmpty()
val yArray = y.orEmpty()
expect(0) { xArray.size() }
expect(0) { yArray.size() }
expect(0) { xArray.size }
expect(0) { yArray.size }
}
@test fun orEmptyNotNull() {
val x: Array<String>? = arrayOf("1", "2")
val xArray = x.orEmpty()
expect(2) { xArray.size() }
expect(2) { xArray.size }
expect("1") { xArray[0] }
expect("2") { xArray[1] }
}
libraries/stdlib/test/collections/ArraysTest.kt
+12 -12
View File
@@ -40,7 +40,7 @@ class ArraysTest {
val arr = ByteArray(2)
val expected: Byte = 0
assertEquals(arr.size(), 2)
assertEquals(arr.size, 2)
assertEquals(expected, arr[0])
assertEquals(expected, arr[1])
}
@@ -49,7 +49,7 @@ class ArraysTest {
val arr = ShortArray(2)
val expected: Short = 0
assertEquals(arr.size(), 2)
assertEquals(arr.size, 2)
assertEquals(expected, arr[0])
assertEquals(expected, arr[1])
}
@@ -57,7 +57,7 @@ class ArraysTest {
@test fun intArray() {
val arr = IntArray(2)
assertEquals(arr.size(), 2)
assertEquals(arr.size, 2)
assertEquals(0, arr[0])
assertEquals(0, arr[1])
}
@@ -66,7 +66,7 @@ class ArraysTest {
val arr = LongArray(2)
val expected: Long = 0
assertEquals(arr.size(), 2)
assertEquals(arr.size, 2)
assertEquals(expected, arr[0])
assertEquals(expected, arr[1])
}
@@ -75,7 +75,7 @@ class ArraysTest {
val arr = FloatArray(2)
val expected: Float = 0.0F
assertEquals(arr.size(), 2)
assertEquals(arr.size, 2)
assertEquals(expected, arr[0])
assertEquals(expected, arr[1])
}
@@ -83,7 +83,7 @@ class ArraysTest {
@test fun doubleArray() {
val arr = DoubleArray(2)
assertEquals(arr.size(), 2)
assertEquals(arr.size, 2)
assertEquals(0.0, arr[0])
assertEquals(0.0, arr[1])
}
@@ -92,14 +92,14 @@ class ArraysTest {
val arr = CharArray(2)
val expected: Char = '\u0000'
assertEquals(arr.size(), 2)
assertEquals(arr.size, 2)
assertEquals(expected, arr[0])
assertEquals(expected, arr[1])
}
@test fun booleanArray() {
val arr = BooleanArray(2)
assertEquals(arr.size(), 2)
assertEquals(arr.size, 2)
assertEquals(false, arr[0])
assertEquals(false, arr[1])
}
@@ -151,7 +151,7 @@ class ArraysTest {
expect(1, { arrayOf(1).minBy { it } })
expect(3, { arrayOf(2, 3).minBy { -it } })
expect('a', { arrayOf('a', 'b').minBy { "x$it" } })
expect("b", { arrayOf("b", "abc").minBy { it.length() } })
expect("b", { arrayOf("b", "abc").minBy { it.length } })
}
@test fun minByInPrimitiveArrays() {
@@ -170,7 +170,7 @@ class ArraysTest {
expect(1, { arrayOf(1).maxBy { it } })
expect(2, { arrayOf(2, 3).maxBy { -it } })
expect('b', { arrayOf('a', 'b').maxBy { "x$it" } })
expect("abc", { arrayOf("b", "abc").maxBy { it.length() } })
expect("abc", { arrayOf("b", "abc").maxBy { it.length } })
}
@test fun maxByInPrimitiveArrays() {
@@ -461,7 +461,7 @@ class ArraysTest {
@test fun toPrimitiveArray() {
val genericArray: Array<Int> = arrayOf(1, 2, 3)
val primitiveArray: IntArray = genericArray.toIntArray()
expect(3) { primitiveArray.size() }
expect(3) { primitiveArray.size }
assertEquals(genericArray.asList(), primitiveArray.asList())
@@ -473,7 +473,7 @@ class ArraysTest {
@test fun toTypedArray() {
val primitiveArray: LongArray = longArrayOf(1, 2, Long.MAX_VALUE)
val genericArray: Array<Long> = primitiveArray.toTypedArray()
expect(3) { genericArray.size() }
expect(3) { genericArray.size }
assertEquals(primitiveArray.asList(), genericArray.asList())
}
libraries/stdlib/test/collections/CollectionBehaviors.kt
+6 -6
View File
@@ -25,19 +25,19 @@ public fun <T> CompareContext<List<T>>.listBehavior() {
compareProperty( { listIterator(0) }, { listIteratorBehavior() })
propertyFails { listIterator(-1) }
propertyFails { listIterator(size() + 1) }
propertyFails { listIterator(size + 1) }
for (index in expected.indices)
propertyEquals { this[index] }
propertyFails { this[size()] }
propertyFails { this[size] }
propertyEquals { (this as List<T?>).indexOf(elementAtOrNull(0)) }
propertyEquals { (this as List<T?>).lastIndexOf(elementAtOrNull(0)) }
propertyFails { subList(0, size() + 1)}
propertyFails { subList(0, size + 1)}
propertyFails { subList(-1, 0)}
propertyEquals { subList(0, size()) }
propertyEquals { subList(0, size) }
}
public fun <T> CompareContext<ListIterator<T>>.listIteratorBehavior() {
@@ -81,7 +81,7 @@ public fun <T> CompareContext<Set<T>>.setBehavior(objectName: String = "") {
public fun <K, V> CompareContext<Map<K, V>>.mapBehavior() {
equalityBehavior()
propertyEquals { size() }
propertyEquals { size }
propertyEquals { isEmpty() }
(object {}).let { propertyEquals { containsKey(it)} }
@@ -108,7 +108,7 @@ public fun <T> CompareContext<T>.equalityBehavior(objectName: String = "") {
public fun <T> CompareContext<Collection<T>>.collectionBehavior(objectName: String = "") {
val prefix = objectName + if (objectName.isNotEmpty()) "." else ""
propertyEquals (prefix + "size") { size() }
propertyEquals (prefix + "size") { size }
propertyEquals (prefix + "isEmpty") { isEmpty() }
(object {}).let { propertyEquals { containsRaw(it)} }
libraries/stdlib/test/collections/CollectionJVMTest.kt
+9 -9
View File
@@ -39,7 +39,7 @@ class CollectionJVMTest {
val data = listOf("", "foo", "bar", "x", "")
val characters = data.flatMap { it.toCharList() }
println("Got list of characters ${characters}")
assertEquals(7, characters.size())
assertEquals(7, characters.size)
val text = characters.joinToString("")
assertEquals("foobarx", text)
}
@@ -52,7 +52,7 @@ class CollectionJVMTest {
assertTrue {
foo.all { it.startsWith("f") }
}
assertEquals(1, foo.size())
assertEquals(1, foo.size)
assertEquals(linkedListOf("foo"), foo)
assertTrue {
@@ -67,7 +67,7 @@ class CollectionJVMTest {
assertTrue {
foo.all { !it.startsWith("f") }
}
assertEquals(1, foo.size())
assertEquals(1, foo.size)
assertEquals(linkedListOf("bar"), foo)
assertTrue {
@@ -79,7 +79,7 @@ class CollectionJVMTest {
val data = listOf(null, "foo", null, "bar")
val foo = data.filterNotNullTo(linkedListOf<String>())
assertEquals(2, foo.size())
assertEquals(2, foo.size)
assertEquals(linkedListOf("foo", "bar"), foo)
assertTrue {
@@ -89,8 +89,8 @@ class CollectionJVMTest {
@test fun filterIntoSortedSet() {
val data = listOf("foo", "bar")
val sorted = data.filterTo(sortedSetOf<String>()) { it.length() == 3 }
assertEquals(2, sorted.size())
val sorted = data.filterTo(sortedSetOf<String>()) { it.length == 3 }
assertEquals(2, sorted.size)
assertEquals(sortedSetOf("bar", "foo"), sorted)
assertTrue {
sorted is TreeSet<String>
@@ -120,7 +120,7 @@ class CollectionJVMTest {
val data = listOf("foo", "bar")
val arr = data.toTypedArray()
println("Got array ${arr}")
assertEquals(2, arr.size())
assertEquals(2, arr.size)
todo {
assertTrue {
arr.isArrayOf<String>()
@@ -148,7 +148,7 @@ class CollectionJVMTest {
assertEquals(values.toList(), anyValues)
val charValues: List<Char> = values.filterIsInstance<Char>()
assertEquals(0, charValues.size())
assertEquals(0, charValues.size)
}
@test fun filterIsInstanceArray() {
@@ -167,7 +167,7 @@ class CollectionJVMTest {
assertEquals(src.toList(), anyValues)
val charValues: List<Char> = src.filterIsInstance<Char>()
assertEquals(0, charValues.size())
assertEquals(0, charValues.size)
}
@test fun emptyListIsSerializable() = testSingletonSerialization(emptyList<Any>())
libraries/stdlib/test/collections/CollectionTest.kt
+20 -20
View File
@@ -28,7 +28,7 @@ class CollectionTest {
val data = listOf(null, "foo", null, "bar")
val foo = data.filterNotNull()
assertEquals(2, foo.size())
assertEquals(2, foo.size)
assertEquals(listOf("foo", "bar"), foo)
assertTrue {
@@ -68,7 +68,7 @@ class CollectionTest {
assertTrue {
foo.all { it.startsWith("f") }
}
assertEquals(1, foo.size())
assertEquals(1, foo.size)
assertEquals(hashSetOf("foo"), foo)
assertTrue {
@@ -98,7 +98,7 @@ class CollectionTest {
@test fun foldWithDifferentTypes() {
expect(7) {
val numbers = listOf("a", "ab", "abc")
numbers.fold(1) { a, b -> a + b.length() }
numbers.fold(1) { a, b -> a + b.length }
}
expect("1234") {
@@ -151,7 +151,7 @@ class CollectionTest {
@test fun partition() {
val data = listOf("foo", "bar", "something", "xyz")
val pair = data.partition { it.length() == 3 }
val pair = data.partition { it.length == 3 }
assertEquals(listOf("foo", "bar", "xyz"), pair.first, "pair.first")
assertEquals(listOf("something"), pair.second, "pair.second")
@@ -185,8 +185,8 @@ class CollectionTest {
@test fun groupBy() {
val words = listOf("a", "abc", "ab", "def", "abcd")
val byLength = words.groupBy { it.length() }
assertEquals(4, byLength.size())
val byLength = words.groupBy { it.length }
assertEquals(4, byLength.size)
// verify that order of keys is preserved
val listOfPairs = byLength.toList()
@@ -196,7 +196,7 @@ class CollectionTest {
assertEquals(4, listOfPairs[3].first)
val l3 = byLength.getOrElse(3, { ArrayList<String>() })
assertEquals(2, l3.size())
assertEquals(2, l3.size)
}
@test fun plusRanges() {
@@ -350,8 +350,8 @@ class CollectionTest {
@test fun dropLast() {
val coll = listOf("foo", "bar", "abc")
assertEquals(coll, coll.dropLast(0))
assertEquals(emptyList<String>(), coll.dropLast(coll.size()))
assertEquals(emptyList<String>(), coll.dropLast(coll.size() + 1))
assertEquals(emptyList<String>(), coll.dropLast(coll.size))
assertEquals(emptyList<String>(), coll.dropLast(coll.size + 1))
assertEquals(listOf("foo", "bar"), coll.dropLast(1))
assertEquals(listOf("foo"), coll.dropLast(2))
@@ -362,7 +362,7 @@ class CollectionTest {
val coll = listOf("Foo", "bare", "abc" )
assertEquals(coll, coll.dropLastWhile { false })
assertEquals(listOf<String>(), coll.dropLastWhile { true })
assertEquals(listOf("Foo", "bare"), coll.dropLastWhile { it.length() < 4 })
assertEquals(listOf("Foo", "bare"), coll.dropLastWhile { it.length < 4 })
assertEquals(listOf("Foo"), coll.dropLastWhile { it.all { it in 'a'..'z' } })
}
@@ -371,8 +371,8 @@ class CollectionTest {
assertEquals(emptyList<String>(), coll.take(0))
assertEquals(listOf("foo"), coll.take(1))
assertEquals(listOf("foo", "bar"), coll.take(2))
assertEquals(coll, coll.take(coll.size()))
assertEquals(coll, coll.take(coll.size() + 1))
assertEquals(coll, coll.take(coll.size))
assertEquals(coll, coll.take(coll.size + 1))
assertFails { coll.take(-1) }
}
@@ -382,7 +382,7 @@ class CollectionTest {
assertEquals(emptyList<String>(), coll.takeWhile { false })
assertEquals(coll, coll.takeWhile { true })
assertEquals(listOf("foo"), coll.takeWhile { it.startsWith("f") })
assertEquals(listOf("foo", "bar", "abc"), coll.takeWhile { it.length() == 3 })
assertEquals(listOf("foo", "bar", "abc"), coll.takeWhile { it.length == 3 })
}
@test fun takeLast() {
@@ -391,8 +391,8 @@ class CollectionTest {
assertEquals(emptyList<String>(), coll.takeLast(0))
assertEquals(listOf("abc"), coll.takeLast(1))
assertEquals(listOf("bar", "abc"), coll.takeLast(2))
assertEquals(coll, coll.takeLast(coll.size()))
assertEquals(coll, coll.takeLast(coll.size() + 1))
assertEquals(coll, coll.takeLast(coll.size))
assertEquals(coll, coll.takeLast(coll.size + 1))
assertFails { coll.takeLast(-1) }
}
@@ -409,7 +409,7 @@ class CollectionTest {
val data = listOf("foo", "bar")
val arr = data.toTypedArray()
println("Got array ${arr}")
assertEquals(2, arr.size())
assertEquals(2, arr.size)
}
@test fun count() {
@@ -463,7 +463,7 @@ class CollectionTest {
val indices = data.indices
assertEquals(0, indices.start)
assertEquals(1, indices.end)
assertEquals(0..data.size() - 1, indices)
assertEquals(0..data.size - 1, indices)
}
@test fun contains() {
@@ -500,7 +500,7 @@ class CollectionTest {
expect(1, { listOf(1).minBy { it } })
expect(3, { listOf(2, 3).minBy { -it } })
expect('a', { listOf('a', 'b').minBy { "x$it" } })
expect("b", { listOf("b", "abc").minBy { it.length() } })
expect("b", { listOf("b", "abc").minBy { it.length } })
expect(null, { listOf<Int>().asSequence().minBy { it } })
expect(3, { listOf(2, 3).asSequence().minBy { -it } })
}
@@ -510,7 +510,7 @@ class CollectionTest {
expect(1, { listOf(1).maxBy { it } })
expect(2, { listOf(2, 3).maxBy { -it } })
expect('b', { listOf('a', 'b').maxBy { "x$it" } })
expect("abc", { listOf("b", "abc").maxBy { it.length() } })
expect("abc", { listOf("b", "abc").maxBy { it.length } })
expect(null, { listOf<Int>().asSequence().maxBy { it } })
expect(2, { listOf(2, 3).asSequence().maxBy { -it } })
}
@@ -609,7 +609,7 @@ class CollectionTest {
}
@test fun sortedByNullable() {
fun String.nonEmptyLength() = if (isEmpty()) null else length()
fun String.nonEmptyLength() = if (isEmpty()) null else length
listOf("", "sort", "abc").let {
assertEquals(listOf("", "abc", "sort"), it.sortedBy { it.nonEmptyLength() })
assertEquals(listOf("sort", "abc", ""), it.sortedByDescending { it.nonEmptyLength() })
libraries/stdlib/test/collections/IterableTests.kt
+13 -13
View File
@@ -48,7 +48,7 @@ abstract class OrderedIterableTests<T : Iterable<String>>(data: T, empty: T) : I
@Test
fun indexOfLast() {
expect(-1) { data.indexOfLast { it.contains("p") } }
expect(1) { data.indexOfLast { it.length() == 3 } }
expect(1) { data.indexOfLast { it.length == 3 } }
expect(-1) { empty.indexOfLast { it.startsWith('f') } }
}
@@ -122,7 +122,7 @@ abstract class IterableTests<T : Iterable<String>>(val data: T, val empty: T) {
@Test
fun all() {
expect(true) { data.all { it.length() == 3 } }
expect(true) { data.all { it.length == 3 } }
expect(false) { data.all { it.startsWith("b") } }
expect(true) { empty.all { it.startsWith("b") } }
}
@@ -131,7 +131,7 @@ abstract class IterableTests<T : Iterable<String>>(val data: T, val empty: T) {
fun none() {
expect(false) { data.none() }
expect(true) { empty.none() }
expect(false) { data.none { it.length() == 3 } }
expect(false) { data.none { it.length == 3 } }
expect(false) { data.none { it.startsWith("b") } }
expect(true) { data.none { it.startsWith("x") } }
expect(true) { empty.none { it.startsWith("b") } }
@@ -181,7 +181,7 @@ abstract class IterableTests<T : Iterable<String>>(val data: T, val empty: T) {
@Test
fun forEach() {
var count = 0
data.forEach { count += it.length() }
data.forEach { count += it.length }
assertEquals(6, count)
}
@@ -200,7 +200,7 @@ abstract class IterableTests<T : Iterable<String>>(val data: T, val empty: T) {
expect("foo") { data.single { it.startsWith("f") } }
expect("bar") { data.single { it.startsWith("b") } }
assertFails {
data.single { it.length() == 3 }
data.single { it.length == 3 }
}
}
@@ -211,13 +211,13 @@ abstract class IterableTests<T : Iterable<String>>(val data: T, val empty: T) {
expect("foo") { data.singleOrNull { it.startsWith("f") } }
expect("bar") { data.singleOrNull { it.startsWith("b") } }
expect(null) {
data.singleOrNull { it.length() == 3 }
data.singleOrNull { it.length == 3 }
}
}
@Test
fun map() {
val lengths = data.map { it.length() }
val lengths = data.map { it.length }
assertTrue {
lengths.all { it == 3 }
}
@@ -227,7 +227,7 @@ abstract class IterableTests<T : Iterable<String>>(val data: T, val empty: T) {
@Test
fun flatten() {
assertEquals(listOf(0, 1, 2, 3, 0, 1, 2, 3), data.map { 0..it.length() }.flatten())
assertEquals(listOf(0, 1, 2, 3, 0, 1, 2, 3), data.map { 0..it.length }.flatten())
}
@Test
@@ -280,11 +280,11 @@ abstract class IterableTests<T : Iterable<String>>(val data: T, val empty: T) {
@Test
fun sumBy() {
expect(6) { data.sumBy { it.length() } }
expect(0) { empty.sumBy { it.length() } }
expect(6) { data.sumBy { it.length } }
expect(0) { empty.sumBy { it.length } }
expect(3.0) { data.sumByDouble { it.length().toDouble() / 2 } }
expect(0.0) { empty.sumByDouble { it.length().toDouble() / 2 } }
expect(3.0) { data.sumByDouble { it.length.toDouble() / 2 } }
expect(0.0) { empty.sumByDouble { it.length.toDouble() / 2 } }
}
@Test
@@ -306,7 +306,7 @@ abstract class IterableTests<T : Iterable<String>>(val data: T, val empty: T) {
@Test
fun reduce() {
val reduced = data.reduce { a, b -> a + b }
assertEquals(6, reduced.length())
assertEquals(6, reduced.length)
assertTrue(reduced == "foobar" || reduced == "barfoo")
}
libraries/stdlib/test/collections/ListBinarySearchTest.kt
+5 -5
View File
@@ -21,7 +21,7 @@ class ListBinarySearchTest {
if (index > 0) {
index.let { from -> assertEquals(notFound(from), list.binarySearch(list.first(), fromIndex = from)) }
(list.size() - index).let { to -> assertEquals(notFound(to), list.binarySearch(list.last(), toIndex = to)) }
(list.size - index).let { to -> assertEquals(notFound(to), list.binarySearch(list.last(), toIndex = to)) }
}
}
}
@@ -34,7 +34,7 @@ class ListBinarySearchTest {
if (index > 0) {
index.let { from -> assertEquals(notFound(from), list.binarySearch(list.first(), fromIndex = from)) }
(list.size() - index).let { to -> assertEquals(notFound(to), list.binarySearch(list.last(), toIndex = to)) }
(list.size - index).let { to -> assertEquals(notFound(to), list.binarySearch(list.last(), toIndex = to)) }
}
}
}
@@ -50,7 +50,7 @@ class ListBinarySearchTest {
if (index > 0) {
index.let { from -> assertEquals(notFound(from), list.binarySearch(list.first(), comparator, fromIndex = from)) }
(list.size() - index).let { to -> assertEquals(notFound(to), list.binarySearch(list.last(), comparator, toIndex = to)) }
(list.size - index).let { to -> assertEquals(notFound(to), list.binarySearch(list.last(), comparator, toIndex = to)) }
}
}
}
@@ -66,7 +66,7 @@ class ListBinarySearchTest {
if (index > 0) {
index.let { from -> assertEquals(notFound(from), list.binarySearchBy(list.first().value, fromIndex = from) { it.value }) }
(list.size() - index).let { to -> assertEquals(notFound(to), list.binarySearchBy(list.last().value, toIndex = to) { it.value }) }
(list.size - index).let { to -> assertEquals(notFound(to), list.binarySearchBy(list.last().value, toIndex = to) { it.value }) }
}
}
}
@@ -85,7 +85,7 @@ class ListBinarySearchTest {
index.let { from ->
assertEquals(notFound(from), list.binarySearch(fromIndex = from) { comparator.compare(it.value, list.first().value) })
}
(list.size() - index).let { to ->
(list.size - index).let { to ->
assertEquals(notFound(to), list.binarySearch(toIndex = to) { comparator.compare(it.value, list.last().value) })
}
}
libraries/stdlib/test/collections/ListSpecificTest.kt
+1 -1
View File
@@ -63,7 +63,7 @@ class ListSpecificTest {
list += item
}
assertEquals(3, list.size())
assertEquals(3, list.size)
assertEquals("beverage,location,name", list.joinToString(","))
}
libraries/stdlib/test/collections/MapJVMTest.kt
+2 -2
View File
@@ -26,7 +26,7 @@ class MapJVMTest {
@test fun toSortedMapWithComparator() {
val map = mapOf(Pair("c", 3), Pair("bc", 2), Pair("bd", 4), Pair("abc", 1))
val sorted = map.toSortedMap(compareBy<String> { it.length() } thenBy { it })
val sorted = map.toSortedMap(compareBy<String> { it.length } thenBy { it })
assertEquals(listOf("c", "bc", "bd", "abc"), sorted.keySet().toList())
assertEquals(1, sorted["abc"])
assertEquals(2, sorted["bc"])
@@ -36,7 +36,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
+26 -26
View File
@@ -13,7 +13,7 @@ class MapTest {
val b = data.getOrElse("foo") { 3 }
assertEquals(3, b)
assertEquals(0, data.size())
assertEquals(0, data.size)
val empty = mapOf<String, Int?>()
val c = empty.getOrElse("") { null }
@@ -34,7 +34,7 @@ class MapTest {
data["bar"] = 3
assertEquals(3, mutableWithDefault["bar"])
val readonlyWithDefault = (data as Map<String, Int>).withDefault { it.length() }
val readonlyWithDefault = (data as Map<String, Int>).withDefault { it.length }
assertEquals(4, readonlyWithDefault.getOrImplicitDefault("loop"))
val withReplacedDefault = readonlyWithDefault.withDefault { 42 }
@@ -49,7 +49,7 @@ class MapTest {
val b = data.getOrPut("foo") { 3 }
assertEquals(2, b)
assertEquals(1, data.size())
assertEquals(1, data.size)
val empty = hashMapOf<String, Int?>()
val c = empty.getOrPut("") { null }
@@ -59,18 +59,18 @@ class MapTest {
@test fun sizeAndEmpty() {
val data = hashMapOf<String, Int>()
assertTrue { data.none() }
assertEquals(data.size(), 0)
assertEquals(data.size, 0)
}
@test fun setViaIndexOperators() {
val map = hashMapOf<String, String>()
assertTrue { map.none() }
assertEquals(map.size(), 0)
assertEquals(map.size, 0)
map["name"] = "James"
assertTrue { map.any() }
assertEquals(map.size(), 1)
assertEquals(map.size, 1)
assertEquals("James", map["name"])
}
@@ -82,7 +82,7 @@ class MapTest {
list.add(e.getValue())
}
assertEquals(6, list.size())
assertEquals(6, list.size)
assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(","))
}
@@ -100,7 +100,7 @@ class MapTest {
list.add(e.value)
}
assertEquals(6, list.size())
assertEquals(6, list.size)
assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(","))
}
@@ -112,7 +112,7 @@ class MapTest {
list.add(value)
}
assertEquals(6, list.size())
assertEquals(6, list.size)
assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(","))
}
@@ -154,36 +154,36 @@ 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").toMapBy { it.length() }
assertEquals(3, map.size())
val map = listOf("a", "bb", "ccc").toMapBy { it.length }
assertEquals(3, map.size)
assertEquals("a", map.get(1))
assertEquals("bb", map.get(2))
assertEquals("ccc", map.get(3))
}
@test fun createWithSelectorAndOverwrite() {
val map = listOf("aa", "bb", "ccc").toMapBy { it.length() }
assertEquals(2, map.size())
val map = listOf("aa", "bb", "ccc").toMapBy { 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").toMap({ it.length() }, { it.toUpperCase() })
assertEquals(3, map.size())
val map = listOf("a", "bb", "ccc").toMap({ it.length }, { it.toUpperCase() })
assertEquals(3, map.size)
assertEquals("A", map.get(1))
assertEquals("BB", map.get(2))
assertEquals("CCC", map.get(3))
@@ -191,7 +191,7 @@ class MapTest {
@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"])
}
@@ -207,21 +207,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"])
@@ -262,20 +262,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"])
}
fun testPlusAssign(doPlusAssign: (MutableMap<String, Int>) -> Unit) {
val map = hashMapOf("a" to 1, "b" to 2)
doPlusAssign(map)
assertEquals(3, map.size())
assertEquals(3, map.size)
assertEquals(1, map["a"])
assertEquals(4, map["b"])
assertEquals(3, map["c"])
@@ -297,7 +297,7 @@ class MapTest {
fun testPlus(doPlus: (Map<String, Int>) -> Map<String, Int>) {
val original = mapOf("A" to 1, "B" to 2)
val extended = doPlus(original)
assertEquals(3, extended.size())
assertEquals(3, extended.size)
assertEquals(1, extended["A"])
assertEquals(4, extended["B"])
assertEquals(3, extended["C"])
libraries/stdlib/test/collections/SequenceJVMTest.kt
+1 -1
View File
@@ -21,6 +21,6 @@ class SequenceJVMTest {
assertEquals(src.toList(), anyValues.toArrayList())
val charValues: Sequence<Char> = src.filterIsInstance<Char>()
assertEquals(0, charValues.toArrayList().size())
assertEquals(0, charValues.toArrayList().size)
}
}
libraries/stdlib/test/collections/SequenceTest.kt
+3 -3
View File
@@ -267,7 +267,7 @@ public class SequenceTest {
@test fun sequenceExtensions() {
val d = ArrayList<Int>()
sequenceOf(0, 1, 2, 3, 4, 5).takeWhileTo(d, { i -> i < 4 })
assertEquals(4, d.size())
assertEquals(4, d.size)
}
@test fun flatMapAndTakeExtractTheTransformedElements() {
@@ -330,8 +330,8 @@ public class SequenceTest {
@test fun sortedBy() {
sequenceOf("it", "greater", "less").let {
it.sortedBy { it.length() }.iterator().assertSorted { a, b -> compareValuesBy(a, b) { it.length() } <= 0 }
it.sortedByDescending { it.length() }.iterator().assertSorted { a, b -> compareValuesBy(a, b) { it.length() } >= 0 }
it.sortedBy { it.length }.iterator().assertSorted { a, b -> compareValuesBy(a, b) { it.length } <= 0 }
it.sortedByDescending { it.length }.iterator().assertSorted { a, b -> compareValuesBy(a, b) { it.length } >= 0 }
}
sequenceOf('a', 'd', 'c', null).let {
libraries/stdlib/test/collections/SetOperationsTest.kt
+1 -1
View File
@@ -10,7 +10,7 @@ class SetOperationsTest {
}
@test fun distinctBy() {
assertEquals(listOf("some", "cat", "do"), arrayOf("some", "case", "cat", "do", "dog", "it").distinctBy { it.length() })
assertEquals(listOf("some", "cat", "do"), arrayOf("some", "case", "cat", "do", "dog", "it").distinctBy { it.length })
assertTrue(charArrayOf().distinctBy { it }.isEmpty())
}
libraries/stdlib/test/io/Files.kt
+11 -11
View File
@@ -359,7 +359,7 @@ class FilesTest {
basedir.walkTopDown().enter(::beforeVisitDirectory).leave(::afterVisitDirectory).maxDepth(1).
forEach { it -> if (it != basedir) visitFile(it) }
assert(stack.isEmpty())
assert(dirs.size() == 1 && dirs.contains("")) { dirs.size() }
assert(dirs.size == 1 && dirs.contains("")) { dirs.size }
for (file in arrayOf("1", "6", "7.txt", "8")) {
assert(files.contains(file)) { file }
}
@@ -372,12 +372,12 @@ class FilesTest {
basedir.walkTopDown().enter(::beforeVisitDirectory).leave(::afterVisitDirectory).
fail(::visitDirectoryFailed).forEach { it -> if (!it.isDirectory()) visitFile(it) }
assert(stack.isEmpty())
assert(failed.size() == 1 && failed.contains("1")) { failed.size() }
assert(dirs.size() == 4) { dirs.size() }
assert(failed.size == 1 && failed.contains("1")) { failed.size }
assert(dirs.size == 4) { dirs.size }
for (dir in arrayOf("", "1", "6", "8")) {
assert(dirs.contains(dir)) { dir }
}
assert(files.size() == 2) { files.size() }
assert(files.size == 2) { files.size }
for (file in arrayOf("7.txt", "8${sep}9.txt")) {
assert(files.contains(file)) { file }
}
@@ -402,7 +402,7 @@ class FilesTest {
visited.add(it)
}
basedir.walkTopDown().forEach(block)
assert(visited.size() == 10) { visited.size() }
assert(visited.size == 10) { visited.size }
} finally {
basedir.deleteRecursively()
@@ -421,7 +421,7 @@ class FilesTest {
visited.add(it)
}
basedir.walkTopDown().forEach(block)
assert(visited.size() == 6) { visited.size() }
assert(visited.size == 6) { visited.size }
}
} finally {
restricted.setReadable(true)
@@ -491,7 +491,7 @@ class FilesTest {
found.add(file.getParentFile())
}
}
assert(found.size() == 3)
assert(found.size == 3)
} finally {
basedir.deleteRecursively()
}
@@ -532,10 +532,10 @@ class FilesTest {
// This line works only with Kotlin File.listFiles(filter)
val result = dir.listFiles { it.getName().endsWith(".kt") }
assertEquals(2, result!!.size())
assertEquals(2, result!!.size)
// This line works both with Kotlin File.listFiles(filter) and the same Java function because of SAM
val result2 = dir.listFiles { it -> it.getName().endsWith(".kt") }
assertEquals(2, result2!!.size())
assertEquals(2, result2!!.size)
}
@test fun relativeToTest() {
@@ -602,10 +602,10 @@ class FilesTest {
var i = 0
assertEquals(root, f.root)
for (elem in f.filePathComponents().fileList) {
assertTrue(i < elements.size(), i.toString())
assertTrue(i < elements.size, i.toString())
assertEquals(elements[i++], elem.toString())
}
assertEquals(elements.size(), i)
assertEquals(elements.size, i)
}
@test fun fileIterator() {
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
libraries/stdlib/test/text/RegexTest.kt
+1 -1
View File
@@ -137,7 +137,7 @@ class RegexTest {
@test fun replaceEvaluator() {
val input = "/12/456/7890/"
val pattern = "\\d+".toRegex()
assertEquals("/2/3/4/", pattern.replace(input, { it.value.length().toString() } ))
assertEquals("/2/3/4/", pattern.replace(input, { it.value.length.toString() } ))
}
libraries/stdlib/test/text/StringBuilderTest.kt
+6 -6
View File
@@ -32,8 +32,8 @@ class StringBuilderTest {
val result = sb.toString()
val cs = sb as CharSequence
assertEquals(result.length(), cs.length())
assertEquals(result.length(), sb.length())
assertEquals(result.length, cs.length)
assertEquals(result.length, sb.length)
for (index in result.indices) {
assertEquals(result[index], sb[index])
assertEquals(result[index], cs[index])
@@ -43,22 +43,22 @@ class StringBuilderTest {
@test fun constructors() {
StringBuilder().let { sb ->
assertEquals(0, sb.length())
assertEquals(0, sb.length)
assertEquals("", sb.toString())
}
StringBuilder(16).let { sb ->
assertEquals(0, sb.length())
assertEquals(0, sb.length)
assertEquals("", sb.toString())
}
StringBuilder("content").let { sb ->
assertEquals(7, sb.length())
assertEquals(7, sb.length)
assertEquals("content", sb.toString())
}
StringBuilder(StringBuilder("content")).let { sb ->
assertEquals(7, sb.length())
assertEquals(7, sb.length)
assertEquals("content", sb.toString())
}
}
libraries/stdlib/test/text/StringTest.kt
+4 -4
View File
@@ -927,7 +927,7 @@ class StringTest {
assertFails {
data.drop(-2)
}
assertEquals("", data.drop(data.length() + 5))
assertEquals("", data.drop(data.length + 5))
}
@test fun dropCharSequence() = withOneCharSequenceArg("abcd1234") { data ->
@@ -935,7 +935,7 @@ class StringTest {
assertFails {
data.drop(-2)
}
assertContentEquals("", data.drop(data.length() + 5))
assertContentEquals("", data.drop(data.length + 5))
}
@test fun takeWhile() {
@@ -957,7 +957,7 @@ class StringTest {
assertFails {
data.take(-7)
}
assertEquals(data, data.take(data.length() + 42))
assertEquals(data, data.take(data.length + 42))
}
@test fun takeCharSequence() = withOneCharSequenceArg("abcd1234") { data ->
@@ -1102,7 +1102,7 @@ ${" "}
`XP ' '''''' YPXXXXXX' ''''''`''YPPP
""".trimIndent()
assertEquals(23, deindented.lines().size())
assertEquals(23, deindented.lines().size)
val indents = deindented.lines().map { "^\\s*".toRegex().find(it)!!.value.length }
assertEquals(0, indents.min())
assertEquals(42, indents.max())
libraries/stdlib/test/utils/TODOTest.kt
+1 -1
View File
@@ -13,7 +13,7 @@ private class PartiallyImplementedClass {
if (!switch)
TODO("what if false")
else {
if (value.length() < 3)
if (value.length < 3)
throw TODO("write message")
}