Integrated multiple file-based test suites (BurntSushi, iarna and my own) into the unit tests. BurntSushi's tests are also still supported using the test interface implementation from cmd/burntsushi-tester.

FIXME

@@ -1,2 +0,0 @@
-key-no-eol   I do accept "key1=1 key2=1". The spec does not deny that.
-

Makefile

@@ -1,11 +1,8 @@
-all: build
-
-build:
-	@(cd cmd/toml-test-decoder; go build)
-
 test:
 	@(cd ast; go test | grep -v ^PASS)
 	@(cd parse; go test | grep -v ^PASS)
 
-sushi-test: build
-	@(cd cmd/toml-test-decoder; go build; ${GOPATH}/bin/toml-test ./toml-test-decoder)
+test-sushi:
+	@(cd cmd/burntsushi-tester; go build)
+	@echo -n "BurntSushi tests: "
+	@(cd cmd/burntsushi-tester && ${GOPATH}/bin/toml-test ./burntsushi-tester)

ast/burntsushi.go

@@ -1,86 +1,61 @@
-// Command toml-test-decoder satisfies BurntSushi's toml-test interface for testing
-// TOML decoders. Namely, it accepts TOML on stdin and outputs JSON on stdout.
-// See: https://github.com/BurntSushi/toml-test
-package main
+package ast
 
 import (
-	"flag"
+	"encoding/json"
 	"fmt"
-	"log"
-	"os"
-	"path"
 	"sort"
 	"strings"
 	"time"
-
-	"git.makaay.nl/mauricem/go-toml/ast"
-	"git.makaay.nl/mauricem/go-toml/parse"
 )
 
-func init() {
-	log.SetFlags(0)
-
-	flag.Usage = usage
-	flag.Parse()
+// MakeSushi generates a JSON string for an ast Table, which is compatible
+// with BurntSushi's TOML testing tool (https://github.com/BurntSushi/toml-test)
+func (t Table) MakeSushi() string {
+	return MakeSushi(NewValue(TypeTable, t))
 }
 
-func usage() {
-	log.Printf("Usage: %s < toml-file\n", path.Base(os.Args[0]))
-	flag.PrintDefaults()
-
-	os.Exit(1)
-}
-
-func main() {
-	if flag.NArg() != 0 {
-		flag.Usage()
-	}
-
-	toml, err := parse.Run(os.Stdin)
-	if err != nil {
-		log.Fatalf("Error decoding TOML: %s", err)
-	} else {
-		sushi := makeSushi(ast.NewValue(ast.TypeTable, toml))
-		fmt.Println(sushi)
-	}
-}
-
-func makeSushi(value *ast.Value) string {
+// MakeSushi generates a JSON string for an ast Value, which is compatible
+// with BurntSushi's TOML testing tool (https://github.com/BurntSushi/toml-test)
+func MakeSushi(value *Value) string {
 	switch value.Type {
-	case ast.TypeString:
+	case TypeString:
 		return renderValue("string", value.Data[0].(string))
-	case ast.TypeInteger:
+	case TypeInteger:
 		return renderValue("integer", fmt.Sprintf("%d", value.Data[0].(int64)))
-	case ast.TypeFloat:
+	case TypeFloat:
 		return renderValue("float", fmt.Sprintf("%v", value.Data[0].(float64)))
-	case ast.TypeBool:
+	case TypeBool:
 		return renderValue("bool", fmt.Sprintf("%t", value.Data[0].(bool)))
-	case ast.TypeOffsetDateTime:
+	case TypeOffsetDateTime:
 		return renderValue("datetime", value.Data[0].(time.Time).Format(time.RFC3339Nano))
-	case ast.TypeLocalDateTime:
+	case TypeLocalDateTime:
 		return renderValue("local_datetime", value.Data[0].(time.Time).Format("2006-01-02 15:04:05.999999999"))
-	case ast.TypeLocalDate:
+	case TypeLocalDate:
 		return renderValue("local_date", value.Data[0].(time.Time).Format("2006-01-02"))
-	case ast.TypeLocalTime:
+	case TypeLocalTime:
 		return renderValue("local_time", value.Data[0].(time.Time).Format("15:04:05.999999999"))
-	case ast.TypeArrayOfTables:
+	case TypeArrayOfTables:
 		fallthrough
-	case ast.TypeArray:
+	case TypeArray:
+		// BurntSushi's tests sees [ {inline: "table"}, {array: "definitions"} ]
+		// as an array of tables, so here we accomodate for that situation
+		// by checking for that case and render such inline array definition
+		// as if it were an [[array.of.tables]].
 		values := make([]string, len(value.Data))
 		isArrayOfTables := false
 		for i, value := range value.Data {
-			isArrayOfTables = value.(*ast.Value).Type == ast.TypeTable
-			values[i] = makeSushi(value.(*ast.Value))
+			isArrayOfTables = value.(*Value).Type == TypeTable
+			values[i] = MakeSushi(value.(*Value))
 		}
 		if isArrayOfTables {
 			return fmt.Sprintf("[%s]", strings.Join(values, ", "))
 		} else {
 			return fmt.Sprintf(`{"type": "array", "value": [%s]}`, strings.Join(values, ", "))
 		}
-	case ast.TypeImplicitTable:
+	case TypeImplicitTable:
 		fallthrough
-	case ast.TypeTable:
-		pairs := value.Data[0].(ast.Table)
+	case TypeTable:
+		pairs := value.Data[0].(Table)
 		keys := make([]string, len(pairs))
 		i := 0
 		for k := range pairs {
@@ -90,7 +65,7 @@ func makeSushi(value *ast.Value) string {
 		sort.Strings(keys)
 		values := make([]string, len(pairs))
 		for i, k := range keys {
-			values[i] = fmt.Sprintf("%q: %s", k, makeSushi(pairs[k]))
+			values[i] = fmt.Sprintf("%q: %s", k, MakeSushi(pairs[k]))
 		}
 		return fmt.Sprintf("{%s}", strings.Join(values, ", "))
 	default:
@@ -99,5 +74,13 @@ func makeSushi(value *ast.Value) string {
 }
 
 func renderValue(t string, v string) string {
-	return fmt.Sprintf("{%q: %q, %q: %q}", "type", t, "value", v)
+	return fmt.Sprintf("{%q: %q, %q: %s}", "type", t, "value", toJSON(v))
+}
+
+func toJSON(s string) string {
+	j, err := json.Marshal(s)
+	if err != nil {
+		panic(fmt.Sprintf("unable to JSON encode %q: %s", s, err))
+	}
+	return string(j)
 }

cmd/burntsushi-tester/main.go

@@ -0,0 +1,41 @@
+// Command burntsushi-tester satisfies BurntSushi's toml-test interface for testing
+// TOML decoders. Namely, it accepts TOML on stdin and outputs JSON on stdout.
+// See: https://github.com/BurntSushi/toml-test
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"path"
+
+	"git.makaay.nl/mauricem/go-toml/parse"
+)
+
+func init() {
+	log.SetFlags(0)
+
+	flag.Usage = usage
+	flag.Parse()
+}
+
+func usage() {
+	log.Printf("Usage: %s < <path to TOML-file>\n", path.Base(os.Args[0]))
+	flag.PrintDefaults()
+
+	os.Exit(1)
+}
+
+func main() {
+	if flag.NArg() != 0 {
+		flag.Usage()
+	}
+
+	toml, err := parse.Run(os.Stdin)
+	if err != nil {
+		log.Fatalf("Error decoding TOML: %s", err)
+	} else {
+		fmt.Println(toml.MakeSushi())
+	}
+}

parse/testfiles/REAMDE.md

@@ -0,0 +1,11 @@
+## Test suites
+
+This folder holds test suites for testing the TOML parser.
+Besides tests that I defined myself, there are also tests that were imported
+from other test suites:
+
+* https://github.com/BurntSushi/toml-test/tree/master/tests
+* https://github.com/iarna/toml-spec-tests
+
+In only used the .toml files from these test sets and created my own .json
+files. They are compatible with the BurntSushi's test format.

parse/testfiles/invalid/BurntSushi/array-mixed-types-arrays-and-ints.toml

@@ -0,0 +1 @@
+arrays-and-ints =  [1, ["Arrays are not integers."]]

parse/testfiles/invalid/BurntSushi/array-mixed-types-ints-and-floats.toml

@@ -0,0 +1 @@
+ints-and-floats = [1, 1.1]

parse/testfiles/invalid/BurntSushi/array-mixed-types-strings-and-ints.toml

@@ -0,0 +1 @@
+strings-and-ints = ["hi", 42]

parse/testfiles/invalid/BurntSushi/datetime-malformed-no-leads.toml

@@ -0,0 +1 @@
+no-leads = 1987-7-05T17:45:00Z

parse/testfiles/invalid/BurntSushi/datetime-malformed-no-secs.toml

@@ -0,0 +1 @@
+no-secs = 1987-07-05T17:45Z

parse/testfiles/invalid/BurntSushi/datetime-malformed-no-t.toml

@@ -0,0 +1 @@
+no-t = 1987-07-0517:45:00Z

parse/testfiles/invalid/BurntSushi/datetime-malformed-with-milli.toml

@@ -0,0 +1 @@
+with-milli = 1987-07-5T17:45:00.12Z

parse/testfiles/invalid/BurntSushi/duplicate-key-table.toml

@@ -0,0 +1,5 @@
+[fruit]
+type = "apple"
+
+[fruit.type]
+apple = "yes"

parse/testfiles/invalid/BurntSushi/duplicate-keys.toml

@@ -0,0 +1,2 @@
+dupe = false
+dupe = true

parse/testfiles/invalid/BurntSushi/duplicate-tables.toml

@@ -0,0 +1,2 @@
+[a]
+[a]

parse/testfiles/invalid/BurntSushi/empty-implicit-table.toml

@@ -0,0 +1 @@
+[naughty..naughty]

parse/testfiles/invalid/BurntSushi/empty-table.toml

@@ -0,0 +1 @@
+[]

parse/testfiles/invalid/BurntSushi/float-leading-zero-neg.toml

@@ -0,0 +1 @@
+leading-zero = -03.14

parse/testfiles/invalid/BurntSushi/float-leading-zero-pos.toml

@@ -0,0 +1 @@
+leading-zero = +03.14

parse/testfiles/invalid/BurntSushi/float-leading-zero.toml

@@ -0,0 +1 @@
+leading-zero = 03.14

parse/testfiles/invalid/BurntSushi/float-no-leading-zero.toml

@@ -0,0 +1,2 @@
+answer = .12345
+neganswer = -.12345

parse/testfiles/invalid/BurntSushi/float-no-trailing-digits.toml

@@ -0,0 +1,2 @@
+answer = 1.
+neganswer = -1.

parse/testfiles/invalid/BurntSushi/float-underscore-after-point.toml

@@ -0,0 +1 @@
+bad = 1._2

parse/testfiles/invalid/BurntSushi/float-underscore-after.toml

@@ -0,0 +1 @@
+bad = 1.2_

parse/testfiles/invalid/BurntSushi/float-underscore-before-point.toml

@@ -0,0 +1 @@
+bad = 1_.2

parse/testfiles/invalid/BurntSushi/float-underscore-before.toml

@@ -0,0 +1 @@
+bad = _1.2

parse/testfiles/invalid/BurntSushi/inline-table-linebreak.toml

@@ -0,0 +1,2 @@
+simple = { a = 1 
+}

parse/testfiles/invalid/BurntSushi/integer-leading-zero-neg.toml

@@ -0,0 +1 @@
+leading-zero = -012

parse/testfiles/invalid/BurntSushi/integer-leading-zero-pos.toml

@@ -0,0 +1 @@
+leading-zero = +012

parse/testfiles/invalid/BurntSushi/integer-leading-zero.toml

@@ -0,0 +1 @@
+leading-zero = 012

parse/testfiles/invalid/BurntSushi/integer-underscore-after.toml

@@ -0,0 +1 @@
+bad = 123_

parse/testfiles/invalid/BurntSushi/integer-underscore-before.toml

@@ -0,0 +1 @@
+bad = _123

parse/testfiles/invalid/BurntSushi/integer-underscore-double.toml

@@ -0,0 +1 @@
+bad = 1__23

parse/testfiles/invalid/BurntSushi/key-after-array.toml

@@ -0,0 +1 @@
+[[agencies]] owner = "S Cjelli"

parse/testfiles/invalid/BurntSushi/key-after-table.toml

@@ -0,0 +1 @@
+[error] this = "should not be here"

parse/testfiles/invalid/BurntSushi/key-empty.toml

@@ -0,0 +1 @@
+ = 1

parse/testfiles/invalid/BurntSushi/key-hash.toml

@@ -0,0 +1 @@
+a# = 1

parse/testfiles/invalid/BurntSushi/key-newline.toml

@@ -0,0 +1,2 @@
+a
+= 1

parse/testfiles/invalid/BurntSushi/key-no-eol.toml

@@ -0,0 +1 @@
+a = 1 b = 2

parse/testfiles/invalid/BurntSushi/key-open-bracket.toml

@@ -0,0 +1 @@
+[abc = 1

parse/testfiles/invalid/BurntSushi/key-single-open-bracket.toml

@@ -0,0 +1 @@
+[

parse/testfiles/invalid/BurntSushi/key-space.toml

@@ -0,0 +1 @@
+a b = 1

parse/testfiles/invalid/BurntSushi/key-start-bracket.toml

@@ -0,0 +1,3 @@
+[a]
+[xyz = 5
+[b]

parse/testfiles/invalid/BurntSushi/key-two-equals.toml

@@ -0,0 +1 @@
+key= = 1

parse/testfiles/invalid/BurntSushi/llbrace.toml

@@ -0,0 +1 @@
+[ [table]]

parse/testfiles/invalid/BurntSushi/multi-line-inline-table.toml

@@ -0,0 +1,4 @@
+json_like = {
+          first = "Tom",
+          last = "Preston-Werner"
+}

parse/testfiles/invalid/BurntSushi/rrbrace.toml

@@ -0,0 +1 @@
+[[table] ]

parse/testfiles/invalid/BurntSushi/string-bad-byte-escape.toml

@@ -0,0 +1 @@
+naughty = "\xAg"

parse/testfiles/invalid/BurntSushi/string-bad-codepoint.toml

@@ -0,0 +1 @@
+invalid-codepoint = "This string contains a non scalar unicode codepoint \uD801"

parse/testfiles/invalid/BurntSushi/string-bad-escape.toml

@@ -0,0 +1 @@
+invalid-escape = "This string has a bad \a escape character."

parse/testfiles/invalid/BurntSushi/string-bad-slash-escape.toml

@@ -0,0 +1 @@
+invalid-escape = "This string has a bad \/ escape character."

parse/testfiles/invalid/BurntSushi/string-bad-uni-esc.toml

@@ -0,0 +1 @@
+str = "val\ue"

parse/testfiles/invalid/BurntSushi/string-byte-escapes.toml

@@ -0,0 +1 @@
+answer = "\x33"

parse/testfiles/invalid/BurntSushi/string-no-close.toml

@@ -0,0 +1 @@
+no-ending-quote = "One time, at band camp

parse/testfiles/invalid/BurntSushi/table-array-implicit.toml

@@ -0,0 +1,14 @@
+# This test is a bit tricky. It should fail because the first use of
+# `[[albums.songs]]` without first declaring `albums` implies that `albums`
+# must be a table. The alternative would be quite weird. Namely, it wouldn't
+# comply with the TOML spec: "Each double-bracketed sub-table will belong to 
+# the most *recently* defined table element *above* it."
+#
+# This is in contrast to the *valid* test, table-array-implicit where
+# `[[albums.songs]]` works by itself, so long as `[[albums]]` isn't declared
+# later. (Although, `[albums]` could be.)
+[[albums.songs]]
+name = "Glory Days"
+
+[[albums]]
+name = "Born in the USA"

parse/testfiles/invalid/BurntSushi/table-array-malformed-bracket.toml

@@ -0,0 +1,2 @@
+[[albums]
+name = "Born to Run"

parse/testfiles/invalid/BurntSushi/table-array-malformed-empty.toml

@@ -0,0 +1,2 @@
+[[]]
+name = "Born to Run"

parse/testfiles/invalid/BurntSushi/table-empty.toml

@@ -0,0 +1 @@
+[]

parse/testfiles/invalid/BurntSushi/table-nested-brackets-close.toml

@@ -0,0 +1,2 @@
+[a]b]
+zyx = 42

parse/testfiles/invalid/BurntSushi/table-nested-brackets-open.toml

@@ -0,0 +1,2 @@
+[a[b]
+zyx = 42

parse/testfiles/invalid/BurntSushi/table-whitespace.toml

@@ -0,0 +1 @@
+[invalid key]

parse/testfiles/invalid/BurntSushi/table-with-pound.toml

@@ -0,0 +1,2 @@
+[key#group]
+answer = 42

parse/testfiles/invalid/BurntSushi/text-after-array-entries.toml

@@ -0,0 +1,4 @@
+array = [
+  "Is there life after an array separator?", No
+  "Entry"
+]

parse/testfiles/invalid/BurntSushi/text-after-integer.toml

@@ -0,0 +1 @@
+answer = 42 the ultimate answer?

parse/testfiles/invalid/BurntSushi/text-after-string.toml

@@ -0,0 +1 @@
+string = "Is there life after strings?" No.

parse/testfiles/invalid/BurntSushi/text-after-table.toml

@@ -0,0 +1 @@
+[error] this shouldn't be here

parse/testfiles/invalid/BurntSushi/text-before-array-separator.toml

@@ -0,0 +1,4 @@
+array = [
+  "Is there life before an array separator?" No,
+  "Entry"
+]

parse/testfiles/invalid/BurntSushi/text-in-array.toml

@@ -0,0 +1,5 @@
+array = [
+  "Entry 1",
+  I don't belong,
+  "Entry 2",
+]

parse/testfiles/invalid/iarna/array-7.toml

@@ -0,0 +1 @@
+arr6 = [ 1, 2.0 ] # INVALID

parse/testfiles/invalid/iarna/array-of-tables-1.toml

@@ -0,0 +1,4 @@
+# INVALID TOML DOC
+fruit = []
+
+[[fruit]] # Not allowed

parse/testfiles/invalid/iarna/array-of-tables-2.toml

@@ -0,0 +1,10 @@
+# INVALID TOML DOC
+[[fruit]]
+  name = "apple"
+
+  [[fruit.variety]]
+    name = "red delicious"
+
+  # This table conflicts with the previous table
+  [fruit.variety]
+    name = "granny smith"

parse/testfiles/invalid/iarna/bare-key-1.toml

@@ -0,0 +1 @@
+bare!key = 123

parse/testfiles/invalid/iarna/bare-key-2.toml

@@ -0,0 +1,2 @@
+barekey
+   = 123

parse/testfiles/invalid/iarna/bare-key-3.toml

@@ -0,0 +1 @@
+barekey =

parse/testfiles/invalid/iarna/int-0-padded.toml

@@ -0,0 +1 @@
+int = 0123

parse/testfiles/invalid/iarna/key-value-pair-1.toml

@@ -0,0 +1 @@
+key = # INVALID

parse/testfiles/invalid/iarna/multiple-dot-key.toml

@@ -0,0 +1,3 @@
+# THIS IS INVALID
+a.b = 1
+a.b.c = 2

parse/testfiles/invalid/iarna/multiple-key.toml

@@ -0,0 +1,3 @@
+# DO NOT DO THIS
+name = "Tom"
+name = "Pradyun"

parse/testfiles/invalid/iarna/no-key-name.toml

@@ -0,0 +1 @@
+= "no key name"  # INVALID

parse/testfiles/invalid/iarna/string-basic-control-2.toml

@@ -0,0 +1 @@
+a = "null"

parse/testfiles/invalid/iarna/string-basic-control-3.toml

@@ -0,0 +1 @@
+a = "null"

parse/testfiles/invalid/iarna/string-basic-control-4.toml

@@ -0,0 +1 @@
+a = "null"

parse/testfiles/invalid/iarna/string-basic-multiline-control-2.toml

@@ -0,0 +1 @@
+a = """null"""

parse/testfiles/invalid/iarna/string-basic-multiline-control-3.toml

@@ -0,0 +1 @@
+a = """null"""

parse/testfiles/invalid/iarna/string-basic-multiline-control-4.toml

@@ -0,0 +1 @@
+a = """null"""

parse/testfiles/invalid/iarna/string-basic-multiline-out-of-range-unicode-escape-1.toml

@@ -0,0 +1 @@
+a = """\UFFFFFFFF"""

parse/testfiles/invalid/iarna/string-basic-multiline-out-of-range-unicode-escape-2.toml

@@ -0,0 +1 @@
+a = """\U00D80000"""

parse/testfiles/invalid/iarna/string-basic-multiline-unknown-escape.toml

@@ -0,0 +1 @@
+a = """\@"""

parse/testfiles/invalid/iarna/string-basic-out-of-range-unicode-escape-1.toml

@@ -0,0 +1 @@
+a = "\UFFFFFFFF"

parse/testfiles/invalid/iarna/string-basic-out-of-range-unicode-escape-2.toml

@@ -0,0 +1 @@
+a = "\U00D80000"

parse/testfiles/invalid/iarna/string-basic-unknown-escape.toml

@@ -0,0 +1 @@
+a = "\@"

parse/testfiles/invalid/iarna/string-literal-control-2.toml

@@ -0,0 +1 @@
+a = 'null'

parse/testfiles/invalid/iarna/string-literal-control-3.toml

@@ -0,0 +1 @@
+a = 'null'

parse/testfiles/invalid/iarna/string-literal-control-4.toml

@@ -0,0 +1 @@
+a = 'null'

parse/testfiles/invalid/iarna/string-literal-multiline-control-2.toml

@@ -0,0 +1 @@
+a = '''null'''