Omit package name in internal test failure output

internal_test.go

@@ -0,0 +1,66 @@
+package quicktest
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+	"testing"
+)
+
+func TestInternal(t *testing.T) {
+	tt := &testingT{}
+	c := New(tt)
+	c.Assert(internal{internal0{42}}, DeepEquals, internal{internal0{47}})
+
+	got := tt.fatalString()
+	// Quicktest package is not displayed in the failure output.
+	want := `
+got:
+  internal{
+      Int: internal0{Num:42},
+  }
+want:
+  internal{
+      Int: internal0{Num:47},
+  }
+`
+	if !strings.Contains(got, want) {
+		t.Fatalf(`
+got  %q
+want %q
+-------------------- got --------------------
+%s
+-------------------- want -------------------
+%s
+---------------------------------------------`, got, want, got, want)
+	}
+}
+
+type internal struct {
+	Int internal0
+}
+
+type internal0 struct {
+	Num int
+}
+
+// testingT can be passed to qt.New for testing purposes.
+type testingT struct {
+	testing.TB
+
+	fatalBuf bytes.Buffer
+}
+
+// Fatal overrides *testing.T.Fatal so that messages are collected and the
+// goroutine is not killed.
+func (t *testingT) Fatal(a ...interface{}) {
+	fmt.Fprint(&t.fatalBuf, a...)
+}
+
+// Helper implements testing.TB.Helper.
+func (t *testingT) Helper() {}
+
+// fatalString returns the fatal error message.
+func (t *testingT) fatalString() string {
+	return t.fatalBuf.String()
+}

report.go

@@ -67,6 +67,11 @@ func writeError(w io.Writer, err error, p reportParams) {
 	ptrs := make(map[string]interface{})
 	values := make(map[string]string)
 
+	pc, _, _, _ := runtime.Caller(4)
+	fn := runtime.FuncForPC(pc).Name()
+	pkg := fn[:strings.LastIndexByte(fn, '.')]
+	pkgPrefix := pkg[strings.LastIndexByte(pkg, '/')+1:] + "."
+
 	printPair := func(key string, value interface{}) {
 		fmt.Fprintln(w, key+":")
 		var v string
@@ -100,6 +105,12 @@ func writeError(w io.Writer, err error, p reportParams) {
 			}
 		}
 
+		// Check wether we can remove the package prefix from the output.
+		if pkgPath(value) == pkg && strings.HasPrefix(v, pkgPrefix) {
+			// TODO(frankban): This is best effort and suboptimal.
+			v = strings.ReplaceAll(v[len(pkgPrefix):], ": "+pkgPrefix, ": ")
+		}
+
 		values[v] = key
 		fmt.Fprint(w, prefixf(prefix, "%s", v))
 	}
@@ -246,3 +257,14 @@ type note struct {
 
 // prefix is the string used to indent blocks of output.
 const prefix = "  "
+
+func pkgPath(v interface{}) string {
+	if s, ok := v.(SuppressedIfLong); ok {
+		v = s.Value
+	}
+	t := reflect.TypeOf(v)
+	if t == nil {
+		return ""
+	}
+	return t.PkgPath()
+}