From bc7ffd7c1e1525928ac1c853a003eeb646324446 Mon Sep 17 00:00:00 2001 From: Craig Jackson Date: Sun, 27 Oct 2013 11:56:52 -0700 Subject: [PATCH] Fix test for deprecated JSON funcs. --- json_test.go | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/json_test.go b/json_test.go index b2e2e9a..f1b7e51 100644 --- a/json_test.go +++ b/json_test.go @@ -23,18 +23,10 @@ func TestJSON(t *testing.T) { expect.A = 1 expect.B = "hello" - if err := WriteJSON(wc, &expect); err != nil { - t.Fatal("write", err) - } - if err := wc.WriteJSON(&expect); err != nil { t.Fatal("write", err) } - if err := ReadJSON(rc, &expect); err != nil { - t.Fatal("read", err) - } - if err := rc.ReadJSON(&actual); err != nil { t.Fatal("read", err) } @@ -43,3 +35,29 @@ func TestJSON(t *testing.T) { t.Fatal("equal", actual, expect) } } + +func TestDeprecatedJSON(t *testing.T) { + var buf bytes.Buffer + c := fakeNetConn{&buf, &buf} + wc := newConn(c, true, 1024, 1024) + rc := newConn(c, false, 1024, 1024) + + var actual, expect struct { + A int + B string + } + expect.A = 1 + expect.B = "hello" + + if err := WriteJSON(wc, &expect); err != nil { + t.Fatal("write", err) + } + + if err := ReadJSON(rc, &actual); err != nil { + t.Fatal("read", err) + } + + if !reflect.DeepEqual(&actual, &expect) { + t.Fatal("equal", actual, expect) + } +}