Migrate to using join* functions instead of deprecated.

libraries/stdlib/test/collections/CollectionJVMTest.kt

@@ -13,7 +13,7 @@ class CollectionJVMTest {
         val characters = data.flatMap { it.toCharList() }
         println("Got list of characters ${characters}")
         assertEquals(7, characters.size())
-        val text = characters.makeString("")
+        val text = characters.joinToString("")
         assertEquals("foobarx", text)
     }
 

libraries/stdlib/test/collections/CollectionTest.kt

@@ -6,20 +6,20 @@ import org.junit.Test as test
 
 class CollectionTest {
 
-    test fun appendString() {
+    test fun joinTo() {
         val data = arrayListOf("foo", "bar")
         val buffer = StringBuilder()
-        val text = data.appendString(buffer, "-", "{", "}")
+        data.joinTo(buffer, "-", "{", "}")
         assertEquals("{foo-bar}", buffer.toString())
     }
 
-    test fun makeString() {
+    test fun join() {
         val data = arrayListOf("foo", "bar")
-        val text = data.makeString("-", "<", ">")
+        val text = data.join("-", "<", ">")
         assertEquals("<foo-bar>", text)
 
         val big = arrayListOf("a", "b", "c", "d", "e", "f")
-        val text2 = big.makeString(limit = 3, truncated = "*")
+        val text2 = big.join(limit = 3, truncated = "*")
         assertEquals("a, b, c, *", text2)
     }
 

libraries/stdlib/test/collections/MapTest.kt

@@ -68,7 +68,7 @@ class MapTest {
         }
 
         assertEquals(6, list.size())
-        assertEquals("beverage,beer,location,Mells,name,James", list.makeString(","))
+        assertEquals("beverage,beer,location,Mells,name,James", list.join(","))
     }
 
     test fun iterateWithProperties() {
@@ -85,7 +85,7 @@ class MapTest {
         }
 
         assertEquals(6, list.size())
-        assertEquals("beverage,beer,location,Mells,name,James", list.makeString(","))
+        assertEquals("beverage,beer,location,Mells,name,James", list.join(","))
     }
 
     test fun iterateWithExtraction() {
@@ -102,7 +102,7 @@ class MapTest {
         }
 
         assertEquals(6, list.size())
-        assertEquals("beverage,beer,location,Mells,name,James", list.makeString(","))
+        assertEquals("beverage,beer,location,Mells,name,James", list.join(","))
     }
 
     test fun contains() {
@@ -203,7 +203,7 @@ class MapTest {
         }
 
         assertEquals(6, list.size())
-        assertEquals("beverage,beer,location,Mells,name,James", list.makeString(","))
+        assertEquals("beverage,beer,location,Mells,name,James", list.join(","))
         println("==== worked! $list")
     }
     */

libraries/stdlib/test/collections/StreamTest.kt

@@ -65,18 +65,18 @@ public class StreamTest {
     }
 
     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 skippingIterator() {
-        assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().drop(7).makeString(limit = 10))
-        assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().drop(3).drop(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 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 plus() {
@@ -146,7 +146,7 @@ public class StreamTest {
 
     /*
     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)
     }
 */