@@ -6,31 +6,36 @@ import (
66 "net/http/httputil"
77 "net/url"
88 "testing"
9-
10- "github.com/stretchr/testify/assert"
119)
1210
1311// TestBuild_AddHeaders tests that Build's returned ReverseProxy Director adds the proper request headers
1412func TestBuild_AddHeaders (t * testing.T ) {
1513 u , err := url .Parse ("http://127.0.0.1" )
16- assert .Nil (t , err , "error should be nil" )
14+ if err != nil {
15+ t .Fatalf ("got error %v, want nil" , err )
16+ }
1717 proxy := Build (u )
18- assert .NotNil (t , proxy , "Build should not return nil" )
18+ if proxy == nil {
19+ t .Fatal ("got nil, want non-nil proxy" )
20+ }
1921
2022 req := httptest .NewRequest ("GET" , "/test" , nil )
2123 proxy .Director (req )
2224
2325 // Check that headers were added to req
24- assert .Equal (t , req .Header .Get (http .CanonicalHeaderKey ("X-Forwarded-Proto" )), "https" ,
25- "X-Forwarded-Proto should be present" )
26- assert .Equal (t , req .Header .Get (http .CanonicalHeaderKey ("X-Forwarded-Port" )), "443" ,
27- "X-Forwarded-Port should be present" )
28-
26+ if got := req .Header .Get (http .CanonicalHeaderKey ("X-Forwarded-Proto" )); got != "https" {
27+ t .Errorf ("X-Forwarded-Proto: got %q, want %q" , got , "https" )
28+ }
29+ if got := req .Header .Get (http .CanonicalHeaderKey ("X-Forwarded-Port" )); got != "443" {
30+ t .Errorf ("X-Forwarded-Port: got %q, want %q" , got , "443" )
31+ }
2932}
3033
3134func TestNewDirector (t * testing.T ) {
3235 u , err := url .Parse ("http://127.0.0.1" )
33- assert .Nil (t , err , "error should be nil" )
36+ if err != nil {
37+ t .Fatalf ("got error %v, want nil" , err )
38+ }
3439 director := newDirector (u , nil )
3540
3641 defaultProxy := httputil .NewSingleHostReverseProxy (u )
@@ -42,7 +47,15 @@ func TestNewDirector(t *testing.T) {
4247 defaultDirector (expectedReq )
4348 director (testReq )
4449
45- assert .EqualValues (t , expectedReq , testReq ,
46- "default proxy and package directors should modify the request in the same way" )
50+ // Compare relevant fields of the requests
51+ if got , want := testReq .URL .String (), expectedReq .URL .String (); got != want {
52+ t .Errorf ("URL: got %q, want %q" , got , want )
53+ }
54+ if got , want := testReq .Host , expectedReq .Host ; got != want {
55+ t .Errorf ("Host: got %q, want %q" , got , want )
56+ }
57+ if got , want := testReq .RemoteAddr , expectedReq .RemoteAddr ; got != want {
58+ t .Errorf ("RemoteAddr: got %q, want %q" , got , want )
59+ }
4760 // TODO: add more test cases
4861}
0 commit comments