Merge remote-tracking branch 'wking/directives'

Author: mndrix

util/tap/Makefile

@@ -1,4 +1,4 @@
-TESTS = auto check diagnostic known failing writer
+TESTS = auto check diagnostic failing known skip todo writer
 GOPATH = $(CURDIR)/gopath
 
 .PHONY: $(TESTS)

util/tap/tap.go

@@ -31,16 +31,20 @@ import "testing/quick"
 // T is a type to encapsulate test state.  Methods on this type generate TAP
 // output.
 type T struct {
-	nextTestNumber int
+	nextTestNumber *int
+
+	// TODO toggles the TODO directive for Ok, Fail, Pass, and similar.
+	TODO bool
 
 	// Writer indicates where TAP output should be sent.  The default is os.Stdout.
 	Writer io.Writer
 }
 
 // New creates a new Tap value
 func New() *T {
+	nextTestNumber := 1
 	return &T{
-		nextTestNumber: 1,
+		nextTestNumber: &nextTestNumber,
 	}
 }
 
@@ -74,8 +78,12 @@ func (t *T) Ok(test bool, description string) {
 		ok = "not ok"
 	}
 
-	t.printf("%s %d - %s\n", ok, t.nextTestNumber, description)
-	t.nextTestNumber++
+	if t.TODO {
+		t.printf("%s %d # TODO %s\n", ok, *t.nextTestNumber, description)
+	} else {
+		t.printf("%s %d - %s\n", ok, *t.nextTestNumber, description)
+	}
+	(*t.nextTestNumber)++
 }
 
 // Fail indicates that a test has failed.  This is typically only used when the
@@ -105,7 +113,7 @@ func (t *T) Check(function interface{}, description string) {
 
 // Count returns the number of tests completed so far.
 func (t *T) Count() int {
-	return t.nextTestNumber - 1
+	return *t.nextTestNumber - 1
 }
 
 // AutoPlan generates a test plan based on the number of tests that were run.
@@ -117,6 +125,21 @@ func escapeNewlines(s string) string {
 	return strings.Replace(strings.TrimRight(s, "\n"), "\n", "\n# ", -1)
 }
 
+// Todo returns copy of the test-state with TODO set.
+func (t *T) Todo() *T {
+	newT := *t
+	newT.TODO = true
+	return &newT
+}
+
+// Skip indicates that a test has been skipped.
+func (t *T) Skip(count int, description string) {
+	for i := 0; i < count; i++ {
+		t.printf("ok %d # SKIP %s\n", *t.nextTestNumber, description)
+		(*t.nextTestNumber)++
+	}
+}
+
 // Diagnostic generates a diagnostic from the message,
 // which may span multiple lines.
 func (t *T) Diagnostic(message string) {

util/tap/test/skip/main.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"bytes"
+	"io"
+	"os"
+
+	tap "github.com/mndrix/tap-go"
+)
+
+func main() {
+	// collect output for comparison later
+	buf := new(bytes.Buffer)
+	t := tap.New()
+	t.Writer = io.MultiWriter(os.Stdout, buf)
+
+	t.Header(4)
+	t.Skip(1, "insufficient flogiston pressure")
+	t.Skip(2, "no /sys directory")
+
+	got := buf.String()
+	t.Ok(got == expected, "skip gave expected output")
+}
+
+const expected = `TAP version 13
+1..4
+ok 1 # SKIP insufficient flogiston pressure
+ok 2 # SKIP no /sys directory
+ok 3 # SKIP no /sys directory
+`

util/tap/test/todo/main.go

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"bytes"
+	"io"
+	"os"
+
+	tap "github.com/mndrix/tap-go"
+)
+
+func main() {
+	// collect output for comparison later
+	buf := new(bytes.Buffer)
+	t := tap.New()
+	t.Writer = io.MultiWriter(os.Stdout, buf)
+
+	t.Header(6)
+	t.TODO = true
+	t.Ok(false, "using Ok(false, ...) in TODO mode")
+	t.Fail("using Fail(...) in TODO mode")
+	t.TODO = false
+	t.Ok(true, "using Ok(false, ...) after leaving TODO mode")
+
+	t.Todo().Fail("using Fail(...) in TODO mode with method chaining")
+	t.Pass("using Pass(...) after Todo method chaining")
+
+	got := buf.String()
+	t.Ok(got == expected, "TODO gave expected output")
+}
+
+const expected = `TAP version 13
+1..6
+not ok 1 # TODO using Ok(false, ...) in TODO mode
+not ok 2 # TODO using Fail(...) in TODO mode
+ok 3 - using Ok(false, ...) after leaving TODO mode
+not ok 4 # TODO using Fail(...) in TODO mode with method chaining
+ok 5 - using Pass(...) after Todo method chaining
+`