aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/scala/org/perl8/test/TestMore.scala1
-rw-r--r--src/main/scala/org/perl8/test/harness/TestHarness.scala (renamed from src/main/scala/org/perl8/test/TestHarness.scala)4
-rw-r--r--src/main/scala/org/perl8/test/tap/Producer.scala (renamed from src/main/scala/org/perl8/test/TAP.scala)6
-rw-r--r--src/main/scala/org/perl8/test/tap/TestBuilder.scala (renamed from src/main/scala/org/perl8/test/TestBuilder.scala)16
-rw-r--r--src/test/scala/org/perl8/test/TestMoreTest.scala (renamed from src/test/scala/org/perl8/test/tests/testmore/basic.scala)32
-rw-r--r--src/test/scala/org/perl8/test/tap/TestBuilderTest.scala (renamed from src/test/scala/org/perl8/test/tests/testbuilder/basic.scala)8
6 files changed, 35 insertions, 32 deletions
diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala
index 978a871..dddd468 100644
--- a/src/main/scala/org/perl8/test/TestMore.scala
+++ b/src/main/scala/org/perl8/test/TestMore.scala
@@ -1,5 +1,6 @@
package org.perl8.test
+import org.perl8.test.tap.TestBuilder
import org.perl8.test.Utils._
import java.io.OutputStream
diff --git a/src/main/scala/org/perl8/test/TestHarness.scala b/src/main/scala/org/perl8/test/harness/TestHarness.scala
index ec2aafa..2d152d8 100644
--- a/src/main/scala/org/perl8/test/TestHarness.scala
+++ b/src/main/scala/org/perl8/test/harness/TestHarness.scala
@@ -1,4 +1,6 @@
-package org.perl8.test
+package org.perl8.test.harness
+
+import org.perl8.test.Test
object TestHarness {
def main (args: Array[String]) {
diff --git a/src/main/scala/org/perl8/test/TAP.scala b/src/main/scala/org/perl8/test/tap/Producer.scala
index d283875..28c9142 100644
--- a/src/main/scala/org/perl8/test/TAP.scala
+++ b/src/main/scala/org/perl8/test/tap/Producer.scala
@@ -1,8 +1,8 @@
-package org.perl8.test
+package org.perl8.test.tap
-import Utils._
+import org.perl8.test.Utils._
-object TAP {
+object Producer {
def result (
cond: Boolean,
num: Int,
diff --git a/src/main/scala/org/perl8/test/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala
index 61533a0..f9c684c 100644
--- a/src/main/scala/org/perl8/test/TestBuilder.scala
+++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala
@@ -1,8 +1,8 @@
-package org.perl8.test
+package org.perl8.test.tap
import java.io.OutputStream
-import Utils._
+import org.perl8.test.Utils._
class TestBuilder (
plan: Option[Plan],
@@ -10,7 +10,7 @@ class TestBuilder (
val indent: Int,
private val name: Message
) {
- plan.foreach(p => println(TAP.plan(p)))
+ plan.foreach(p => println(Producer.plan(p)))
def this (
plan: Plan,
@@ -32,29 +32,29 @@ class TestBuilder (
description: Message = NoMessage,
todo: Message = NoMessage
) {
- val line = TAP.result(test, state.currentTest, description, todo)
+ val line = Producer.result(test, state.currentTest, description, todo)
state.ok(test || todo.isDefined)
println(line)
}
def skip (reason: Message = NoMessage) {
- val line = TAP.skip(state.currentTest, reason)
+ val line = Producer.skip(state.currentTest, reason)
state.ok(true)
println(line)
}
def diag (message: Message) {
- message.foreach(m => println(TAP.comment(m)))
+ message.foreach(m => println(Producer.comment(m)))
}
def bailOut (message: Message = NoMessage) {
- println(TAP.bailOut(message))
+ println(Producer.bailOut(message))
throw new BailOutException(message.getOrElse(""))
}
def doneTesting () {
plan match {
- case None => println(TAP.plan(state.currentTest - 1))
+ case None => println(Producer.plan(state.currentTest - 1))
case _ => ()
}
diff --git a/src/test/scala/org/perl8/test/tests/testmore/basic.scala b/src/test/scala/org/perl8/test/TestMoreTest.scala
index d40a218..e65b3e4 100644
--- a/src/test/scala/org/perl8/test/tests/testmore/basic.scala
+++ b/src/test/scala/org/perl8/test/TestMoreTest.scala
@@ -1,9 +1,7 @@
-package org.perl8.test.tests.testmore
+package org.perl8.test
import org.scalatest.FunSuite
-import org.perl8.test.TestMore
-
import java.io.ByteArrayOutputStream
object OutputContainer {
@@ -59,7 +57,7 @@ class MyBasicTest extends TestMore(OutputContainer.output) {
}
}
-class Basic extends FunSuite {
+class TestMoreTest extends FunSuite {
test ("basic") {
assert((new MyBasicTest).run == 9)
@@ -68,63 +66,63 @@ class Basic extends FunSuite {
"ok 1 - it works!\n" +
"not ok 2 - it doesn't work!\n" +
"# Failed test 'it doesn't work!'\n" +
- "# at basic.scala line 16.\n" +
+ "# at TestMoreTest.scala line 14.\n" +
"ok 3\n" +
"not ok 4\n" +
- "# Failed test at basic.scala line 18.\n" +
+ "# Failed test at TestMoreTest.scala line 16.\n" +
"# is\n" +
"ok 5 - it works!\n" +
"not ok 6 - it doesn't work!\n" +
"# Failed test 'it doesn't work!'\n" +
- "# at basic.scala line 22.\n" +
+ "# at TestMoreTest.scala line 20.\n" +
"# got: '1'\n" +
"# expected: '0'\n" +
"ok 7\n" +
"not ok 8\n" +
- "# Failed test at basic.scala line 24.\n" +
+ "# Failed test at TestMoreTest.scala line 22.\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 basic.scala line 28.\n" +
+ "# at TestMoreTest.scala line 26.\n" +
"# got: '1'\n" +
"# expected: anything else\n" +
"ok 11\n" +
"not ok 12\n" +
- "# Failed test at basic.scala line 30.\n" +
+ "# Failed test at TestMoreTest.scala line 28.\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 basic.scala line 34.\n" +
+ "# at TestMoreTest.scala line 32.\n" +
"# 'foo'\n" +
"# doesn't match 'bar'\n" +
"ok 15\n" +
"not ok 16\n" +
- "# Failed test at basic.scala line 36.\n" +
+ "# Failed test at TestMoreTest.scala line 34.\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 basic.scala line 41.\n" +
+ " # at TestMoreTest.scala line 39.\n" +
" # 'foo'\n" +
" # matches 'foo'\n" +
" ok 3\n" +
" not ok 4\n" +
- " # Failed test at basic.scala line 43.\n" +
+ " # Failed test at TestMoreTest.scala line 41.\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 basic.scala line 38.\n" +
+ "# at TestMoreTest.scala line 36.\n" +
"# pass\n" +
"ok 18 - it works!\n" +
"ok 19\n" +
@@ -133,9 +131,9 @@ class Basic extends FunSuite {
"# fail\n" +
"not ok 22 - it doesn't work # TODO not working yet\n" +
"# Failed (TODO) test 'it doesn't work'\n" +
- "# at basic.scala line 57.\n" +
+ "# at TestMoreTest.scala line 55.\n" +
"not ok 23 # TODO not working yet\n" +
- "# Failed (TODO) test at basic.scala line 58.\n" +
+ "# Failed (TODO) test at TestMoreTest.scala line 56.\n" +
"1..23\n" +
"# Looks like you failed 9 tests of 23.\n"
diff --git a/src/test/scala/org/perl8/test/tests/testbuilder/basic.scala b/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala
index da7cf57..e68cf47 100644
--- a/src/test/scala/org/perl8/test/tests/testbuilder/basic.scala
+++ b/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala
@@ -1,13 +1,15 @@
-package org.perl8.test.tests.testbuilder
+package org.perl8.test
import org.scalatest.FunSuite
import org.scalatest.BeforeAndAfter
-import org.perl8.test._
+import org.perl8.test.tap.TestBuilder
+import org.perl8.test.BailOutException
+import org.perl8.test.SkipAll
import java.io.ByteArrayOutputStream
-class Basic extends FunSuite with BeforeAndAfter {
+class TestBuilderTest extends FunSuite with BeforeAndAfter {
private val output = new ByteArrayOutputStream
before {
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-05-29 06:01:05 +0000