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

libraries/stdlib/test/collections/CollectionJVMTest.kt

@@ -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>())