Skip to content

Commit 94153d1

Browse files
appleboyappleboy
authored
test: expose performRequest func (gin-gonic#3012)
1 parent 0136319 commit 94153d1

9 files changed

+115
-120
lines changed

‎context_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2036,8 +2036,8 @@ func TestRaceParamsContextCopy(t *testing.T) {
20362036
}(c.Copy(), c.Param("name"))
20372037
})
20382038
}
2039-
performRequest(router, "GET", "/name1/api")
2040-
performRequest(router, "GET", "/name2/api")
2039+
PerformRequest(router, "GET", "/name1/api")
2040+
PerformRequest(router, "GET", "/name2/api")
20412041
wg.Wait()
20422042
}
20432043

‎gin_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ func TestNoMethodWithoutGlobalHandlers(t *testing.T) {
395395
}
396396

397397
func TestRebuild404Handlers(t *testing.T) {
398-
399398
}
400399

401400
func TestNoMethodWithGlobalHandlers(t *testing.T) {
@@ -491,7 +490,7 @@ func TestEngineHandleContext(t *testing.T) {
491490
}
492491

493492
assert.NotPanics(t, func() {
494-
w := performRequest(r, "GET", "/")
493+
w := PerformRequest(r, "GET", "/")
495494
assert.Equal(t, 301, w.Code)
496495
})
497496
}
@@ -524,7 +523,7 @@ func TestEngineHandleContextManyReEntries(t *testing.T) {
524523
})
525524

526525
assert.NotPanics(t, func() {
527-
w := performRequest(r, "GET", "/"+strconv.Itoa(expectValue-1)) // include 0 value
526+
w := PerformRequest(r, "GET", "/"+strconv.Itoa(expectValue-1)) // include 0 value
528527
assert.Equal(t, 200, w.Code)
529528
assert.Equal(t, expectValue, w.Body.Len())
530529
})
@@ -636,7 +635,6 @@ func TestPrepareTrustedCIRDsWith(t *testing.T) {
636635
assert.Nil(t, r.trustedCIDRs)
637636
assert.Nil(t, err)
638637
}
639-
640638
}
641639

642640
func parseCIDR(cidr string) *net.IPNet {

‎githubapi_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func TestShouldBindUri(t *testing.T) {
302302
})
303303

304304
path, _ := exampleFromPath("/rest/:name/:id")
305-
w := performRequest(router, http.MethodGet, path)
305+
w := PerformRequest(router, http.MethodGet, path)
306306
assert.Equal(t, "ShouldBindUri test OK", w.Body.String())
307307
assert.Equal(t, http.StatusOK, w.Code)
308308
}
@@ -324,7 +324,7 @@ func TestBindUri(t *testing.T) {
324324
})
325325

326326
path, _ := exampleFromPath("/rest/:name/:id")
327-
w := performRequest(router, http.MethodGet, path)
327+
w := PerformRequest(router, http.MethodGet, path)
328328
assert.Equal(t, "BindUri test OK", w.Body.String())
329329
assert.Equal(t, http.StatusOK, w.Code)
330330
}
@@ -342,7 +342,7 @@ func TestBindUriError(t *testing.T) {
342342
})
343343

344344
path1, _ := exampleFromPath("/new/rest/:num")
345-
w1 := performRequest(router, http.MethodGet, path1)
345+
w1 := PerformRequest(router, http.MethodGet, path1)
346346
assert.Equal(t, http.StatusBadRequest, w1.Code)
347347
}
348348

@@ -358,7 +358,7 @@ func TestRaceContextCopy(t *testing.T) {
358358
go readWriteKeys(c.Copy())
359359
c.String(http.StatusOK, "run OK, no panics")
360360
})
361-
w := performRequest(router, http.MethodGet, "/test/copy/race")
361+
w := PerformRequest(router, http.MethodGet, "/test/copy/race")
362362
assert.Equal(t, "run OK, no panics", w.Body.String())
363363
}
364364

@@ -389,7 +389,7 @@ func TestGithubAPI(t *testing.T) {
389389

390390
for _, route := range githubAPI {
391391
path, values := exampleFromPath(route.path)
392-
w := performRequest(router, route.method, path)
392+
w := PerformRequest(router, route.method, path)
393393

394394
// TEST
395395
assert.Contains(t, w.Body.String(), "\"status\":\"good\"")

‎logger_test.go

+25-27
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestLogger(t *testing.T) {
3131
router.HEAD("/example", func(c *Context) {})
3232
router.OPTIONS("/example", func(c *Context) {})
3333

34-
performRequest(router, "GET", "/example?a=100")
34+
PerformRequest(router, "GET", "/example?a=100")
3535
assert.Contains(t, buffer.String(), "200")
3636
assert.Contains(t, buffer.String(), "GET")
3737
assert.Contains(t, buffer.String(), "/example")
@@ -41,43 +41,43 @@ func TestLogger(t *testing.T) {
4141
// like integration tests because they test the whole logging process rather
4242
// than individual functions. Im not sure where these should go.
4343
buffer.Reset()
44-
performRequest(router, "POST", "/example")
44+
PerformRequest(router, "POST", "/example")
4545
assert.Contains(t, buffer.String(), "200")
4646
assert.Contains(t, buffer.String(), "POST")
4747
assert.Contains(t, buffer.String(), "/example")
4848

4949
buffer.Reset()
50-
performRequest(router, "PUT", "/example")
50+
PerformRequest(router, "PUT", "/example")
5151
assert.Contains(t, buffer.String(), "200")
5252
assert.Contains(t, buffer.String(), "PUT")
5353
assert.Contains(t, buffer.String(), "/example")
5454

5555
buffer.Reset()
56-
performRequest(router, "DELETE", "/example")
56+
PerformRequest(router, "DELETE", "/example")
5757
assert.Contains(t, buffer.String(), "200")
5858
assert.Contains(t, buffer.String(), "DELETE")
5959
assert.Contains(t, buffer.String(), "/example")
6060

6161
buffer.Reset()
62-
performRequest(router, "PATCH", "/example")
62+
PerformRequest(router, "PATCH", "/example")
6363
assert.Contains(t, buffer.String(), "200")
6464
assert.Contains(t, buffer.String(), "PATCH")
6565
assert.Contains(t, buffer.String(), "/example")
6666

6767
buffer.Reset()
68-
performRequest(router, "HEAD", "/example")
68+
PerformRequest(router, "HEAD", "/example")
6969
assert.Contains(t, buffer.String(), "200")
7070
assert.Contains(t, buffer.String(), "HEAD")
7171
assert.Contains(t, buffer.String(), "/example")
7272

7373
buffer.Reset()
74-
performRequest(router, "OPTIONS", "/example")
74+
PerformRequest(router, "OPTIONS", "/example")
7575
assert.Contains(t, buffer.String(), "200")
7676
assert.Contains(t, buffer.String(), "OPTIONS")
7777
assert.Contains(t, buffer.String(), "/example")
7878

7979
buffer.Reset()
80-
performRequest(router, "GET", "/notfound")
80+
PerformRequest(router, "GET", "/notfound")
8181
assert.Contains(t, buffer.String(), "404")
8282
assert.Contains(t, buffer.String(), "GET")
8383
assert.Contains(t, buffer.String(), "/notfound")
@@ -95,7 +95,7 @@ func TestLoggerWithConfig(t *testing.T) {
9595
router.HEAD("/example", func(c *Context) {})
9696
router.OPTIONS("/example", func(c *Context) {})
9797

98-
performRequest(router, "GET", "/example?a=100")
98+
PerformRequest(router, "GET", "/example?a=100")
9999
assert.Contains(t, buffer.String(), "200")
100100
assert.Contains(t, buffer.String(), "GET")
101101
assert.Contains(t, buffer.String(), "/example")
@@ -105,43 +105,43 @@ func TestLoggerWithConfig(t *testing.T) {
105105
// like integration tests because they test the whole logging process rather
106106
// than individual functions. Im not sure where these should go.
107107
buffer.Reset()
108-
performRequest(router, "POST", "/example")
108+
PerformRequest(router, "POST", "/example")
109109
assert.Contains(t, buffer.String(), "200")
110110
assert.Contains(t, buffer.String(), "POST")
111111
assert.Contains(t, buffer.String(), "/example")
112112

113113
buffer.Reset()
114-
performRequest(router, "PUT", "/example")
114+
PerformRequest(router, "PUT", "/example")
115115
assert.Contains(t, buffer.String(), "200")
116116
assert.Contains(t, buffer.String(), "PUT")
117117
assert.Contains(t, buffer.String(), "/example")
118118

119119
buffer.Reset()
120-
performRequest(router, "DELETE", "/example")
120+
PerformRequest(router, "DELETE", "/example")
121121
assert.Contains(t, buffer.String(), "200")
122122
assert.Contains(t, buffer.String(), "DELETE")
123123
assert.Contains(t, buffer.String(), "/example")
124124

125125
buffer.Reset()
126-
performRequest(router, "PATCH", "/example")
126+
PerformRequest(router, "PATCH", "/example")
127127
assert.Contains(t, buffer.String(), "200")
128128
assert.Contains(t, buffer.String(), "PATCH")
129129
assert.Contains(t, buffer.String(), "/example")
130130

131131
buffer.Reset()
132-
performRequest(router, "HEAD", "/example")
132+
PerformRequest(router, "HEAD", "/example")
133133
assert.Contains(t, buffer.String(), "200")
134134
assert.Contains(t, buffer.String(), "HEAD")
135135
assert.Contains(t, buffer.String(), "/example")
136136

137137
buffer.Reset()
138-
performRequest(router, "OPTIONS", "/example")
138+
PerformRequest(router, "OPTIONS", "/example")
139139
assert.Contains(t, buffer.String(), "200")
140140
assert.Contains(t, buffer.String(), "OPTIONS")
141141
assert.Contains(t, buffer.String(), "/example")
142142

143143
buffer.Reset()
144-
performRequest(router, "GET", "/notfound")
144+
PerformRequest(router, "GET", "/notfound")
145145
assert.Contains(t, buffer.String(), "404")
146146
assert.Contains(t, buffer.String(), "GET")
147147
assert.Contains(t, buffer.String(), "/notfound")
@@ -169,7 +169,7 @@ func TestLoggerWithFormatter(t *testing.T) {
169169
)
170170
}))
171171
router.GET("/example", func(c *Context) {})
172-
performRequest(router, "GET", "/example?a=100")
172+
PerformRequest(router, "GET", "/example?a=100")
173173

174174
// output test
175175
assert.Contains(t, buffer.String(), "[FORMATTER TEST]")
@@ -209,7 +209,7 @@ func TestLoggerWithConfigFormatting(t *testing.T) {
209209
c.Request.Header.Set("X-Forwarded-For", "20.20.20.20")
210210
gotKeys = c.Keys
211211
})
212-
performRequest(router, "GET", "/example?a=100")
212+
PerformRequest(router, "GET", "/example?a=100")
213213

214214
// output test
215215
assert.Contains(t, buffer.String(), "[FORMATTER TEST]")
@@ -228,7 +228,6 @@ func TestLoggerWithConfigFormatting(t *testing.T) {
228228
assert.Equal(t, "/example?a=100", gotParam.Path)
229229
assert.Empty(t, gotParam.ErrorMessage)
230230
assert.Equal(t, gotKeys, gotParam.Keys)
231-
232231
}
233232

234233
func TestDefaultLogFormatter(t *testing.T) {
@@ -282,7 +281,6 @@ func TestDefaultLogFormatter(t *testing.T) {
282281

283282
assert.Equal(t, "[GIN] 2018/12/07 - 09:11:42 |\x1b[97;42m 200 \x1b[0m| 5s | 20.20.20.20 |\x1b[97;44m GET \x1b[0m \"/\"\n", defaultLogFormatter(termTrueParam))
284283
assert.Equal(t, "[GIN] 2018/12/07 - 09:11:42 |\x1b[97;42m 200 \x1b[0m| 2743h29m3s | 20.20.20.20 |\x1b[97;44m GET \x1b[0m \"/\"\n", defaultLogFormatter(termTrueLongDurationParam))
285-
286284
}
287285

288286
func TestColorForMethod(t *testing.T) {
@@ -369,15 +367,15 @@ func TestErrorLogger(t *testing.T) {
369367
c.String(http.StatusInternalServerError, "hola!")
370368
})
371369

372-
w := performRequest(router, "GET", "/error")
370+
w := PerformRequest(router, "GET", "/error")
373371
assert.Equal(t, http.StatusOK, w.Code)
374372
assert.Equal(t, "{\"error\":\"this is an error\"}", w.Body.String())
375373

376-
w = performRequest(router, "GET", "/abort")
374+
w = PerformRequest(router, "GET", "/abort")
377375
assert.Equal(t, http.StatusUnauthorized, w.Code)
378376
assert.Equal(t, "{\"error\":\"no authorized\"}", w.Body.String())
379377

380-
w = performRequest(router, "GET", "/print")
378+
w = PerformRequest(router, "GET", "/print")
381379
assert.Equal(t, http.StatusInternalServerError, w.Code)
382380
assert.Equal(t, "hola!{\"error\":\"this is an error\"}", w.Body.String())
383381
}
@@ -389,11 +387,11 @@ func TestLoggerWithWriterSkippingPaths(t *testing.T) {
389387
router.GET("/logged", func(c *Context) {})
390388
router.GET("/skipped", func(c *Context) {})
391389

392-
performRequest(router, "GET", "/logged")
390+
PerformRequest(router, "GET", "/logged")
393391
assert.Contains(t, buffer.String(), "200")
394392

395393
buffer.Reset()
396-
performRequest(router, "GET", "/skipped")
394+
PerformRequest(router, "GET", "/skipped")
397395
assert.Contains(t, buffer.String(), "")
398396
}
399397

@@ -407,11 +405,11 @@ func TestLoggerWithConfigSkippingPaths(t *testing.T) {
407405
router.GET("/logged", func(c *Context) {})
408406
router.GET("/skipped", func(c *Context) {})
409407

410-
performRequest(router, "GET", "/logged")
408+
PerformRequest(router, "GET", "/logged")
411409
assert.Contains(t, buffer.String(), "200")
412410

413411
buffer.Reset()
414-
performRequest(router, "GET", "/skipped")
412+
PerformRequest(router, "GET", "/skipped")
415413
assert.Contains(t, buffer.String(), "")
416414
}
417415

‎middleware_test.go

+8-9
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestMiddlewareGeneralCase(t *testing.T) {
3535
signature += " XX "
3636
})
3737
// RUN
38-
w := performRequest(router, "GET", "/")
38+
w := PerformRequest(router, "GET", "/")
3939

4040
// TEST
4141
assert.Equal(t, http.StatusOK, w.Code)
@@ -71,7 +71,7 @@ func TestMiddlewareNoRoute(t *testing.T) {
7171
signature += " X "
7272
})
7373
// RUN
74-
w := performRequest(router, "GET", "/")
74+
w := PerformRequest(router, "GET", "/")
7575

7676
// TEST
7777
assert.Equal(t, http.StatusNotFound, w.Code)
@@ -108,7 +108,7 @@ func TestMiddlewareNoMethodEnabled(t *testing.T) {
108108
signature += " XX "
109109
})
110110
// RUN
111-
w := performRequest(router, "GET", "/")
111+
w := PerformRequest(router, "GET", "/")
112112

113113
// TEST
114114
assert.Equal(t, http.StatusMethodNotAllowed, w.Code)
@@ -149,7 +149,7 @@ func TestMiddlewareNoMethodDisabled(t *testing.T) {
149149
})
150150

151151
// RUN
152-
w := performRequest(router, "GET", "/")
152+
w := PerformRequest(router, "GET", "/")
153153

154154
// TEST
155155
assert.Equal(t, http.StatusNotFound, w.Code)
@@ -175,7 +175,7 @@ func TestMiddlewareAbort(t *testing.T) {
175175
})
176176

177177
// RUN
178-
w := performRequest(router, "GET", "/")
178+
w := PerformRequest(router, "GET", "/")
179179

180180
// TEST
181181
assert.Equal(t, http.StatusUnauthorized, w.Code)
@@ -190,14 +190,13 @@ func TestMiddlewareAbortHandlersChainAndNext(t *testing.T) {
190190
c.Next()
191191
c.AbortWithStatus(http.StatusGone)
192192
signature += "B"
193-
194193
})
195194
router.GET("/", func(c *Context) {
196195
signature += "C"
197196
c.Next()
198197
})
199198
// RUN
200-
w := performRequest(router, "GET", "/")
199+
w := PerformRequest(router, "GET", "/")
201200

202201
// TEST
203202
assert.Equal(t, http.StatusGone, w.Code)
@@ -220,7 +219,7 @@ func TestMiddlewareFailHandlersChain(t *testing.T) {
220219
signature += "C"
221220
})
222221
// RUN
223-
w := performRequest(router, "GET", "/")
222+
w := PerformRequest(router, "GET", "/")
224223

225224
// TEST
226225
assert.Equal(t, http.StatusInternalServerError, w.Code)
@@ -247,7 +246,7 @@ func TestMiddlewareWrite(t *testing.T) {
247246
})
248247
})
249248

250-
w := performRequest(router, "GET", "/")
249+
w := PerformRequest(router, "GET", "/")
251250

252251
assert.Equal(t, http.StatusBadRequest, w.Code)
253252
assert.Equal(t, strings.Replace("hola\n<map><foo>bar</foo></map>{\"foo\":\"bar\"}{\"foo\":\"bar\"}event:test\ndata:message\n\n", " ", "", -1), strings.Replace(w.Body.String(), " ", "", -1))

0 commit comments

Comments
 (0)