@@ -2,8 +2,8 @@ package httptest
2
2
3
3
import (
4
4
"encoding/json"
5
- "testing"
6
5
"net/http"
6
+ "testing"
7
7
)
8
8
9
9
// ---------------------------------------------------------------------------
@@ -30,23 +30,23 @@ func TestMatchHeader(t *testing.T) {
30
30
cases := []caseMatchHeader {
31
31
{
32
32
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 ,
35
35
},
36
36
{
37
37
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" ,
40
40
},
41
41
{
42
42
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" ,
45
45
},
46
46
{
47
47
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 ,
50
50
},
51
51
}
52
52
for _ , c := range cases {
@@ -72,73 +72,73 @@ func TestMatchBody(t *testing.T) {
72
72
73
73
cases := []caseMatchBody {
74
74
{
75
- expBody : `` ,
76
- expBodyType : "application/json" ,
77
- respBody : `` ,
75
+ expBody : `` ,
76
+ expBodyType : "application/json" ,
77
+ respBody : `` ,
78
78
respBodyType : "application/json" ,
79
- ok : true ,
79
+ ok : true ,
80
80
},
81
81
{
82
- expBody : `abc` ,
83
- expBodyType : "" ,
84
- respBody : `abc` ,
82
+ expBody : `abc` ,
83
+ expBodyType : "" ,
84
+ respBody : `abc` ,
85
85
respBodyType : "application/json" ,
86
- ok : true ,
86
+ ok : true ,
87
87
},
88
88
{
89
- expBody : `abc` ,
90
- expBodyType : "application/text" ,
91
- respBody : `abc` ,
89
+ expBody : `abc` ,
90
+ expBodyType : "application/text" ,
91
+ respBody : `abc` ,
92
92
respBodyType : "application/text" ,
93
- ok : true ,
93
+ ok : true ,
94
94
},
95
95
{
96
- expBody : `abc` ,
97
- expBodyType : "application/text" ,
98
- respBody : `abc` ,
96
+ expBody : `abc` ,
97
+ expBodyType : "application/text" ,
98
+ respBody : `abc` ,
99
99
respBodyType : "application/json" ,
100
- message : "unmatched Content-Type" ,
100
+ message : "unmatched Content-Type" ,
101
101
},
102
102
{
103
- expBody : `{}` ,
104
- expBodyType : "application/json" ,
105
- respBody : `{ }` ,
103
+ expBody : `{}` ,
104
+ expBodyType : "application/json" ,
105
+ respBody : `{ }` ,
106
106
respBodyType : "application/json" ,
107
- ok : true ,
107
+ ok : true ,
108
108
},
109
109
{
110
- expBody : `{}` ,
111
- expBodyType : "application/json" ,
112
- respBody : `{"aaa": "123"}` ,
110
+ expBody : `{}` ,
111
+ expBodyType : "application/json" ,
112
+ respBody : `{"aaa": "123"}` ,
113
113
respBodyType : "application/json" ,
114
- ok : true ,
114
+ ok : true ,
115
115
},
116
116
{
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}` ,
120
120
respBodyType : "application/json" ,
121
- ok : true ,
121
+ ok : true ,
122
122
},
123
123
{
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}` ,
127
127
respBodyType : "application/json" ,
128
- message : "unmatched json response body - field b" ,
128
+ message : "unmatched json response body - field b" ,
129
129
},
130
130
{
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}` ,
134
134
respBodyType : "application/json" ,
135
- message : "unmatched json response body - field b" ,
135
+ message : "unmatched json response body - field b" ,
136
136
},
137
137
}
138
138
for _ , c := range cases {
139
139
resp := & Response {
140
140
RawBody : []byte (c .respBody ),
141
- Header : make (http.Header ),
141
+ Header : make (http.Header ),
142
142
}
143
143
if c .respBodyType != "" {
144
144
resp .BodyType = c .respBodyType
@@ -157,4 +157,3 @@ func TestMatchBody(t *testing.T) {
157
157
}
158
158
159
159
// ---------------------------------------------------------------------------
160
-
0 commit comments