#KT-1675 Fixed, renaming join() -> makeString() and adding an appendString() which reduces the possible number of appendables being created

2012-04-02 20:01:24 +01:00
parent fc683e8141
commit 1d342978d0
17 changed files with 76 additions and 100 deletions
@@ -8,6 +8,16 @@ import org.junit.Test

 class CollectionTest {

+    Test fun all() {
+        val data = arrayList("foo", "bar")
+        assertTrue {
+            data.all{it.length == 3}
+        }
+        assertNot {
+            data.all{s -> s.startsWith("b")}
+        }
+    }
+
    Test fun any() {
        val data = arrayList("foo", "bar")
        assertTrue {
@@ -18,14 +28,12 @@ class CollectionTest {
        }
    }

-    Test fun all() {
+
+    Test fun appendString() {
        val data = arrayList("foo", "bar")
-        assertTrue {
-            data.all{it.length == 3}
-        }
-        assertNot {
-            data.all{s -> s.startsWith("b")}
-        }
+        val buffer = StringBuilder()
+        val text = data.appendString(buffer, "-", "{", "}")
+        assertEquals("{foo-bar}", buffer.toString())
    }

    Test fun count() {
@@ -157,7 +165,7 @@ class CollectionTest {
        val characters = data.flatMap<String,Character>{ it.toCharList() }
        println("Got list of characters ${characters}")
        assertEquals(7, characters.size())
-        val text = characters.join("")
+        val text = characters.makeString("")
        assertEquals("foobarx", text)
    }

@@ -223,9 +231,10 @@ class CollectionTest {

    }

-    Test fun join() {
+
+    Test fun makeString() {
        val data = arrayList("foo", "bar")
-        val text = data.join("-", "<", ">")
+        val text = data.makeString("-", "<", ">")
        assertEquals("<foo-bar>", text)
    }

@@ -48,12 +48,12 @@ class IteratorsTest {
    }

    Test fun joinConcatenatesTheFirstNElementsAboveAThreshold() {
-        assertEquals("13, 21, 34, 55, 89, ...", fibonacci().filter { it > 10 }.join(separator = ", ", limit = 5))
+        assertEquals("13, 21, 34, 55, 89, ...", fibonacci().filter { it > 10 }.makeString(separator = ", ", limit = 5))
    }

    Test fun toStringJoinsNoMoreThanTheFirstTenElements() {
-        assertEquals("0, 1, 1, 2, 3, 5, 8, 13, 21, 34, ...", fibonacci().join(limit = 10))
-        assertEquals("13, 21, 34, 55, 89, 144, 233, 377, 610, 987, ...", fibonacci().filter {  it > 10 }.join(limit = 10))
-        assertEquals("144, 233, 377, 610, 987", fibonacci().filter { it > 100 }.takeWhile { it < 1000 }.join())
+        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())
    }
 }
@@ -17,7 +17,7 @@ fun customerTemplate(customer: Customer) = """
 <body>
 <h1>Hello ${customer.name}</h1>
 <ul>
-${customer.products.map<Product,String>{ productSnippet(it) }.join("\n")}
+${customer.products.map<Product,String>{ productSnippet(it) }.makeString("\n")}
 </ul>
 <p>lets do some kool stuff</p>
 </body>