Some small reorg to clean things up.

Oneledger · May 16, 2014 · 23702f4 · 23702f4
1 parent 1d45db7
commit 23702f4
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,5 @@ install:
   - go get github.com/BurntSushi/toml-test
 script:
   - export PATH="$PATH:$HOME/gopath/bin"
-  - go test -v
-  - toml-test toml-test-go
-  - toml-test -encoder toml-test-encoder
+  - make test
 
diff --git a/Makefile b/Makefile
@@ -1,5 +1,10 @@
 install:
-	go install
+	go install ./...
+
+test:
+	go test -v
+	toml-test toml-test-decoder
+	toml-test -encoder toml-test-encoder
 
 fmt:
 	gofmt -w *.go */*.go

diff --git a/toml-test-encoder/COPYING → cmd/toml-test-decoder/COPYING b/toml-test-encoder/COPYING → cmd/toml-test-decoder/COPYING
diff --git a/toml-test-go/README.md → cmd/toml-test-decoder/README.md b/toml-test-go/README.md → cmd/toml-test-decoder/README.md
diff --git a/toml-test-go/main.go → cmd/toml-test-decoder/main.go b/toml-test-go/main.go → cmd/toml-test-decoder/main.go
diff --git a/toml-test-go/COPYING → cmd/toml-test-encoder/COPYING b/toml-test-go/COPYING → cmd/toml-test-encoder/COPYING
diff --git a/toml-test-encoder/README.md → cmd/toml-test-encoder/README.md b/toml-test-encoder/README.md → cmd/toml-test-encoder/README.md
diff --git a/toml-test-encoder/main.go → cmd/toml-test-encoder/main.go b/toml-test-encoder/main.go → cmd/toml-test-encoder/main.go
diff --git a/tomlv/COPYING → cmd/tomlv/COPYING b/tomlv/COPYING → cmd/tomlv/COPYING
diff --git a/tomlv/README.md → cmd/tomlv/README.md b/tomlv/README.md → cmd/tomlv/README.md
diff --git a/tomlv/main.go → cmd/tomlv/main.go b/tomlv/main.go → cmd/tomlv/main.go
diff --git a/decode_test.go b/decode_test.go
@@ -51,17 +51,10 @@ type simple struct {
 func TestDecode(t *testing.T) {
 	var val simple
 
-	md, err := Decode(testSimple, &val)
+	_, err := Decode(testSimple, &val)
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	testf("Is 'Annoying.Cats.plato' defined? %v\n",
-		md.IsDefined("Annoying", "Cats", "plato"))
-	testf("Is 'Cats.Stinky' defined? %v\n", md.IsDefined("Cats", "Stinky"))
-	testf("Type of 'colors'? %s\n\n", md.Type("colors"))
-
-	testf("%v\n", val)
 }
 
 func TestDecodeEmbedded(t *testing.T) {

diff --git a/encode_test.go b/encode_test.go
@@ -74,7 +74,8 @@ func TestEncode(t *testing.T) {
 			wantOutput: fmt.Sprintf("Date = %s", dateStr),
 		},
 		"datetime field as primitive": {
-			// Using a map here to fail if isStructOrMap() returns true for time.Time.
+			// Using a map here to fail if isStructOrMap() returns true for
+			// time.Time.
 			input: map[string]interface{}{
 				"Date": date,
 				"Int":  1,
@@ -98,7 +99,8 @@ func TestEncode(t *testing.T) {
 			input: struct{ DatetimeSlice []time.Time }{
 				[]time.Time{date, date},
 			},
-			wantOutput: fmt.Sprintf("DatetimeSlice = [%s, %s]", dateStr, dateStr),
+			wantOutput: fmt.Sprintf("DatetimeSlice = [%s, %s]",
+				dateStr, dateStr),
 		},
 		"nested arrays and slices": {
 			input: struct {

diff --git a/lex_test.go b/lex_test.go
@@ -54,6 +54,5 @@ func TestLexer(t *testing.T) {
 		} else if item.typ == itemError {
 			t.Fatal(item.val)
 		}
-		testf("%s\n", item)
 	}
 }
diff --git a/out_test.go b/out_test.go
diff --git a/parse_test.go b/parse_test.go
@@ -1,7 +1,6 @@
 package toml
 
 import (
-	"strings"
 	"testing"
 )
 
@@ -49,13 +48,10 @@ func TestParse(t *testing.T) {
 }
 
 func printMap(m map[string]interface{}, depth int) {
-	for k, v := range m {
-		testf("%s%s\n", strings.Repeat("  ", depth), k)
+	for _, v := range m {
 		switch subm := v.(type) {
 		case map[string]interface{}:
 			printMap(subm, depth+1)
-		default:
-			testf("%s%v\n", strings.Repeat("  ", depth+1), v)
 		}
 	}
 }