Fix serialization on tip

uber-go · May 10, 2016 · a27f35a · a27f35a
1 parent ea309a4
commit a27f35a
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/json_encoder_test.go b/json_encoder_test.go
@@ -22,6 +22,7 @@ package zap
 
 import (
 	"bytes"
+	"errors"
 	"io"
 	"math"
 	"strings"
@@ -45,6 +46,12 @@ func withJSONEncoder(f func(*jsonEncoder)) {
 	enc.Free()
 }
 
+type noJSON struct{}
+
+func (nj noJSON) MarshalJSON() ([]byte, error) {
+	return nil, errors.New("no")
+}
+
 func TestJSONAddString(t *testing.T) {
 	withJSONEncoder(func(enc *jsonEncoder) {
 		enc.AddString("baz", "bing")
@@ -177,8 +184,12 @@ func TestJSONAddObject(t *testing.T) {
 	})
 
 	withJSONEncoder(func(enc *jsonEncoder) {
-		enc.AddObject("nested", map[int]string{42: "yes"})
-		assertJSON(t, `"foo":"bar","nested":"json: unsupported type: map[int]string"`, enc)
+		enc.AddObject("nested", noJSON{})
+		assertJSON(
+			t,
+			`"foo":"bar","nested":"json: error calling MarshalJSON for type zap.noJSON: no"`,
+			enc,
+		)
 	})
 }