Skip to content

Commit 4807d1e

Browse files
committed
replaced deprecated res.HeaderMap with res.Header()
1 parent a01ea90 commit 4807d1e

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

renderer_test.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func Test_Render(t *testing.T) {
151151

152152
checkNil(t, err)
153153
checkStatusOK(t, res.Code)
154-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentJSON)
154+
checkContentType(t, res.Header().Get(ContentType), ContentJSON)
155155
checkBody(t, res.Body.String(), expected)
156156
}
157157

@@ -172,7 +172,7 @@ func Test_String(t *testing.T) {
172172

173173
checkNil(t, err)
174174
checkStatusOK(t, res.Code)
175-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentText+"; charset="+defaultCharSet)
175+
checkContentType(t, res.Header().Get(ContentType), ContentText+"; charset="+defaultCharSet)
176176
checkBody(t, res.Body.String(), expected)
177177
}
178178

@@ -234,7 +234,7 @@ func Test_JSON_prefix(t *testing.T) {
234234

235235
checkNil(t, err)
236236
checkStatusOK(t, res.Code)
237-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentJSON+"; charset="+defaultCharSet)
237+
checkContentType(t, res.Header().Get(ContentType), ContentJSON+"; charset="+defaultCharSet)
238238
checkBody(t, res.Body.String(), expected)
239239
}
240240

@@ -259,7 +259,7 @@ func Test_JSONP(t *testing.T) {
259259

260260
checkNil(t, err)
261261
checkStatusOK(t, res.Code)
262-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentJSONP+"; charset="+defaultCharSet)
262+
checkContentType(t, res.Header().Get(ContentType), ContentJSONP+"; charset="+defaultCharSet)
263263
checkBody(t, res.Body.String(), expected)
264264
}
265265

@@ -283,7 +283,7 @@ func Test_JSONP_without_callback(t *testing.T) {
283283

284284
checkNotNil(t, err)
285285
checkStatusOK(t, res.Code)
286-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentJSONP+"; charset="+defaultCharSet)
286+
checkContentType(t, res.Header().Get(ContentType), ContentJSONP+"; charset="+defaultCharSet)
287287
}
288288

289289
func Test_XML(t *testing.T) {
@@ -303,7 +303,7 @@ func Test_XML(t *testing.T) {
303303

304304
checkNil(t, err)
305305
checkStatusOK(t, res.Code)
306-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentXML+"; charset="+defaultCharSet)
306+
checkContentType(t, res.Header().Get(ContentType), ContentXML+"; charset="+defaultCharSet)
307307
checkBody(t, res.Body.String(), expected)
308308
}
309309

@@ -329,7 +329,7 @@ func Test_XML_indent_prefix(t *testing.T) {
329329

330330
checkNil(t, err)
331331
checkStatusOK(t, res.Code)
332-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentXML+"; charset="+defaultCharSet)
332+
checkContentType(t, res.Header().Get(ContentType), ContentXML+"; charset="+defaultCharSet)
333333
checkBody(t, res.Body.String(), expected)
334334
}
335335

@@ -350,7 +350,7 @@ func Test_YAML(t *testing.T) {
350350

351351
checkNil(t, err)
352352
checkStatusOK(t, res.Code)
353-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentYAML+"; charset="+defaultCharSet)
353+
checkContentType(t, res.Header().Get(ContentType), ContentYAML+"; charset="+defaultCharSet)
354354
checkBody(t, res.Body.String(), expected)
355355
}
356356

@@ -371,7 +371,7 @@ func Test_HTMLString(t *testing.T) {
371371

372372
checkNil(t, err)
373373
checkStatusOK(t, res.Code)
374-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
374+
checkContentType(t, res.Header().Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
375375
checkBody(t, res.Body.String(), expected)
376376
}
377377

@@ -406,7 +406,7 @@ func Test_HTML(t *testing.T) {
406406

407407
checkNil(t, err)
408408
checkStatusOK(t, res.Code)
409-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
409+
checkContentType(t, res.Header().Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
410410
checkBody(t, res.Body.String(), expected)
411411
}
412412

@@ -440,7 +440,7 @@ func Test_HTML_without_name_and_debug(t *testing.T) {
440440

441441
checkNotNil(t, err)
442442
checkStatusOK(t, res.Code)
443-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
443+
checkContentType(t, res.Header().Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
444444
}
445445

446446
func Test_HTML_invalid_name(t *testing.T) {
@@ -473,7 +473,7 @@ func Test_HTML_invalid_name(t *testing.T) {
473473

474474
checkNotNil(t, err)
475475
checkStatusOK(t, res.Code)
476-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
476+
checkContentType(t, res.Header().Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
477477
}
478478

479479
func Test_Template(t *testing.T) {
@@ -510,7 +510,7 @@ func Test_Template(t *testing.T) {
510510

511511
checkNil(t, err)
512512
checkStatusOK(t, res.Code)
513-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
513+
checkContentType(t, res.Header().Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
514514
checkBody(t, res.Body.String(), expected)
515515
}
516516

@@ -549,7 +549,7 @@ func Test_View(t *testing.T) {
549549

550550
checkNil(t, err)
551551
checkStatusOK(t, res.Code)
552-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
552+
checkContentType(t, res.Header().Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
553553
checkBody(t, res.Body.String(), expected)
554554
}
555555

@@ -584,7 +584,7 @@ func Test_View_invalid_name(t *testing.T) {
584584

585585
checkNotNil(t, err)
586586
checkStatusOK(t, res.Code)
587-
checkContentType(t, res.HeaderMap.Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
587+
checkContentType(t, res.Header().Get(ContentType), ContentHTML+"; charset="+defaultCharSet)
588588
}
589589

590590
func Test_Binary_inline(t *testing.T) {
@@ -602,7 +602,7 @@ func Test_Binary_inline(t *testing.T) {
602602

603603
checkNil(t, err)
604604
checkStatusOK(t, res.Code)
605-
checkContentType(t, res.HeaderMap.Get(ContentType), r.opts.ContentBinary)
605+
checkContentType(t, res.Header().Get(ContentType), r.opts.ContentBinary)
606606
checkBody(t, res.Body.String(), "This is a long binary data")
607607
}
608608

@@ -621,7 +621,7 @@ func Test_Binary_attachment(t *testing.T) {
621621

622622
checkNil(t, err)
623623
checkStatusOK(t, res.Code)
624-
checkContentType(t, res.HeaderMap.Get(ContentType), r.opts.ContentBinary)
624+
checkContentType(t, res.Header().Get(ContentType), r.opts.ContentBinary)
625625
checkBody(t, res.Body.String(), "This is a long binary data")
626626
}
627627

@@ -675,7 +675,7 @@ func Test_File_view(t *testing.T) {
675675

676676
checkNil(t, err)
677677
checkStatusOK(t, res.Code)
678-
checkContentType(t, res.HeaderMap.Get(ContentType), r.opts.ContentText)
678+
checkContentType(t, res.Header().Get(ContentType), r.opts.ContentText)
679679
}
680680

681681
func Test_File_download(t *testing.T) {
@@ -692,7 +692,7 @@ func Test_File_download(t *testing.T) {
692692

693693
checkNil(t, err)
694694
checkStatusOK(t, res.Code)
695-
checkContentType(t, res.HeaderMap.Get(ContentType), r.opts.ContentText)
695+
checkContentType(t, res.Header().Get(ContentType), r.opts.ContentText)
696696
}
697697

698698
func Benchmark_NoContent(b *testing.B) {

0 commit comments

Comments
 (0)