From 9b10052cd15b18656e9780ee249b9aa12a72d8f9 Mon Sep 17 00:00:00 2001
From: Daniel Carrillo <daniel.carrillo@gmail.com>
Date: Tue, 30 Nov 2021 16:19:45 +0100
Subject: [PATCH] refactor on some tests

---
 integration-tests/integration_test.go | 10 +++++-----
 router/headers_test.go                |  8 +++++---
 router/templates_test.go              |  9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/integration-tests/integration_test.go b/integration-tests/integration_test.go
index cb75bf5..f9edca5 100644
--- a/integration-tests/integration_test.go
+++ b/integration-tests/integration_test.go
@@ -19,7 +19,7 @@ import (
 
 func buildContainer() testcontainers.ContainerRequest {
 	_, filename, _, _ := runtime.Caller(0)
-	dirname := filepath.Dir(filename)
+	dir := filepath.Dir(filename)
 
 	req := testcontainers.ContainerRequest{
 		FromDockerfile: testcontainers.FromDockerfile{
@@ -38,10 +38,10 @@ func buildContainer() testcontainers.ContainerRequest {
 		ExposedPorts: []string{"8000:8000", "8001:8001"},
 		WaitingFor:   wait.ForLog("Starting TLS server listening on :8001"),
 		BindMounts: map[string]string{
-			"/tmp/GeoIP2-City-Test.mmdb":  filepath.Join(dirname, "/../test/GeoIP2-City-Test.mmdb"),
-			"/tmp/GeoLite2-ASN-Test.mmdb": filepath.Join(dirname, "/../test/GeoLite2-ASN-Test.mmdb"),
-			"/tmp/server.pem":             filepath.Join(dirname, "/../test/server.pem"),
-			"/tmp/server.key":             filepath.Join(dirname, "/../test/server.key"),
+			"/tmp/GeoIP2-City-Test.mmdb":  filepath.Join(dir, "/../test/GeoIP2-City-Test.mmdb"),
+			"/tmp/GeoLite2-ASN-Test.mmdb": filepath.Join(dir, "/../test/GeoLite2-ASN-Test.mmdb"),
+			"/tmp/server.pem":             filepath.Join(dir, "/../test/server.pem"),
+			"/tmp/server.key":             filepath.Join(dir, "/../test/server.key"),
 		},
 	}
 
diff --git a/router/headers_test.go b/router/headers_test.go
index 9bca221..5c3c4e7 100644
--- a/router/headers_test.go
+++ b/router/headers_test.go
@@ -28,9 +28,11 @@ Host:
 `
 
 	req, _ := http.NewRequest("GET", "/headers", nil)
-	req.Header["Header1"] = []string{"value1"}
-	req.Header["Header2"] = []string{"value21", "value22"}
-	req.Header["Header3"] = []string{"value3"}
+	req.Header = map[string][]string{
+		"Header1": {"value1"},
+		"Header2": {"value21", "value22"},
+		"Header3": {"value3"},
+	}
 
 	w := httptest.NewRecorder()
 	app.ServeHTTP(w, req)
diff --git a/router/templates_test.go b/router/templates_test.go
index daeb425..0a3e6a4 100644
--- a/router/templates_test.go
+++ b/router/templates_test.go
@@ -54,10 +54,11 @@ const expectedHome = `
 
 func TestDefaultTemplate(t *testing.T) {
 	req, _ := http.NewRequest("GET", "/", nil)
-
-	req.Header["Header1"] = []string{"value1"}
-	req.Header["Header2"] = []string{"value21", "value22"}
-	req.Header["Header3"] = []string{"value3"}
+	req.Header = map[string][]string{
+		"Header1": {"value1"},
+		"Header2": {"value21", "value22"},
+		"Header3": {"value3"},
+	}
 
 	tmpl, _ := template.New("home").Parse(home)
 	response := JSONResponse{