StdLib cleanup, deprecated symbol usage: List and Map members

libraries/stdlib/test/collections/CollectionBehaviors.kt

@@ -87,15 +87,15 @@ public fun <K, V> CompareContext<Map<K, V>>.mapBehavior() {
     (object {}).let { propertyEquals { containsKey(it)}  }
 
     if (expected.isEmpty().not())
-        propertyEquals { contains(keySet().first()) }
+        propertyEquals { contains(keys.first()) }
 
     propertyEquals { containsKeyRaw(keys.firstOrNull()) }
     propertyEquals { containsValueRaw(values.firstOrNull()) }
     propertyEquals { getRaw(null) }
 
-    compareProperty( { keySet() }, { setBehavior("keySet") } )
-    compareProperty( { entrySet() }, { setBehavior("entrySet") } )
-    compareProperty( { values() }, { collectionBehavior("values") })
+    compareProperty( { keys }, { setBehavior("keySet") } )
+    compareProperty( { entries }, { setBehavior("entrySet") } )
+    compareProperty( { values }, { collectionBehavior("values") })
 }
 
 public fun <T> CompareContext<T>.equalityBehavior(objectName: String = "") {

libraries/stdlib/test/collections/CollectionJVMTest.kt

@@ -15,7 +15,7 @@ class CollectionJVMTest {
     private fun <T> identitySetOf(vararg values: T): MutableSet<T> {
         val map = IdentityHashMap<T, String>()
         values.forEach { map.put(it, "") }
-        return map.keySet()
+        return map.keys
     }
 
     private data class IdentityData(public val value: Int)

libraries/stdlib/test/collections/MapJVMTest.kt

@@ -12,7 +12,7 @@ class MapJVMTest {
         assertEquals(1, map["a"])
         assertEquals(2, map["b"])
         assertEquals(3, map["c"])
-        assertEquals(listOf("a", "b", "c"), map.keySet().toList())
+        assertEquals(listOf("a", "b", "c"), map.keys.toList())
     }
 
     @test fun toSortedMap() {
@@ -21,13 +21,13 @@ class MapJVMTest {
         assertEquals(1, sorted["a"])
         assertEquals(2, sorted["b"])
         assertEquals(3, sorted["c"])
-        assertEquals(listOf("a", "b", "c"), sorted.keySet().toList())
+        assertEquals(listOf("a", "b", "c"), sorted.keys.toList())
     }
 
     @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 })
-        assertEquals(listOf("c", "bc", "bd", "abc"), sorted.keySet().toList())
+        assertEquals(listOf("c", "bc", "bd", "abc"), sorted.keys.toList())
         assertEquals(1, sorted["abc"])
         assertEquals(2, sorted["bc"])
         assertEquals(3, sorted["c"])

libraries/stdlib/test/collections/MapTest.kt

@@ -78,8 +78,8 @@ class MapTest {
         val map = mapOf("beverage" to "beer", "location" to "Mells", "name" to "James")
         val list = arrayListOf<String>()
         for (e in map) {
-            list.add(e.getKey())
-            list.add(e.getValue())
+            list.add(e.key)
+            list.add(e.value)
         }
 
         assertEquals(6, list.size)
@@ -201,7 +201,7 @@ class MapTest {
         assertEquals(1, map["a"])
         assertEquals(2, map["b"])
         assertEquals(3, map["c"])
-        assertEquals(listOf("c", "b", "a"), map.keySet().toList())
+        assertEquals(listOf("c", "b", "a"), map.keys.toList())
     }
 
     @test fun filter() {
@@ -317,7 +317,7 @@ class MapTest {
     fun testMinus(doMinus: (Map<String, Int>) -> Map<String, Int>) {
         val original = mapOf("A" to 1, "B" to 2)
         val shortened = doMinus(original)
-        assertEquals("A" to 1, shortened.entrySet().single().toPair())
+        assertEquals("A" to 1, shortened.entries.single().toPair())
     }
 
     @test fun minus() = testMinus { it - "B" - "C" }
@@ -335,7 +335,7 @@ class MapTest {
     fun testMinusAssign(doMinusAssign: (MutableMap<String, Int>) -> Unit) {
         val original = hashMapOf("A" to 1, "B" to 2)
         doMinusAssign(original)
-        assertEquals("A" to 1, original.entrySet().single().toPair())
+        assertEquals("A" to 1, original.entries.single().toPair())
     }
 
     @test fun minusAssign() = testMinusAssign {

libraries/stdlib/test/collections/ReversedViewsTest.kt

@@ -113,14 +113,14 @@ class ReversedViewsTest {
         val original = arrayListOf("a", "b", "c")
         val reversed = original.asReversed()
 
-        reversed.remove(0) // remove c
+        reversed.removeAt(0) // remove c
         assertEquals(listOf("a", "b"), original)
         assertEquals(listOf("b", "a"), reversed)
 
-        reversed.remove(1) // remove a
+        reversed.removeAt(1) // remove a
         assertEquals(listOf("b"), original)
 
-        reversed.remove(0) // remove remaining b
+        reversed.removeAt(0) // remove remaining b
         assertEquals(emptyList<String>(), original)
     }
 

libraries/stdlib/test/io/Files.kt

@@ -329,7 +329,7 @@ class FilesTest {
 
                 fun afterVisitDirectory(dir: File) {
                     assertEquals(stack.last(), dir)
-                    stack.remove(stack.lastIndex)
+                    stack.removeAt(stack.lastIndex)
                 }
 
                 fun visitFile(file: File) {
@@ -339,7 +339,7 @@ class FilesTest {
 
                 fun visitDirectoryFailed(dir: File, e: IOException) {
                     assertEquals(stack.last(), dir)
-                    stack.remove(stack.lastIndex)
+                    stack.removeAt(stack.lastIndex)
                     failed.add(dir.name)
                 }
                 basedir.walkTopDown().enter(::beforeVisitDirectory).leave(::afterVisitDirectory).

libraries/stdlib/test/js/MapJsTest.kt

@@ -153,17 +153,17 @@ abstract class MapJsTest {
     // #KT-3035
     @test fun emptyMapValues() {
         val emptyMap = emptyMap()
-        assertTrue(emptyMap.values().isEmpty())
+        assertTrue(emptyMap.values.isEmpty())
     }
 
     @test fun mapValues() {
         val map = createTestMap()
-        assertEquals(VALUES.toNormalizedList(), map.values().toNormalizedList())
+        assertEquals(VALUES.toNormalizedList(), map.values.toNormalizedList())
     }
 
     @test fun mapKeySet() {
         val map = createTestMap()
-        assertEquals(KEYS.toNormalizedList(), map.keySet().toNormalizedList())
+        assertEquals(KEYS.toNormalizedList(), map.keys.toNormalizedList())
     }
 
     @test fun mapEntrySet() {
@@ -171,9 +171,9 @@ abstract class MapJsTest {
 
         val actualKeys = ArrayList<String>()
         val actualValues = ArrayList<Int>()
-        for (e in map.entrySet()) {
-            actualKeys.add(e.getKey())
-            actualValues.add(e.getValue())
+        for (e in map.entries) {
+            actualKeys.add(e.key)
+            actualValues.add(e.value)
         }
 
         assertEquals(KEYS.toNormalizedList(), actualKeys.toNormalizedList())
@@ -293,8 +293,8 @@ abstract class MapJsTest {
         val actualKeys = ArrayList<String>()
         val actualValues = ArrayList<Int>()
         for (e in map) {
-            actualKeys.add(e.getKey())
-            actualValues.add(e.getValue())
+            actualKeys.add(e.key)
+            actualValues.add(e.value)
         }
 
         assertEquals(KEYS.toNormalizedList(), actualKeys.toNormalizedList())
@@ -308,8 +308,8 @@ abstract class MapJsTest {
         val actualValues = ArrayList<Int>()
         val iterator = map.iterator()
         for (e in iterator) {
-            actualKeys.add(e.getKey())
-            actualValues.add(e.getValue())
+            actualKeys.add(e.key)
+            actualValues.add(e.value)
         }
 
         assertEquals(KEYS.toNormalizedList(), actualKeys.toNormalizedList())