Skip to content

Commit bfeec80

Browse files
cyprisscypriss
committed
REFACTOR: Get rid of the last of gocheck. Write a proper assertResponse method.
1 parent d0cee89 commit bfeec80

File tree

4 files changed

+85
-97
lines changed

4 files changed

+85
-97
lines changed

‎error_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ func TestNoErrorHandler(t *testing.T) {
2121

2222
rw, req := newTestRequest("GET", "/action")
2323
router.ServeHTTP(rw, req)
24-
assertResponseT(t, rw, "Application Error", http.StatusInternalServerError)
24+
assertResponse(t, rw, "Application Error", http.StatusInternalServerError)
2525

2626
rw, req = newTestRequest("GET", "/admin/action")
2727
router.ServeHTTP(rw, req)
28-
assertResponseT(t, rw, "Application Error", http.StatusInternalServerError)
28+
assertResponse(t, rw, "Application Error", http.StatusInternalServerError)
2929
}
3030

3131
func TestHandlerOnRoot(t *testing.T) {
@@ -38,11 +38,11 @@ func TestHandlerOnRoot(t *testing.T) {
3838

3939
rw, req := newTestRequest("GET", "/action")
4040
router.ServeHTTP(rw, req)
41-
assertResponseT(t, rw, "My Error", http.StatusInternalServerError)
41+
assertResponse(t, rw, "My Error", http.StatusInternalServerError)
4242

4343
rw, req = newTestRequest("GET", "/admin/action")
4444
router.ServeHTTP(rw, req)
45-
assertResponseT(t, rw, "My Error", http.StatusInternalServerError)
45+
assertResponse(t, rw, "My Error", http.StatusInternalServerError)
4646
}
4747

4848
func TestContextlessError(t *testing.T) {
@@ -56,11 +56,11 @@ func TestContextlessError(t *testing.T) {
5656
rw, req := newTestRequest("GET", "/action")
5757
router.ServeHTTP(rw, req)
5858
assert.Equal(t, http.StatusInternalServerError, rw.Code)
59-
assertResponseT(t, rw, "Contextless Error", http.StatusInternalServerError)
59+
assertResponse(t, rw, "Contextless Error", http.StatusInternalServerError)
6060

6161
rw, req = newTestRequest("GET", "/admin/action")
6262
router.ServeHTTP(rw, req)
63-
assertResponseT(t, rw, "Contextless Error", http.StatusInternalServerError)
63+
assertResponse(t, rw, "Contextless Error", http.StatusInternalServerError)
6464
}
6565

6666
func TestMultipleErrorHandlers(t *testing.T) {
@@ -74,11 +74,11 @@ func TestMultipleErrorHandlers(t *testing.T) {
7474

7575
rw, req := newTestRequest("GET", "/action")
7676
router.ServeHTTP(rw, req)
77-
assertResponseT(t, rw, "My Error", http.StatusInternalServerError)
77+
assertResponse(t, rw, "My Error", http.StatusInternalServerError)
7878

7979
rw, req = newTestRequest("GET", "/admin/action")
8080
router.ServeHTTP(rw, req)
81-
assertResponseT(t, rw, "Admin Error", http.StatusInternalServerError)
81+
assertResponse(t, rw, "Admin Error", http.StatusInternalServerError)
8282
}
8383

8484
func TestMultipleErrorHandlers2(t *testing.T) {
@@ -95,15 +95,15 @@ func TestMultipleErrorHandlers2(t *testing.T) {
9595

9696
rw, req := newTestRequest("GET", "/action")
9797
router.ServeHTTP(rw, req)
98-
assertResponseT(t, rw, "Application Error", http.StatusInternalServerError)
98+
assertResponse(t, rw, "Application Error", http.StatusInternalServerError)
9999

100100
rw, req = newTestRequest("GET", "/admin/action")
101101
router.ServeHTTP(rw, req)
102-
assertResponseT(t, rw, "Admin Error", http.StatusInternalServerError)
102+
assertResponse(t, rw, "Admin Error", http.StatusInternalServerError)
103103

104104
rw, req = newTestRequest("GET", "/api/action")
105105
router.ServeHTTP(rw, req)
106-
assertResponseT(t, rw, "Api Error", http.StatusInternalServerError)
106+
assertResponse(t, rw, "Api Error", http.StatusInternalServerError)
107107
}
108108

109109
func TestRootMiddlewarePanic(t *testing.T) {
@@ -116,7 +116,7 @@ func TestRootMiddlewarePanic(t *testing.T) {
116116

117117
rw, req := newTestRequest("GET", "/admin/action")
118118
router.ServeHTTP(rw, req)
119-
assertResponseT(t, rw, "My Error", 500)
119+
assertResponse(t, rw, "My Error", 500)
120120
}
121121

122122
func TestNonRootMiddlewarePanic(t *testing.T) {
@@ -129,7 +129,7 @@ func TestNonRootMiddlewarePanic(t *testing.T) {
129129

130130
rw, req := newTestRequest("GET", "/admin/action")
131131
router.ServeHTTP(rw, req)
132-
assertResponseT(t, rw, "Admin Error", 500)
132+
assertResponse(t, rw, "Admin Error", 500)
133133
}
134134

135135
func TestConsistentContext(t *testing.T) {
@@ -141,5 +141,5 @@ func TestConsistentContext(t *testing.T) {
141141

142142
rw, req := newTestRequest("GET", "/admin/foo")
143143
router.ServeHTTP(rw, req)
144-
assertResponseT(t, rw, "My Secondary Error", 500)
144+
assertResponse(t, rw, "My Secondary Error", 500)
145145
}

‎middleware_test.go

+36-40
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ package web
22

33
import (
44
"fmt"
5-
. "launchpad.net/gocheck"
5+
"testing"
66
)
77

8-
type MiddlewareTestSuite struct{}
9-
10-
var _ = Suite(&MiddlewareTestSuite{})
11-
128
func (c *Context) A(w ResponseWriter, r *Request) {
139
fmt.Fprintf(w, "context-A")
1410
}
@@ -73,36 +69,36 @@ func mwGenricInterface(ctx interface{}, w ResponseWriter, r *Request, next NextM
7369
next(w, r)
7470
}
7571

76-
func (s *MiddlewareTestSuite) TestFlatNoMiddleware(c *C) {
72+
func TestFlatNoMiddleware(t *testing.T) {
7773
router := New(Context{})
7874
router.Get("/action", (*Context).A)
7975
router.Get("/action_z", (*Context).Z)
8076

8177
rw, req := newTestRequest("GET", "/action")
8278
router.ServeHTTP(rw, req)
83-
assertResponse(c, rw, "context-A", 200)
79+
assertResponse(t, rw, "context-A", 200)
8480

8581
rw, req = newTestRequest("GET", "/action_z")
8682
router.ServeHTTP(rw, req)
87-
assertResponse(c, rw, "context-Z", 200)
83+
assertResponse(t, rw, "context-Z", 200)
8884
}
8985

90-
func (s *MiddlewareTestSuite) TestFlatOneMiddleware(c *C) {
86+
func TestFlatOneMiddleware(t *testing.T) {
9187
router := New(Context{})
9288
router.Middleware((*Context).mwAlpha)
9389
router.Get("/action", (*Context).A)
9490
router.Get("/action_z", (*Context).Z)
9591

9692
rw, req := newTestRequest("GET", "/action")
9793
router.ServeHTTP(rw, req)
98-
assertResponse(c, rw, "context-mw-Alpha context-A", 200)
94+
assertResponse(t, rw, "context-mw-Alpha context-A", 200)
9995

10096
rw, req = newTestRequest("GET", "/action_z")
10197
router.ServeHTTP(rw, req)
102-
assertResponse(c, rw, "context-mw-Alpha context-Z", 200)
98+
assertResponse(t, rw, "context-mw-Alpha context-Z", 200)
10399
}
104100

105-
func (s *MiddlewareTestSuite) TestFlatTwoMiddleware(c *C) {
101+
func TestFlatTwoMiddleware(t *testing.T) {
106102
router := New(Context{})
107103
router.Middleware((*Context).mwAlpha)
108104
router.Middleware((*Context).mwBeta)
@@ -111,14 +107,14 @@ func (s *MiddlewareTestSuite) TestFlatTwoMiddleware(c *C) {
111107

112108
rw, req := newTestRequest("GET", "/action")
113109
router.ServeHTTP(rw, req)
114-
assertResponse(c, rw, "context-mw-Alpha context-mw-Beta context-A", 200)
110+
assertResponse(t, rw, "context-mw-Alpha context-mw-Beta context-A", 200)
115111

116112
rw, req = newTestRequest("GET", "/action_z")
117113
router.ServeHTTP(rw, req)
118-
assertResponse(c, rw, "context-mw-Alpha context-mw-Beta context-Z", 200)
114+
assertResponse(t, rw, "context-mw-Alpha context-mw-Beta context-Z", 200)
119115
}
120116

121-
func (s *MiddlewareTestSuite) TestDualTree(c *C) {
117+
func TestDualTree(t *testing.T) {
122118
router := New(Context{})
123119
router.Middleware((*Context).mwAlpha)
124120
router.Get("/action", (*Context).A)
@@ -131,18 +127,18 @@ func (s *MiddlewareTestSuite) TestDualTree(c *C) {
131127

132128
rw, req := newTestRequest("GET", "/action")
133129
router.ServeHTTP(rw, req)
134-
assertResponse(c, rw, "context-mw-Alpha context-A", 200)
130+
assertResponse(t, rw, "context-mw-Alpha context-A", 200)
135131

136132
rw, req = newTestRequest("GET", "/admin/action")
137133
router.ServeHTTP(rw, req)
138-
assertResponse(c, rw, "context-mw-Alpha admin-mw-Epsilon admin-B", 200)
134+
assertResponse(t, rw, "context-mw-Alpha admin-mw-Epsilon admin-B", 200)
139135

140136
rw, req = newTestRequest("GET", "/api/action")
141137
router.ServeHTTP(rw, req)
142-
assertResponse(c, rw, "context-mw-Alpha api-mw-Delta api-C", 200)
138+
assertResponse(t, rw, "context-mw-Alpha api-mw-Delta api-C", 200)
143139
}
144140

145-
func (s *MiddlewareTestSuite) TestDualLeaningLeftTree(c *C) {
141+
func TestDualLeaningLeftTree(t *testing.T) {
146142
router := New(Context{})
147143
router.Get("/action", (*Context).A)
148144
admin := router.Subrouter(AdminContext{}, "/admin")
@@ -153,18 +149,18 @@ func (s *MiddlewareTestSuite) TestDualLeaningLeftTree(c *C) {
153149

154150
rw, req := newTestRequest("GET", "/action")
155151
router.ServeHTTP(rw, req)
156-
assertResponse(c, rw, "context-A", 200)
152+
assertResponse(t, rw, "context-A", 200)
157153

158154
rw, req = newTestRequest("GET", "/admin/action")
159155
router.ServeHTTP(rw, req)
160-
assertResponse(c, rw, "admin-B", 200)
156+
assertResponse(t, rw, "admin-B", 200)
161157

162158
rw, req = newTestRequest("GET", "/api/action")
163159
router.ServeHTTP(rw, req)
164-
assertResponse(c, rw, "api-mw-Delta api-C", 200)
160+
assertResponse(t, rw, "api-mw-Delta api-C", 200)
165161
}
166162

167-
func (s *MiddlewareTestSuite) TestTicketsA(c *C) {
163+
func TestTicketsA(t *testing.T) {
168164
router := New(Context{})
169165
admin := router.Subrouter(AdminContext{}, "/admin")
170166
admin.Middleware((*AdminContext).mwEpsilon)
@@ -173,10 +169,10 @@ func (s *MiddlewareTestSuite) TestTicketsA(c *C) {
173169

174170
rw, req := newTestRequest("GET", "/admin/tickets/action")
175171
router.ServeHTTP(rw, req)
176-
assertResponse(c, rw, "admin-mw-Epsilon tickets-D", 200)
172+
assertResponse(t, rw, "admin-mw-Epsilon tickets-D", 200)
177173
}
178174

179-
func (s *MiddlewareTestSuite) TestTicketsB(c *C) {
175+
func TestTicketsB(t *testing.T) {
180176
router := New(Context{})
181177
admin := router.Subrouter(AdminContext{}, "/admin")
182178
tickets := admin.Subrouter(TicketsContext{}, "/tickets")
@@ -185,10 +181,10 @@ func (s *MiddlewareTestSuite) TestTicketsB(c *C) {
185181

186182
rw, req := newTestRequest("GET", "/admin/tickets/action")
187183
router.ServeHTTP(rw, req)
188-
assertResponse(c, rw, "tickets-mw-Eta tickets-D", 200)
184+
assertResponse(t, rw, "tickets-mw-Eta tickets-D", 200)
189185
}
190186

191-
func (s *MiddlewareTestSuite) TestTicketsC(c *C) {
187+
func TestTicketsC(t *testing.T) {
192188
router := New(Context{})
193189
router.Middleware((*Context).mwAlpha)
194190
admin := router.Subrouter(AdminContext{}, "/admin")
@@ -197,10 +193,10 @@ func (s *MiddlewareTestSuite) TestTicketsC(c *C) {
197193

198194
rw, req := newTestRequest("GET", "/admin/tickets/action")
199195
router.ServeHTTP(rw, req)
200-
assertResponse(c, rw, "context-mw-Alpha tickets-D", 200)
196+
assertResponse(t, rw, "context-mw-Alpha tickets-D", 200)
201197
}
202198

203-
func (s *MiddlewareTestSuite) TestTicketsD(c *C) {
199+
func TestTicketsD(t *testing.T) {
204200
router := New(Context{})
205201
router.Middleware((*Context).mwAlpha)
206202
admin := router.Subrouter(AdminContext{}, "/admin")
@@ -210,10 +206,10 @@ func (s *MiddlewareTestSuite) TestTicketsD(c *C) {
210206

211207
rw, req := newTestRequest("GET", "/admin/tickets/action")
212208
router.ServeHTTP(rw, req)
213-
assertResponse(c, rw, "context-mw-Alpha tickets-mw-Eta tickets-D", 200)
209+
assertResponse(t, rw, "context-mw-Alpha tickets-mw-Eta tickets-D", 200)
214210
}
215211

216-
func (s *MiddlewareTestSuite) TestTicketsE(c *C) {
212+
func TestTicketsE(t *testing.T) {
217213
router := New(Context{})
218214
router.Middleware((*Context).mwAlpha)
219215
router.Middleware((*Context).mwBeta)
@@ -227,20 +223,20 @@ func (s *MiddlewareTestSuite) TestTicketsE(c *C) {
227223

228224
rw, req := newTestRequest("GET", "/admin/tickets/action")
229225
router.ServeHTTP(rw, req)
230-
assertResponse(c, rw, "context-mw-Alpha context-mw-Beta context-mw-Gamma admin-mw-Epsilon admin-mw-Zeta tickets-mw-Eta tickets-D", 200)
226+
assertResponse(t, rw, "context-mw-Alpha context-mw-Beta context-mw-Gamma admin-mw-Epsilon admin-mw-Zeta tickets-mw-Eta tickets-D", 200)
231227
}
232228

233-
func (s *MiddlewareTestSuite) TestNoNext(c *C) {
229+
func TestNoNext(t *testing.T) {
234230
router := New(Context{})
235231
router.Middleware((*Context).mwNoNext)
236232
router.Get("/action", (*Context).A)
237233

238234
rw, req := newTestRequest("GET", "/action")
239235
router.ServeHTTP(rw, req)
240-
assertResponse(c, rw, "context-mw-NoNext", 200)
236+
assertResponse(t, rw, "context-mw-NoNext", 200)
241237
}
242238

243-
func (s *MiddlewareTestSuite) TestSameContext(c *C) {
239+
func TestSameContext(t *testing.T) {
244240
router := New(Context{})
245241
router.Middleware((*Context).mwAlpha).
246242
Middleware((*Context).mwBeta)
@@ -250,25 +246,25 @@ func (s *MiddlewareTestSuite) TestSameContext(c *C) {
250246

251247
rw, req := newTestRequest("GET", "/admin/foo")
252248
router.ServeHTTP(rw, req)
253-
assertResponse(c, rw, "context-mw-Alpha context-mw-Beta context-mw-Gamma context-A", 200)
249+
assertResponse(t, rw, "context-mw-Alpha context-mw-Beta context-mw-Gamma context-A", 200)
254250
}
255251

256-
func (s *MiddlewareTestSuite) TestSameNamespace(c *C) {
252+
func TestSameNamespace(t *testing.T) {
257253
router := New(Context{})
258254
admin := router.Subrouter(AdminContext{}, "/")
259255
admin.Get("/action", (*AdminContext).B)
260256

261257
rw, req := newTestRequest("GET", "/action")
262258
router.ServeHTTP(rw, req)
263-
assertResponse(c, rw, "admin-B", 200)
259+
assertResponse(t, rw, "admin-B", 200)
264260
}
265261

266-
func (s *MiddlewareTestSuite) TestInterfaceMiddleware(c *C) {
262+
func TestInterfaceMiddleware(t *testing.T) {
267263
router := New(Context{})
268264
router.Middleware(mwGenricInterface)
269265
router.Get("/action", (*Context).A)
270266

271267
rw, req := newTestRequest("GET", "/action")
272268
router.ServeHTTP(rw, req)
273-
assertResponse(c, rw, "context-mw-Interface context-A", 200)
269+
assertResponse(t, rw, "context-mw-Interface context-A", 200)
274270
}

0 commit comments

Comments
 (0)