From 5ce3ca69fa6e3c7db69914f4ccb26ac9bf71cbd3 Mon Sep 17 00:00:00 2001
From: Richard Musiol <mail@richard-musiol.de>
Date: Mon, 7 Nov 2016 12:33:18 +0100
Subject: [PATCH] testing: proper error on invalid ExpectedResult

---
 testing.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/testing.go b/testing.go
index 6b2258fc0b..a97d595e04 100644
--- a/testing.go
+++ b/testing.go
@@ -40,17 +40,15 @@ func RunTest(t *testing.T, test *Test) {
 		t.Fatal(err)
 	}
 
-	want := formatJSON([]byte(test.ExpectedResult))
+	var v interface{}
+	if err := json.Unmarshal([]byte(test.ExpectedResult), &v); err != nil {
+		t.Fatalf("invalid JSON for ExpectedResult: %s", err)
+	}
+	want, _ := json.Marshal(v)
+
 	if !bytes.Equal(got, want) {
 		t.Logf("want: %s", want)
 		t.Logf("got:  %s", got)
 		t.Fail()
 	}
 }
-
-func formatJSON(data []byte) []byte {
-	var v interface{}
-	json.Unmarshal(data, &v)
-	b, _ := json.Marshal(v)
-	return b
-}