@@ -2,8 +2,8 @@ package httptest
22
33import (
44 "encoding/json"
5- "testing"
65 "net/http"
6+ "testing"
77)
88
99// ---------------------------------------------------------------------------
@@ -30,23 +30,23 @@ func TestMatchHeader(t *testing.T) {
3030 cases := []caseMatchHeader {
3131 {
3232 expected : http.Header {"a" : {"a1" }, "b" : {"b1" , "b2" }},
33- real : http.Header {"c" : {"c1" }, "a" : {"a1" }, "b" : {"b1" , "b2" }, "d" : {"d1" }},
34- ok : true ,
33+ real : http.Header {"c" : {"c1" }, "a" : {"a1" }, "b" : {"b1" , "b2" }, "d" : {"d1" }},
34+ ok : true ,
3535 },
3636 {
3737 expected : http.Header {"a" : {"a1" }, "b" : {"b1" , "b2" }},
38- real : http.Header {"c" : {"c1" }, "a" : {"a1" }, "b" : {"b1" }, "d" : {"d1" }},
39- message : "unmatched response header: b" ,
38+ real : http.Header {"c" : {"c1" }, "a" : {"a1" }, "b" : {"b1" }, "d" : {"d1" }},
39+ message : "unmatched response header: b" ,
4040 },
4141 {
4242 expected : http.Header {"a" : {"a1" }, "b" : {"b1" , "b2" }},
43- real : http.Header {"c" : {"c1" }, "a" : {"a1" }, "d" : {"d1" }},
44- message : "unmatched response header: b" ,
43+ real : http.Header {"c" : {"c1" }, "a" : {"a1" }, "d" : {"d1" }},
44+ message : "unmatched response header: b" ,
4545 },
4646 {
4747 expected : http.Header {},
48- real : http.Header {"c" : {"c1" }, "a" : {"a1" }, "d" : {"d1" }},
49- ok : true ,
48+ real : http.Header {"c" : {"c1" }, "a" : {"a1" }, "d" : {"d1" }},
49+ ok : true ,
5050 },
5151 }
5252 for _ , c := range cases {
@@ -72,73 +72,73 @@ func TestMatchBody(t *testing.T) {
7272
7373 cases := []caseMatchBody {
7474 {
75- expBody : `` ,
76- expBodyType : "application/json" ,
77- respBody : `` ,
75+ expBody : `` ,
76+ expBodyType : "application/json" ,
77+ respBody : `` ,
7878 respBodyType : "application/json" ,
79- ok : true ,
79+ ok : true ,
8080 },
8181 {
82- expBody : `abc` ,
83- expBodyType : "" ,
84- respBody : `abc` ,
82+ expBody : `abc` ,
83+ expBodyType : "" ,
84+ respBody : `abc` ,
8585 respBodyType : "application/json" ,
86- ok : true ,
86+ ok : true ,
8787 },
8888 {
89- expBody : `abc` ,
90- expBodyType : "application/text" ,
91- respBody : `abc` ,
89+ expBody : `abc` ,
90+ expBodyType : "application/text" ,
91+ respBody : `abc` ,
9292 respBodyType : "application/text" ,
93- ok : true ,
93+ ok : true ,
9494 },
9595 {
96- expBody : `abc` ,
97- expBodyType : "application/text" ,
98- respBody : `abc` ,
96+ expBody : `abc` ,
97+ expBodyType : "application/text" ,
98+ respBody : `abc` ,
9999 respBodyType : "application/json" ,
100- message : "unmatched Content-Type" ,
100+ message : "unmatched Content-Type" ,
101101 },
102102 {
103- expBody : `{}` ,
104- expBodyType : "application/json" ,
105- respBody : `{ }` ,
103+ expBody : `{}` ,
104+ expBodyType : "application/json" ,
105+ respBody : `{ }` ,
106106 respBodyType : "application/json" ,
107- ok : true ,
107+ ok : true ,
108108 },
109109 {
110- expBody : `{}` ,
111- expBodyType : "application/json" ,
112- respBody : `{"aaa": "123"}` ,
110+ expBody : `{}` ,
111+ expBodyType : "application/json" ,
112+ respBody : `{"aaa": "123"}` ,
113113 respBodyType : "application/json" ,
114- ok : true ,
114+ ok : true ,
115115 },
116116 {
117- expBody : `{"a": "a1", "b": ["b1", "b2"]}` ,
118- expBodyType : "application/json" ,
119- respBody : `{"c": 1, "a": "a1", "b": ["b1", "b2"], "d": 2.0}` ,
117+ expBody : `{"a": "a1", "b": ["b1", "b2"]}` ,
118+ expBodyType : "application/json" ,
119+ respBody : `{"c": 1, "a": "a1", "b": ["b1", "b2"], "d": 2.0}` ,
120120 respBodyType : "application/json" ,
121- ok : true ,
121+ ok : true ,
122122 },
123123 {
124- expBody : `{"a": "a1", "b": ["b1", "b2"]}` ,
125- expBodyType : "application/json" ,
126- respBody : `{"c": 1, "a": "a1", "d": 2.0}` ,
124+ expBody : `{"a": "a1", "b": ["b1", "b2"]}` ,
125+ expBodyType : "application/json" ,
126+ respBody : `{"c": 1, "a": "a1", "d": 2.0}` ,
127127 respBodyType : "application/json" ,
128- message : "unmatched json response body - field b" ,
128+ message : "unmatched json response body - field b" ,
129129 },
130130 {
131- expBody : `{"a": "a1", "b": ["b1", "b2"]}` ,
132- expBodyType : "application/json" ,
133- respBody : `{"c": 1, "a": "a1", "b": [1], "d": 2.0}` ,
131+ expBody : `{"a": "a1", "b": ["b1", "b2"]}` ,
132+ expBodyType : "application/json" ,
133+ respBody : `{"c": 1, "a": "a1", "b": [1], "d": 2.0}` ,
134134 respBodyType : "application/json" ,
135- message : "unmatched json response body - field b" ,
135+ message : "unmatched json response body - field b" ,
136136 },
137137 }
138138 for _ , c := range cases {
139139 resp := & Response {
140140 RawBody : []byte (c .respBody ),
141- Header : make (http.Header ),
141+ Header : make (http.Header ),
142142 }
143143 if c .respBodyType != "" {
144144 resp .BodyType = c .respBodyType
@@ -157,4 +157,3 @@ func TestMatchBody(t *testing.T) {
157157}
158158
159159// ---------------------------------------------------------------------------
160-
0 commit comments