Skip to content

Commit 38e5097

Browse files
julienschmidtjulienschmidt
committed
Move Gin tests
alphabetical order...
1 parent 5546ef0 commit 38e5097

File tree

6 files changed

+109
-109
lines changed

6 files changed

+109
-109
lines changed

‎bench_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ func BenchmarkDenco_Param(b *testing.B) {
8181
r, _ := http.NewRequest("GET", "/user/gordon", nil)
8282
benchRequest(b, router, r)
8383
}
84+
func BenchmarkGin_Param(b *testing.B) {
85+
router := loadGinSingle("GET", "/user/:name", ginHandle)
86+
87+
r, _ := http.NewRequest("GET", "/user/gordon", nil)
88+
benchRequest(b, router, r)
89+
}
8490
func BenchmarkGocraftWeb_Param(b *testing.B) {
8591
router := loadGocraftWebSingle("GET", "/user/:name", gocraftWebHandler)
8692

@@ -111,12 +117,6 @@ func BenchmarkGorillaMux_Param(b *testing.B) {
111117
r, _ := http.NewRequest("GET", "/user/gordon", nil)
112118
benchRequest(b, router, r)
113119
}
114-
func BenchmarkGin_Param(b *testing.B) {
115-
router := loadGinSingle("GET", "/user/:name", ginHandle)
116-
117-
r, _ := http.NewRequest("GET", "/user/gordon", nil)
118-
benchRequest(b, router, r)
119-
}
120120
func BenchmarkHttpRouter_Param(b *testing.B) {
121121
router := loadHttpRouterSingle("GET", "/user/:name", httpRouterHandle)
122122

@@ -197,6 +197,12 @@ func BenchmarkDenco_Param5(b *testing.B) {
197197
r, _ := http.NewRequest("GET", fiveRoute, nil)
198198
benchRequest(b, router, r)
199199
}
200+
func BenchmarkGin_Param5(b *testing.B) {
201+
router := loadGinSingle("GET", fiveColon, ginHandle)
202+
203+
r, _ := http.NewRequest("GET", fiveRoute, nil)
204+
benchRequest(b, router, r)
205+
}
200206
func BenchmarkGocraftWeb_Param5(b *testing.B) {
201207
router := loadGocraftWebSingle("GET", fiveColon, gocraftWebHandler)
202208

@@ -227,12 +233,6 @@ func BenchmarkGorillaMux_Param5(b *testing.B) {
227233
r, _ := http.NewRequest("GET", fiveRoute, nil)
228234
benchRequest(b, router, r)
229235
}
230-
func BenchmarkGin_Param5(b *testing.B) {
231-
router := loadGinSingle("GET", fiveColon, ginHandle)
232-
233-
r, _ := http.NewRequest("GET", fiveRoute, nil)
234-
benchRequest(b, router, r)
235-
}
236236
func BenchmarkHttpRouter_Param5(b *testing.B) {
237237
router := loadHttpRouterSingle("GET", fiveColon, httpRouterHandle)
238238

@@ -313,6 +313,12 @@ func BenchmarkDenco_Param20(b *testing.B) {
313313
r, _ := http.NewRequest("GET", twentyRoute, nil)
314314
benchRequest(b, router, r)
315315
}
316+
func BenchmarkGin_Param20(b *testing.B) {
317+
router := loadGinSingle("GET", twentyColon, ginHandle)
318+
319+
r, _ := http.NewRequest("GET", twentyRoute, nil)
320+
benchRequest(b, router, r)
321+
}
316322
func BenchmarkGocraftWeb_Param20(b *testing.B) {
317323
router := loadGocraftWebSingle("GET", twentyColon, gocraftWebHandler)
318324

@@ -343,12 +349,6 @@ func BenchmarkGorillaMux_Param20(b *testing.B) {
343349
r, _ := http.NewRequest("GET", twentyRoute, nil)
344350
benchRequest(b, router, r)
345351
}
346-
func BenchmarkGin_Param20(b *testing.B) {
347-
router := loadGinSingle("GET", twentyColon, ginHandle)
348-
349-
r, _ := http.NewRequest("GET", twentyRoute, nil)
350-
benchRequest(b, router, r)
351-
}
352352
func BenchmarkHttpRouter_Param20(b *testing.B) {
353353
router := loadHttpRouterSingle("GET", twentyColon, httpRouterHandle)
354354

@@ -425,6 +425,12 @@ func BenchmarkDenco_ParamWrite(b *testing.B) {
425425
r, _ := http.NewRequest("GET", "/user/gordon", nil)
426426
benchRequest(b, router, r)
427427
}
428+
func BenchmarkGin_ParamWrite(b *testing.B) {
429+
router := loadGinSingle("GET", "/user/:name", ginHandleWrite)
430+
431+
r, _ := http.NewRequest("GET", "/user/gordon", nil)
432+
benchRequest(b, router, r)
433+
}
428434
func BenchmarkGocraftWeb_ParamWrite(b *testing.B) {
429435
router := loadGocraftWebSingle("GET", "/user/:name", gocraftWebHandlerWrite)
430436

@@ -455,12 +461,6 @@ func BenchmarkGorillaMux_ParamWrite(b *testing.B) {
455461
r, _ := http.NewRequest("GET", "/user/gordon", nil)
456462
benchRequest(b, router, r)
457463
}
458-
func BenchmarkGin_ParamWrite(b *testing.B) {
459-
router := loadGinSingle("GET", "/user/:name", ginHandleWrite)
460-
461-
r, _ := http.NewRequest("GET", "/user/gordon", nil)
462-
benchRequest(b, router, r)
463-
}
464464
func BenchmarkHttpRouter_ParamWrite(b *testing.B) {
465465
router := loadHttpRouterSingle("GET", "/user/:name", httpRouterHandleWrite)
466466

‎github_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,12 @@ var githubAPI = []route{
276276
var (
277277
githubBeego http.Handler
278278
githubDenco http.Handler
279+
githubGin http.Handler
279280
githubGocraftWeb http.Handler
280281
githubGoji http.Handler
281282
githubGoJsonRest http.Handler
282283
githubGoRestful http.Handler
283284
githubGorillaMux http.Handler
284-
githubGin http.Handler
285285
githubHttpRouter http.Handler
286286
githubHttpTreeMux http.Handler
287287
githubKocha http.Handler
@@ -302,6 +302,9 @@ func init() {
302302
calcMem("Denco", func() {
303303
githubDenco = loadDenco(githubAPI)
304304
})
305+
calcMem("Gin", func() {
306+
githubGin = loadGin(githubAPI)
307+
})
305308
calcMem("GocraftWeb", func() {
306309
githubGocraftWeb = loadGocraftWeb(githubAPI)
307310
})
@@ -317,9 +320,6 @@ func init() {
317320
calcMem("GorillaMux", func() {
318321
githubGorillaMux = loadGorillaMux(githubAPI)
319322
})
320-
calcMem("Gin", func() {
321-
githubGin = loadGin(githubAPI)
322-
})
323323
calcMem("HttpRouter", func() {
324324
githubHttpRouter = loadHttpRouter(githubAPI)
325325
})
@@ -360,6 +360,10 @@ func BenchmarkDenco_GithubStatic(b *testing.B) {
360360
req, _ := http.NewRequest("GET", "/user/repos", nil)
361361
benchRequest(b, githubDenco, req)
362362
}
363+
func BenchmarkGin_GithubStatic(b *testing.B) {
364+
req, _ := http.NewRequest("GET", "/user/repos", nil)
365+
benchRequest(b, githubGin, req)
366+
}
363367
func BenchmarkGocraftWeb_GithubStatic(b *testing.B) {
364368
req, _ := http.NewRequest("GET", "/user/repos", nil)
365369
benchRequest(b, githubGocraftWeb, req)
@@ -380,10 +384,6 @@ func BenchmarkGorillaMux_GithubStatic(b *testing.B) {
380384
req, _ := http.NewRequest("GET", "/user/repos", nil)
381385
benchRequest(b, githubGorillaMux, req)
382386
}
383-
func BenchmarkGin_GithubStatic(b *testing.B) {
384-
req, _ := http.NewRequest("GET", "/user/repos", nil)
385-
benchRequest(b, githubGin, req)
386-
}
387387
func BenchmarkHttpRouter_GithubStatic(b *testing.B) {
388388
req, _ := http.NewRequest("GET", "/user/repos", nil)
389389
benchRequest(b, githubHttpRouter, req)
@@ -430,6 +430,10 @@ func BenchmarkDenco_GithubParam(b *testing.B) {
430430
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
431431
benchRequest(b, githubDenco, req)
432432
}
433+
func BenchmarkGin_GithubParam(b *testing.B) {
434+
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
435+
benchRequest(b, githubGin, req)
436+
}
433437
func BenchmarkGocraftWeb_GithubParam(b *testing.B) {
434438
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
435439
benchRequest(b, githubGocraftWeb, req)
@@ -450,10 +454,6 @@ func BenchmarkGorillaMux_GithubParam(b *testing.B) {
450454
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
451455
benchRequest(b, githubGorillaMux, req)
452456
}
453-
func BenchmarkGin_GithubParam(b *testing.B) {
454-
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
455-
benchRequest(b, githubGin, req)
456-
}
457457
func BenchmarkHttpRouter_GithubParam(b *testing.B) {
458458
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
459459
benchRequest(b, githubHttpRouter, req)
@@ -498,6 +498,9 @@ func BenchmarkBeego_GithubAll(b *testing.B) {
498498
func BenchmarkDenco_GithubAll(b *testing.B) {
499499
benchRoutes(b, githubDenco, githubAPI)
500500
}
501+
func BenchmarkGin_GithubAll(b *testing.B) {
502+
benchRoutes(b, githubGin, githubAPI)
503+
}
501504
func BenchmarkGocraftWeb_GithubAll(b *testing.B) {
502505
benchRoutes(b, githubGocraftWeb, githubAPI)
503506
}
@@ -513,9 +516,6 @@ func BenchmarkGoRestful_GithubAll(b *testing.B) {
513516
func BenchmarkGorillaMux_GithubAll(b *testing.B) {
514517
benchRoutes(b, githubGorillaMux, githubAPI)
515518
}
516-
func BenchmarkGin_GithubAll(b *testing.B) {
517-
benchRoutes(b, githubGin, githubAPI)
518-
}
519519
func BenchmarkHttpRouter_GithubAll(b *testing.B) {
520520
benchRoutes(b, githubHttpRouter, githubAPI)
521521
}

‎gplus_test.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ var gplusAPI = []route{
3838
var (
3939
gplusBeego http.Handler
4040
gplusDenco http.Handler
41+
gplusGin http.Handler
4142
gplusGocraftWeb http.Handler
4243
gplusGoji http.Handler
4344
gplusGoJsonRest http.Handler
4445
gplusGoRestful http.Handler
4546
gplusGorillaMux http.Handler
46-
gplusGin http.Handler
4747
gplusHttpRouter http.Handler
4848
gplusHttpTreeMux http.Handler
4949
gplusKocha http.Handler
@@ -64,6 +64,9 @@ func init() {
6464
calcMem("Denco", func() {
6565
gplusDenco = loadDenco(gplusAPI)
6666
})
67+
calcMem("Gin", func() {
68+
gplusGin = loadGin(gplusAPI)
69+
})
6770
calcMem("GocraftWeb", func() {
6871
gplusGocraftWeb = loadGocraftWeb(gplusAPI)
6972
})
@@ -79,9 +82,6 @@ func init() {
7982
calcMem("GorillaMux", func() {
8083
gplusGorillaMux = loadGorillaMux(gplusAPI)
8184
})
82-
calcMem("Gin", func() {
83-
gplusGin = loadGin(gplusAPI)
84-
})
8585
calcMem("HttpRouter", func() {
8686
gplusHttpRouter = loadHttpRouter(gplusAPI)
8787
})
@@ -122,6 +122,10 @@ func BenchmarkDenco_GPlusStatic(b *testing.B) {
122122
req, _ := http.NewRequest("GET", "/people", nil)
123123
benchRequest(b, gplusDenco, req)
124124
}
125+
func BenchmarkGin_GPlusStatic(b *testing.B) {
126+
req, _ := http.NewRequest("GET", "/people", nil)
127+
benchRequest(b, gplusGin, req)
128+
}
125129
func BenchmarkGocraftWeb_GPlusStatic(b *testing.B) {
126130
req, _ := http.NewRequest("GET", "/people", nil)
127131
benchRequest(b, gplusGocraftWeb, req)
@@ -142,10 +146,6 @@ func BenchmarkGorillaMux_GPlusStatic(b *testing.B) {
142146
req, _ := http.NewRequest("GET", "/people", nil)
143147
benchRequest(b, gplusGorillaMux, req)
144148
}
145-
func BenchmarkGin_GPlusStatic(b *testing.B) {
146-
req, _ := http.NewRequest("GET", "/people", nil)
147-
benchRequest(b, gplusGin, req)
148-
}
149149
func BenchmarkHttpRouter_GPlusStatic(b *testing.B) {
150150
req, _ := http.NewRequest("GET", "/people", nil)
151151
benchRequest(b, gplusHttpRouter, req)
@@ -192,6 +192,10 @@ func BenchmarkDenco_GPlusParam(b *testing.B) {
192192
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
193193
benchRequest(b, gplusDenco, req)
194194
}
195+
func BenchmarkGin_GPlusParam(b *testing.B) {
196+
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
197+
benchRequest(b, gplusGin, req)
198+
}
195199
func BenchmarkGocraftWeb_GPlusParam(b *testing.B) {
196200
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
197201
benchRequest(b, gplusGocraftWeb, req)
@@ -212,10 +216,6 @@ func BenchmarkGorillaMux_GPlusParam(b *testing.B) {
212216
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
213217
benchRequest(b, gplusGorillaMux, req)
214218
}
215-
func BenchmarkGin_GPlusParam(b *testing.B) {
216-
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
217-
benchRequest(b, gplusGin, req)
218-
}
219219
func BenchmarkHttpRouter_GPlusParam(b *testing.B) {
220220
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
221221
benchRequest(b, gplusHttpRouter, req)
@@ -262,6 +262,10 @@ func BenchmarkDenco_GPlus2Params(b *testing.B) {
262262
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
263263
benchRequest(b, gplusDenco, req)
264264
}
265+
func BenchmarkGin_GPlus2Params(b *testing.B) {
266+
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
267+
benchRequest(b, gplusGin, req)
268+
}
265269
func BenchmarkGocraftWeb_GPlus2Params(b *testing.B) {
266270
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
267271
benchRequest(b, gplusGocraftWeb, req)
@@ -282,10 +286,6 @@ func BenchmarkGorillaMux_GPlus2Params(b *testing.B) {
282286
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
283287
benchRequest(b, gplusGorillaMux, req)
284288
}
285-
func BenchmarkGin_GPlus2Params(b *testing.B) {
286-
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
287-
benchRequest(b, gplusGin, req)
288-
}
289289
func BenchmarkHttpRouter_GPlus2Params(b *testing.B) {
290290
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
291291
benchRequest(b, gplusHttpRouter, req)
@@ -330,6 +330,9 @@ func BenchmarkBeego_GPlusAll(b *testing.B) {
330330
func BenchmarkDenco_GPlusAll(b *testing.B) {
331331
benchRoutes(b, gplusDenco, gplusAPI)
332332
}
333+
func BenchmarkGin_GPlusAll(b *testing.B) {
334+
benchRoutes(b, gplusGin, gplusAPI)
335+
}
333336
func BenchmarkGocraftWeb_GPlusAll(b *testing.B) {
334337
benchRoutes(b, gplusGocraftWeb, gplusAPI)
335338
}
@@ -345,9 +348,6 @@ func BenchmarkGoRestful_GPlusAll(b *testing.B) {
345348
func BenchmarkGorillaMux_GPlusAll(b *testing.B) {
346349
benchRoutes(b, gplusGorillaMux, gplusAPI)
347350
}
348-
func BenchmarkGin_GPlusAll(b *testing.B) {
349-
benchRoutes(b, gplusGin, gplusAPI)
350-
}
351351
func BenchmarkHttpRouter_GPlusAll(b *testing.B) {
352352
benchRoutes(b, gplusHttpRouter, gplusAPI)
353353
}

0 commit comments

Comments
 (0)