New should spec #6

src/main/kotlin/io/kotlintest/KTestJUnitRunner.kt

@@ -23,7 +23,7 @@ class KTestJUnitRunner(testClass: Class<TestBase>) : Runner() {
   }
 
   private fun descriptionForSuite(suite: TestSuite): Description? {
-    val desc = Description.createSuiteDescription(suite.name, counter.andIncrement)
+    val desc = Description.createSuiteDescription(suite.name.replace(".", " "), counter.andIncrement)
     suite.suites.forEach { suite ->
       desc.addChild(descriptionForSuite(suite))
     }

src/main/kotlin/io/kotlintest/specs/ShouldSpec.kt

@@ -0,0 +1,23 @@
+package io.kotlintest.specs
+
+import io.kotlintest.TestBase
+import io.kotlintest.TestCase
+import io.kotlintest.TestSuite
+
+abstract class ShouldSpec : TestBase() {
+
+  var current = root
+
+  operator fun String.invoke(init: () -> Unit): Unit {
+    val suite = TestSuite.empty(this)
+    current.suites.add(suite)
+    val temp = current
+    current = suite
+    init()
+    current = temp
+  }
+
+  fun should(name: String, test: () -> Unit): Unit {
+    current.cases.add(TestCase(name, test))
+  }
+}

src/main/kotlin/io/kotlintest/testcase.kt

@@ -1,10 +1,8 @@
 package io.kotlintest
 
-import java.util.*
-
 data class TestSuite(val name: String, val suites: MutableList<TestSuite>, val cases: MutableList<io.kotlintest.TestCase>) {
   companion object {
-    fun empty(name: String) = TestSuite(name, ArrayList<TestSuite>(), ArrayList<io.kotlintest.TestCase>())
+    fun empty(name: String) = TestSuite(name, mutableListOf<TestSuite>(), mutableListOf<io.kotlintest.TestCase>())
   }
 }
 

src/test/kotlin/io/kotlintest/ShouldSpecTest.kt

@@ -0,0 +1,45 @@
+package io.kotlintest
+
+import io.kotlintest.specs.ShouldSpec
+
+class ShouldSpecTest : ShouldSpec() {
+
+  init {
+
+    // should allow nested
+    "List" {
+      "pop" {
+        should("should remove the last element from stack") {
+          val stack = ListStack<String>()
+          stack.push("hello")
+          stack.push("world")
+          stack.size() shouldBe 2
+          stack.pop() shouldBe "world"
+          stack.size() shouldBe 1
+        }
+      }
+    }
+
+    // should allow nested
+    "List.pop" {
+      should("should remove the last element from stack") {
+        val stack = ListStack<String>()
+        stack.push("hello")
+        stack.push("world")
+        stack.size() shouldBe 2
+        stack.pop() shouldBe "world"
+        stack.size() shouldBe 1
+      }
+    }
+
+    // and un-nested
+    should("should leave the stack unmodified") {
+      val stack = ListStack<String>()
+      stack.push("hello")
+      stack.push("world")
+      stack.size() shouldBe 2
+      stack.peek() shouldBe "world"
+      stack.size() shouldBe 2
+    }
+  }
+}