move NewRequest to data.go

proxy/data_test.go

@@ -15,6 +15,7 @@
 package proxy
 
 import (
+	"net/http"
 	"reflect"
 	"testing"
 )
@@ -80,3 +81,88 @@ func TestParseOptions(t *testing.T) {
 		}
 	}
 }
+
+// Test that request URLs are properly parsed into Options and RemoteURL.  This
+// test verifies that invalid remote URLs throw errors, and that valid
+// combinations of Options and URL are accept.  This does not exhaustively test
+// the various Options that can be specified; see TestParseOptions for that.
+func TestNewRequest(t *testing.T) {
+	tests := []struct {
+		URL         string
+		RemoteURL   string
+		Options     *Options
+		ExpectError bool
+	}{
+		// invalid URLs
+		{
+			"http://localhost/", "", nil, true,
+		},
+		{
+			"http://localhost/1/", "", nil, true,
+		},
+		{
+			"http://localhost//example.com/foo", "", nil, true,
+		},
+		{
+			"http://localhost//ftp://example.com/foo", "", nil, true,
+		},
+
+		// invalid options.  These won't return errors, but will not fully parse the options
+		{
+			"http://localhost/s/http://example.com/",
+			"http://example.com/", emptyOptions, false,
+		},
+		{
+			"http://localhost/1xs/http://example.com/",
+			"http://example.com/", &Options{Width: 1}, false,
+		},
+
+		// valid URLs
+		{
+			"http://localhost/http://example.com/foo",
+			"http://example.com/foo", nil, false,
+		},
+		{
+			"http://localhost//http://example.com/foo",
+			"http://example.com/foo", emptyOptions, false,
+		},
+		{
+			"http://localhost//https://example.com/foo",
+			"https://example.com/foo", emptyOptions, false,
+		},
+		{
+			"http://localhost/1x2/http://example.com/foo",
+			"http://example.com/foo", &Options{Width: 1, Height: 2}, false,
+		},
+		{
+			"http://localhost//http://example.com/foo?bar",
+			"http://example.com/foo?bar", emptyOptions, false,
+		},
+	}
+
+	for i, tt := range tests {
+		req, err := http.NewRequest("GET", tt.URL, nil)
+		if err != nil {
+			t.Errorf("%d. Error parsing request: %v", i, err)
+			continue
+		}
+
+		r, err := NewRequest(req)
+		if tt.ExpectError {
+			if err == nil {
+				t.Errorf("%d. Expected parsing error", i)
+			}
+			continue
+		} else if err != nil {
+			t.Errorf("%d. Error parsing request: %v", i, err)
+			continue
+		}
+
+		if got := r.URL.String(); tt.RemoteURL != got {
+			t.Errorf("%d. Request URL = %v, want %v", i, got, tt.RemoteURL)
+		}
+		if !reflect.DeepEqual(tt.Options, r.Options) {
+			t.Errorf("%d. Request Options = %v, want %v", i, r.Options, tt.Options)
+		}
+	}
+}