Defined test function in TestBuildEnv

This commit is contained in:
MathiasB 2016-02-01 09:39:13 +01:00
parent ac197f1694
commit c59fd1c76e

View file

@ -32,7 +32,9 @@ func TestRuleParseAddress(t *testing.T) {
} }
func BuildEnvSingle(r *http.Request, rule Rule, fpath string, envExpected map[string]string, t *testing.T) { func TestBuildEnv(t *testing.T) {
buildEnvSingle := func(r *http.Request, rule Rule, fpath string, envExpected map[string]string, t *testing.T) {
h := Handler{} h := Handler{}
@ -47,9 +49,7 @@ func BuildEnvSingle(r *http.Request, rule Rule, fpath string, envExpected map[st
} }
} }
} }
func TestBuildEnv(t *testing.T) {
rule := Rule{} rule := Rule{}
url, err := url.Parse("http://localhost:2015/fgci_test.php?test=blabla") url, err := url.Parse("http://localhost:2015/fgci_test.php?test=blabla")
@ -80,16 +80,16 @@ func TestBuildEnv(t *testing.T) {
} }
// 1. Test for full canonical IPv6 address // 1. Test for full canonical IPv6 address
BuildEnvSingle(&r, rule, fpath, envExpected, t) buildEnvSingle(&r, rule, fpath, envExpected, t)
// 2. Test for shorthand notation of IPv6 address // 2. Test for shorthand notation of IPv6 address
r.RemoteAddr = "[::1]:51688" r.RemoteAddr = "[::1]:51688"
envExpected["REMOTE_ADDR"] = "[::1]" envExpected["REMOTE_ADDR"] = "[::1]"
BuildEnvSingle(&r, rule, fpath, envExpected, t) buildEnvSingle(&r, rule, fpath, envExpected, t)
// 3. Test for IPv4 address // 3. Test for IPv4 address
r.RemoteAddr = "192.168.0.10:51688" r.RemoteAddr = "192.168.0.10:51688"
envExpected["REMOTE_ADDR"] = "192.168.0.10" envExpected["REMOTE_ADDR"] = "192.168.0.10"
BuildEnvSingle(&r, rule, fpath, envExpected, t) buildEnvSingle(&r, rule, fpath, envExpected, t)
} }