test: change the error format to print "got" before "expectation"

Following CodeReviewComments on Go wiki about Useful Test Failures [1],
the common idiom here is that the actual value is printed first followed
by the expected value.

[1] https://github.com/golang/go/wiki/CodeReviewComments#useful-test-failures

1 files changed, 22 insertions, 24 deletions

diff --git a/lib/test/test.go b/lib/test/test.go
index 19ec4325..b48ab626 100644
--- a/lib/test/test.go
+++ b/lib/test/test.go
@@ -8,7 +8,6 @@
 package test
 
 import (
-	"os"
 	"reflect"
 	"runtime"
 	"testing"
@@ -40,41 +39,40 @@ func printStackTrace(t testing.TB, trace []byte) {
 // Assert will compare two interfaces: `exp` and `got` whether its same with
 // `equal` value.
 //
-// If comparison result is not same with `equal`, it will terminate the test
-// program.
+// If comparison result is not same with `equal`, it will print the result and
+// expectation and then terminate the test routine.
 //
 func Assert(t *testing.T, name string, exp, got interface{}, equal bool) {
-	if reflect.DeepEqual(exp, got) != equal {
-		trace := make([]byte, 1024)
-		runtime.Stack(trace, false)
+	if reflect.DeepEqual(exp, got) == equal {
+		return
+	}
 
-		printStackTrace(t, trace)
+	trace := make([]byte, 1024)
+	runtime.Stack(trace, false)
 
-		t.Fatalf(">>> Expecting %s,\n"+
-			"'%+v'\n"+
-			"     got,\n"+
-			"'%+v'\n", name, exp, got)
-		os.Exit(1)
-	}
+	printStackTrace(t, trace)
+
+	t.Fatalf(">>> Got %s:\n\t'%+v';\n"+
+		"     want:\n\t'%+v'\n", name, got, exp)
 }
 
 //
 // AssertBench will compare two interfaces: `exp` and `got` whether its same
 // with `equal` value.
 //
-// If comparison result is not same with `equal`, it will terminate the test
-// program.
+// If comparison result is not same with `equal`, it will print the result and
+// expectation and then terminate the test routine.
 //
 func AssertBench(b *testing.B, name string, exp, got interface{}, equal bool) {
-	if reflect.DeepEqual(exp, got) != equal {
-		trace := make([]byte, 1024)
-		runtime.Stack(trace, false)
+	if reflect.DeepEqual(exp, got) == equal {
+		return
+	}
 
-		printStackTrace(b, trace)
+	trace := make([]byte, 1024)
+	runtime.Stack(trace, false)
 
-		b.Fatalf("\n"+
-			">>> Expecting %s '%+v'\n"+
-			"    got '%+v'\n", name, exp, got)
-		os.Exit(1)
-	}
+	printStackTrace(b, trace)
+
+	b.Fatalf(">>> Got %s:\n\t'%+v';\n"+
+		"     want:\n\t'%+v'\n", name, got, exp)
 }