@@ -2,7 +2,6 @@ package jsonrpc_test
22
33import (
44 "bytes"
5- "context"
65 "net/http"
76 "net/http/httptest"
87 "testing"
@@ -16,7 +15,7 @@ import (
1615func TestParseRequest (t * testing.T ) {
1716 t .Parallel ()
1817
19- r , rerr := http .NewRequestWithContext (context . Background (), "" , "" , bytes .NewReader (nil ))
18+ r , rerr := http .NewRequestWithContext (t . Context (), "" , "" , bytes .NewReader (nil ))
2019 require .NoError (t , rerr )
2120
2221 _ , _ , err := jsonrpc .ParseRequest (r )
@@ -28,23 +27,23 @@ func TestParseRequest(t *testing.T) {
2827 require .IsType (t , & jsonrpc.Error {}, err )
2928 assert .Equal (t , jsonrpc .ErrorCodeInvalidRequest , err .Code )
3029
31- r , rerr = http .NewRequestWithContext (context . Background (), "" , "" , bytes .NewReader ([]byte ("" )))
30+ r , rerr = http .NewRequestWithContext (t . Context (), "" , "" , bytes .NewReader ([]byte ("" )))
3231 require .NoError (t , rerr )
3332
3433 r .Header .Set ("Content-Type" , "application/json" )
3534 _ , _ , err = jsonrpc .ParseRequest (r )
3635 require .IsType (t , & jsonrpc.Error {}, err )
3736 assert .Equal (t , jsonrpc .ErrorCodeInvalidRequest , err .Code )
3837
39- r , rerr = http .NewRequestWithContext (context . Background (), "" , "" , bytes .NewReader ([]byte ("test" )))
38+ r , rerr = http .NewRequestWithContext (t . Context (), "" , "" , bytes .NewReader ([]byte ("test" )))
4039 require .NoError (t , rerr )
4140
4241 r .Header .Set ("Content-Type" , "application/json" )
4342 _ , _ , err = jsonrpc .ParseRequest (r )
4443 require .IsType (t , & jsonrpc.Error {}, err )
4544 assert .Equal (t , jsonrpc .ErrorCodeParse , err .Code )
4645
47- r , rerr = http .NewRequestWithContext (context . Background (), "" , "" , bytes .NewReader ([]byte ("{}" )))
46+ r , rerr = http .NewRequestWithContext (t . Context (), "" , "" , bytes .NewReader ([]byte ("{}" )))
4847 require .NoError (t , rerr )
4948
5049 r .Header .Set ("Content-Type" , "application/json" )
@@ -53,23 +52,23 @@ func TestParseRequest(t *testing.T) {
5352 require .NotEmpty (t , rs )
5453 assert .False (t , batch )
5554
56- r , rerr = http .NewRequestWithContext (context . Background (), "" , "" , bytes .NewReader ([]byte ("[" )))
55+ r , rerr = http .NewRequestWithContext (t . Context (), "" , "" , bytes .NewReader ([]byte ("[" )))
5756 require .NoError (t , rerr )
5857
5958 r .Header .Set ("Content-Type" , "application/json" )
6059 _ , _ , err = jsonrpc .ParseRequest (r )
6160 require .IsType (t , & jsonrpc.Error {}, err )
6261 assert .Equal (t , jsonrpc .ErrorCodeParse , err .Code )
6362
64- r , rerr = http .NewRequestWithContext (context . Background (), "" , "" , bytes .NewReader ([]byte ("[test]" )))
63+ r , rerr = http .NewRequestWithContext (t . Context (), "" , "" , bytes .NewReader ([]byte ("[test]" )))
6564 require .NoError (t , rerr )
6665
6766 r .Header .Set ("Content-Type" , "application/json" )
6867 _ , _ , err = jsonrpc .ParseRequest (r )
6968 require .IsType (t , & jsonrpc.Error {}, err )
7069 assert .Equal (t , jsonrpc .ErrorCodeParse , err .Code )
7170
72- r , rerr = http .NewRequestWithContext (context . Background (), "" , "" , bytes .NewReader ([]byte ("[{}]" )))
71+ r , rerr = http .NewRequestWithContext (t . Context (), "" , "" , bytes .NewReader ([]byte ("[{}]" )))
7372 require .NoError (t , rerr )
7473
7574 r .Header .Set ("Content-Type" , "application/json" )
@@ -113,18 +112,18 @@ func TestSendResponse(t *testing.T) {
113112 rec = httptest .NewRecorder ()
114113 err = jsonrpc .SendResponse (rec , []* jsonrpc.Response {r }, false )
115114 require .NoError (t , err )
116- assert .Equal (t , `{"jsonrpc":"2.0","result":{"name":"john"},"id":"test"}
115+ assert .JSONEq (t , `{"jsonrpc":"2.0","result":{"name":"john"},"id":"test"}
117116` , rec .Body .String ())
118117
119118 rec = httptest .NewRecorder ()
120119 err = jsonrpc .SendResponse (rec , []* jsonrpc.Response {r }, true )
121120 require .NoError (t , err )
122- assert .Equal (t , `[{"jsonrpc":"2.0","result":{"name":"john"},"id":"test"}]
121+ assert .JSONEq (t , `[{"jsonrpc":"2.0","result":{"name":"john"},"id":"test"}]
123122` , rec .Body .String ())
124123
125124 rec = httptest .NewRecorder ()
126125 err = jsonrpc .SendResponse (rec , []* jsonrpc.Response {r , r }, false )
127126 require .NoError (t , err )
128- assert .Equal (t , `[{"jsonrpc":"2.0","result":{"name":"john"},"id":"test"},{"jsonrpc":"2.0","result":{"name":"john"},"id":"test"}]
127+ assert .JSONEq (t , `[{"jsonrpc":"2.0","result":{"name":"john"},"id":"test"},{"jsonrpc":"2.0","result":{"name":"john"},"id":"test"}]
129128` , rec .Body .String ())
130129}
0 commit comments