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

Deprecate join (use joinToString instead)

Browse Source 
#KT-6909
This commit is contained in:
Ilya Gorbunov
2015-10-07 03:53:10 +03:00
parent f37e022b8e
commit 12d9beb3a4
12 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/collections/CollectionTest.kt
+3 -3
View File
@@ -14,13 +14,13 @@ class CollectionTest {
assertEquals("{foo-bar}", buffer.toString())
}
@test fun join() {
@test fun joinToString() {
val data = listOf("foo", "bar")
val text = data.join("-", "<", ">")
val text = data.joinToString("-", "<", ">")
assertEquals("<foo-bar>", text)
val big = listOf("a", "b", "c", "d", "e", "f")
val text2 = big.join(limit = 3, truncated = "*")
val text2 = big.joinToString(limit = 3, truncated = "*")
assertEquals("a, b, c, *", text2)
}
libraries/stdlib/test/collections/ListSpecificTest.kt
+1 -1
View File
@@ -64,7 +64,7 @@ class ListSpecificTest {
}
assertEquals(3, list.size())
assertEquals("beverage,location,name", list.join(","))
assertEquals("beverage,location,name", list.joinToString(","))
}
@Test
libraries/stdlib/test/collections/MapTest.kt
+3 -3
View File
@@ -83,7 +83,7 @@ class MapTest {
}
assertEquals(6, list.size())
assertEquals("beverage,beer,location,Mells,name,James", list.join(","))
assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(","))
}
@test fun stream() {
@@ -101,7 +101,7 @@ class MapTest {
}
assertEquals(6, list.size())
assertEquals("beverage,beer,location,Mells,name,James", list.join(","))
assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(","))
}
@test fun iterateWithExtraction() {
@@ -113,7 +113,7 @@ class MapTest {
}
assertEquals(6, list.size())
assertEquals("beverage,beer,location,Mells,name,James", list.join(","))
assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(","))
}
@test fun contains() {
libraries/stdlib/test/language/StringExpressionExampleTest.kt
+1 -1
View File
@@ -15,7 +15,7 @@ fun customerTemplate(customer: Customer) = """
<body>
<h1>Hello ${customer.name}</h1>
<ul>
${customer.products.map{ productSnippet(it) }.join("\n")}
${customer.products.map{ productSnippet(it) }.joinToString("\n")}
</ul>
<p>lets do some kool stuff</p>
</body>
libraries/stdlib/test/text/StringJVMTest.kt
+2 -2
View File
@@ -251,11 +251,11 @@ class StringJVMTest {
@test fun join() {
val data = "abcd".map { it.toString() }
val result = data.join("_", "(", ")")
val result = data.joinToString("_", "(", ")")
assertEquals("(a_b_c_d)", result)
val data2 = "verylongstring".map { it.toString() }
val result2 = data2.join("-", "[", "]", 11, "oops")
val result2 = data2.joinToString("-", "[", "]", 11, "oops")
assertEquals("[v-e-r-y-l-o-n-g-s-t-r-oops]", result2)
}