- Fixed printer test problems introduced by gofmting the file.
- Print variable values in a style closer to Go variable definitions.
diff --git a/Makefile b/Makefile
index 082e8d8..f468275 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
GOFMT=gofmt -spaces=true -tabwidth=4 -tabindent=false
-BADFMT=$(shell $(GOFMT) -l $(GOFILES) $(wildcard *_test.go))
+BADFMT=$(shell $(GOFMT) -l $(GOFILES) $(filter-out printer_test.go,$(wildcard *_test.go)))
gofmt: $(BADFMT)
@for F in $(BADFMT); do $(GOFMT) -w $$F && echo $$F; done
diff --git a/fixture_test.go b/fixture_test.go
index 217bc64..ee39c10 100644
--- a/fixture_test.go
+++ b/fixture_test.go
@@ -405,8 +405,8 @@
"FixtureCheckHelper\\.SetUpSuite\n\n"+
"fixture_test\\.go:[0-9]+:\n"+
" c\\.Check\\(false, Equals, true\\)\n"+
- "\\.+ obtained = \\(bool\\) false\n"+
- "\\.+ expected = \\(bool\\) true\n\n")
+ "\\.+ obtained bool = false\n"+
+ "\\.+ expected bool = true\n\n")
c.Assert(helper.completed, Equals, true)
}
@@ -420,8 +420,8 @@
"FixtureCheckHelper\\.SetUpSuite\n\n"+
"fixture_test\\.go:[0-9]+:\n"+
" c\\.Assert\\(false, Equals, true\\)\n"+
- "\\.+ obtained = \\(bool\\) false\n"+
- "\\.+ expected = \\(bool\\) true\n\n")
+ "\\.+ obtained bool = false\n"+
+ "\\.+ expected bool = true\n\n")
c.Assert(helper.completed, Equals, false)
}
diff --git a/foundation_test.go b/foundation_test.go
index 8636b67..ec7464c 100644
--- a/foundation_test.go
+++ b/foundation_test.go
@@ -155,8 +155,8 @@
log := fmt.Sprintf(""+
"foundation_test.go:%d:\n"+
" result := c.Check\\(10, gocheck.Equals, 20\\)\n"+
- "\\.\\.\\. obtained = \\(int\\) 10\n"+
- "\\.\\.\\. expected = \\(int\\) 20\n\n",
+ "\\.\\.\\. obtained int = 10\n"+
+ "\\.\\.\\. expected int = 20\n\n",
getMyLine()+1)
result := c.Check(10, gocheck.Equals, 20)
checkState(c, result,
@@ -176,8 +176,8 @@
" result, line := checkEqualWrapper\\(c, 10, 20\\)\n"+
"gocheck_test.go:%d:\n"+
" return c.Check\\(obtained, gocheck.Equals, expected\\), getMyLine\\(\\)\n"+
- "\\.\\.\\. obtained = \\(int\\) 10\n"+
- "\\.\\.\\. expected = \\(int\\) 20\n\n",
+ "\\.\\.\\. obtained int = 10\n"+
+ "\\.\\.\\. expected int = 20\n\n",
testLine, line)
checkState(c, result,
&expectedState{
diff --git a/gocheck.go b/gocheck.go
index cca80db..23e7643 100644
--- a/gocheck.go
+++ b/gocheck.go
@@ -152,15 +152,18 @@
c.logf("... %#v", value)
}
} else if value == nil {
- c.logf("... %s (nil): nil", label)
+ c.logf("... %s = nil", label)
} else {
if v, ok := value.(hasString); ok {
- c.logf("... %s = (%s) %#v (%q)",
- label, reflect.Typeof(value).String(), value, v.String())
- } else {
- c.logf("... %s = (%s) %#v",
- label, reflect.Typeof(value).String(), value)
+ fv := fmt.Sprintf("%#v", value)
+ qv := fmt.Sprintf("%q", v.String())
+ if fv != qv {
+ c.logf("... %s %s = %s (%s)", label, reflect.Typeof(value).String(), fv, qv)
+ return
+ }
}
+ c.logf("... %s %s = %#v",
+ label, reflect.Typeof(value).String(), value)
}
}
diff --git a/helpers_test.go b/helpers_test.go
index 9068bb9..00dd4cd 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -98,8 +98,8 @@
checker := &MyChecker{failCheck: true}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" return c\\.Check\\(1, checker, 2\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n" +
- "\\.+ myexpected = \\(int\\) 2\n\n"
+ "\\.+ myobtained int = 1\n" +
+ "\\.+ myexpected int = 2\n\n"
testHelperFailure(c, "Check(1, checker, 2)", false, false, log,
func() interface{} {
return c.Check(1, checker, 2)
@@ -110,8 +110,8 @@
checker := &MyChecker{failCheck: true}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" return c\\.Check\\(1, checker, 2, myBug\\(\"Hello world!\"\\)\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n" +
- "\\.+ myexpected = \\(int\\) 2\n" +
+ "\\.+ myobtained int = 1\n" +
+ "\\.+ myexpected int = 2\n" +
"\\.+ Hello world!\n\n"
testHelperFailure(c, "Check(1, checker, 2, msg)", false, false, log,
func() interface{} {
@@ -123,7 +123,7 @@
checker := &MyChecker{failCheck: true, noExpectedValue: true}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" return c\\.Check\\(1, checker\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n\n"
+ "\\.+ myobtained int = 1\n\n"
testHelperFailure(c, "Check(1, checker)", false, false, log,
func() interface{} {
return c.Check(1, checker)
@@ -134,7 +134,7 @@
checker := &MyChecker{failCheck: true, noExpectedValue: true}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" return c\\.Check\\(1, checker, myBug\\(\"Hello world!\"\\)\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n" +
+ "\\.+ myobtained int = 1\n" +
"\\.+ Hello world!\n\n"
testHelperFailure(c, "Check(1, checker, msg)", false, false, log,
func() interface{} {
@@ -172,8 +172,8 @@
checker := &MyChecker{checkError: "Some not so cool data provided!"}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" return c\\.Check\\(1, checker, 2\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n" +
- "\\.+ myexpected = \\(int\\) 2\n" +
+ "\\.+ myobtained int = 1\n" +
+ "\\.+ myexpected int = 2\n" +
"\\.+ Some not so cool data provided!\n\n"
testHelperFailure(c, "Check(1, checker, 2)", false, false, log,
func() interface{} {
@@ -224,8 +224,8 @@
checker := &MyChecker{failCheck: true}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" c\\.Assert\\(1, checker, 2\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n" +
- "\\.+ myexpected = \\(int\\) 2\n\n"
+ "\\.+ myobtained int = 1\n" +
+ "\\.+ myexpected int = 2\n\n"
testHelperFailure(c, "Assert(1, checker, 2)", nil, true, log,
func() interface{} {
c.Assert(1, checker, 2)
@@ -237,8 +237,8 @@
checker := &MyChecker{failCheck: true}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" c\\.Assert\\(1, checker, 2, myBug\\(\"Hello world!\"\\)\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n" +
- "\\.+ myexpected = \\(int\\) 2\n" +
+ "\\.+ myobtained int = 1\n" +
+ "\\.+ myexpected int = 2\n" +
"\\.+ Hello world!\n\n"
testHelperFailure(c, "Assert(1, checker, 2, msg)", nil, true, log,
func() interface{} {
@@ -251,7 +251,7 @@
checker := &MyChecker{failCheck: true, noExpectedValue: true}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" c\\.Assert\\(1, checker\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n\n"
+ "\\.+ myobtained int = 1\n\n"
testHelperFailure(c, "Assert(1, checker)", nil, true, log,
func() interface{} {
c.Assert(1, checker)
@@ -263,7 +263,7 @@
checker := &MyChecker{failCheck: true, noExpectedValue: true}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" c\\.Assert\\(1, checker, myBug\\(\"Hello world!\"\\)\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n" +
+ "\\.+ myobtained int = 1\n" +
"\\.+ Hello world!\n\n"
testHelperFailure(c, "Assert(1, checker, msg)", nil, true, log,
func() interface{} {
@@ -290,8 +290,8 @@
checker := &MyChecker{checkError: "Some not so cool data provided!"}
log := "helpers_test\\.go:[0-9]+:.*\nhelpers_test\\.go:[0-9]+:\n" +
" c\\.Assert\\(1, checker, 2\\)\n" +
- "\\.+ myobtained = \\(int\\) 1\n" +
- "\\.+ myexpected = \\(int\\) 2\n" +
+ "\\.+ myobtained int = 1\n" +
+ "\\.+ myexpected int = 2\n" +
"\\.+ Some not so cool data provided!\n\n"
testHelperFailure(c, "Assert(1, checker, 2)", nil, true, log,
func() interface{} {
@@ -320,8 +320,8 @@
checker := &MyChecker{failCheck: true}
log := "helpers_test.go:[0-9]+:.*\nhelpers_test.go:[0-9]+:\n" +
" return c\\.Check\\(\\[\\]byte{1, 2}, checker, \\[\\]byte{1, 3}\\)\n" +
- "\\.+ myobtained = \\(\\[\\]uint8\\) \\[\\]byte{0x1, 0x2}\n" +
- "\\.+ myexpected = \\(\\[\\]uint8\\) \\[\\]byte{0x1, 0x3}\n\n"
+ "\\.+ myobtained \\[\\]uint8 = \\[\\]byte{0x1, 0x2}\n" +
+ "\\.+ myexpected \\[\\]uint8 = \\[\\]byte{0x1, 0x3}\n\n"
testHelperFailure(c, "Check([]byte{1}, chk, []byte{3})", false, false, log,
func() interface{} {
return c.Check([]byte{1, 2}, checker, []byte{1, 3})
diff --git a/printer_test.go b/printer_test.go
index 81e51c6..c4e9904 100644
--- a/printer_test.go
+++ b/printer_test.go
@@ -24,27 +24,22 @@
println(3)
}
switch 5 {
- case 6:
- println(6)
+ case 6: println(6)
println(7)
}
switch interface{}(9).(type) {
- case int:
- println(10)
+ case int: println(10)
println(11)
}
select {
- case <-(chan bool)(nil):
- println(14)
+ case <-(chan bool)(nil): println(14)
println(15)
- default:
- println(16)
+ default: println(16)
println(17)
}
println(19,
20)
- _ = func() {
- println(21)
+ _ = func() { println(21)
println(22)
}
println(24, func() {
