convert the test suite to use TestMore

still has issues (the tests run in parallel, which messes up the test
output, and the outputstream parameter is required), but it's a start

1 files changed, 79 insertions, 83 deletions

diff --git a/src/test/scala/org/perl8/test/TestMoreTest.scala b/src/test/scala/org/perl8/test/TestMoreTest.scala
index 005691e..5b3f8a3 100644
--- a/src/test/scala/org/perl8/test/TestMoreTest.scala
+++ b/src/test/scala/org/perl8/test/TestMoreTest.scala
@@ -1,10 +1,8 @@
 package org.perl8.test
 
-import org.scalatest.FunSuite
+import java.io.{OutputStream,ByteArrayOutputStream}
 
-import java.io.ByteArrayOutputStream
-
-class TestMoreTest extends FunSuite {
+class TestMoreTest (out: OutputStream) extends TestMore(out) {
   private object OutputContainer {
     val output = new ByteArrayOutputStream
   }
@@ -58,85 +56,83 @@ class TestMoreTest extends FunSuite {
     }
   }
 
-  test ("basic") {
-    assert((new MyBasicTest).run == 9)
+  is((new MyBasicTest).run, 9, "got the right plan")
 
-    val expected =
-      "# ok\n" +
-      "ok 1 - it works!\n" +
-      "not ok 2 - it doesn't work!\n" +
-      "#   Failed test 'it doesn't work!'\n" +
-      "#   at TestMoreTest.scala line 15.\n" +
-      "ok 3\n" +
-      "not ok 4\n" +
-      "#   Failed test at TestMoreTest.scala line 17.\n" +
-      "# is\n" +
-      "ok 5 - it works!\n" +
-      "not ok 6 - it doesn't work!\n" +
-      "#   Failed test 'it doesn't work!'\n" +
-      "#   at TestMoreTest.scala line 21.\n" +
-      "#          got: '1'\n" +
-      "#     expected: '0'\n" +
-      "ok 7\n" +
-      "not ok 8\n" +
-      "#   Failed test at TestMoreTest.scala line 23.\n" +
-      "#          got: '1'\n" +
-      "#     expected: '0'\n" +
-      "# isnt\n" +
-      "ok 9 - it works!\n" +
-      "not ok 10 - it doesn't work!\n" +
-      "#   Failed test 'it doesn't work!'\n" +
-      "#   at TestMoreTest.scala line 27.\n" +
-      "#          got: '1'\n" +
-      "#     expected: anything else\n" +
-      "ok 11\n" +
-      "not ok 12\n" +
-      "#   Failed test at TestMoreTest.scala line 29.\n" +
-      "#          got: '1'\n" +
-      "#     expected: anything else\n" +
-      "# like\n" +
-      "ok 13 - it works!\n" +
-      "not ok 14 - it doesn't work!\n" +
-      "#   Failed test 'it doesn't work!'\n" +
-      "#   at TestMoreTest.scala line 33.\n" +
-      "#                   'foo'\n" +
-      "#     doesn't match 'bar'\n" +
-      "ok 15\n" +
-      "not ok 16\n" +
-      "#   Failed test at TestMoreTest.scala line 35.\n" +
-      "#                   'foo'\n" +
-      "#     doesn't match 'bar'\n" +
-      "    # unlike\n" +
-      "    ok 1 - it works!\n" +
-      "    not ok 2 - it doesn't work!\n" +
-      "    #   Failed test 'it doesn't work!'\n" +
-      "    #   at TestMoreTest.scala line 40.\n" +
-      "    #                   'foo'\n" +
-      "    #           matches 'foo'\n" +
-      "    ok 3\n" +
-      "    not ok 4\n" +
-      "    #   Failed test at TestMoreTest.scala line 42.\n" +
-      "    #                   'foo'\n" +
-      "    #           matches 'foo'\n" +
-      "    1..4\n" +
-      "    # Looks like you failed 2 tests of 4.\n" +
-      "not ok 17 - unlikes\n" +
-      "#   Failed test 'unlikes'\n" +
-      "#   at TestMoreTest.scala line 37.\n" +
-      "# pass\n" +
-      "ok 18 - it works!\n" +
-      "ok 19\n" +
-      "ok 20 # skip don't do this yet\n" +
-      "ok 21 # skip don't do this yet\n" +
-      "# fail\n" +
-      "not ok 22 - it doesn't work # TODO not working yet\n" +
-      "#   Failed (TODO) test 'it doesn't work'\n" +
-      "#   at TestMoreTest.scala line 56.\n" +
-      "not ok 23 # TODO not working yet\n" +
-      "#   Failed (TODO) test at TestMoreTest.scala line 57.\n" +
-      "1..23\n" +
-      "# Looks like you failed 9 tests of 23.\n"
+  val expected =
+    "# ok\n" +
+    "ok 1 - it works!\n" +
+    "not ok 2 - it doesn't work!\n" +
+    "#   Failed test 'it doesn't work!'\n" +
+    "#   at TestMoreTest.scala line 13.\n" +
+    "ok 3\n" +
+    "not ok 4\n" +
+    "#   Failed test at TestMoreTest.scala line 15.\n" +
+    "# is\n" +
+    "ok 5 - it works!\n" +
+    "not ok 6 - it doesn't work!\n" +
+    "#   Failed test 'it doesn't work!'\n" +
+    "#   at TestMoreTest.scala line 19.\n" +
+    "#          got: '1'\n" +
+    "#     expected: '0'\n" +
+    "ok 7\n" +
+    "not ok 8\n" +
+    "#   Failed test at TestMoreTest.scala line 21.\n" +
+    "#          got: '1'\n" +
+    "#     expected: '0'\n" +
+    "# isnt\n" +
+    "ok 9 - it works!\n" +
+    "not ok 10 - it doesn't work!\n" +
+    "#   Failed test 'it doesn't work!'\n" +
+    "#   at TestMoreTest.scala line 25.\n" +
+    "#          got: '1'\n" +
+    "#     expected: anything else\n" +
+    "ok 11\n" +
+    "not ok 12\n" +
+    "#   Failed test at TestMoreTest.scala line 27.\n" +
+    "#          got: '1'\n" +
+    "#     expected: anything else\n" +
+    "# like\n" +
+    "ok 13 - it works!\n" +
+    "not ok 14 - it doesn't work!\n" +
+    "#   Failed test 'it doesn't work!'\n" +
+    "#   at TestMoreTest.scala line 31.\n" +
+    "#                   'foo'\n" +
+    "#     doesn't match 'bar'\n" +
+    "ok 15\n" +
+    "not ok 16\n" +
+    "#   Failed test at TestMoreTest.scala line 33.\n" +
+    "#                   'foo'\n" +
+    "#     doesn't match 'bar'\n" +
+    "    # unlike\n" +
+    "    ok 1 - it works!\n" +
+    "    not ok 2 - it doesn't work!\n" +
+    "    #   Failed test 'it doesn't work!'\n" +
+    "    #   at TestMoreTest.scala line 38.\n" +
+    "    #                   'foo'\n" +
+    "    #           matches 'foo'\n" +
+    "    ok 3\n" +
+    "    not ok 4\n" +
+    "    #   Failed test at TestMoreTest.scala line 40.\n" +
+    "    #                   'foo'\n" +
+    "    #           matches 'foo'\n" +
+    "    1..4\n" +
+    "    # Looks like you failed 2 tests of 4.\n" +
+    "not ok 17 - unlikes\n" +
+    "#   Failed test 'unlikes'\n" +
+    "#   at TestMoreTest.scala line 35.\n" +
+    "# pass\n" +
+    "ok 18 - it works!\n" +
+    "ok 19\n" +
+    "ok 20 # skip don't do this yet\n" +
+    "ok 21 # skip don't do this yet\n" +
+    "# fail\n" +
+    "not ok 22 - it doesn't work # TODO not working yet\n" +
+    "#   Failed (TODO) test 'it doesn't work'\n" +
+    "#   at TestMoreTest.scala line 54.\n" +
+    "not ok 23 # TODO not working yet\n" +
+    "#   Failed (TODO) test at TestMoreTest.scala line 55.\n" +
+    "1..23\n" +
+    "# Looks like you failed 9 tests of 23.\n"
 
-    assert(OutputContainer.output.toString === expected)
-  }
+  is(OutputContainer.output.toString, expected, "correct tap")
 }