blob/gcsblob: add more URL opener tests

Suggested by @vangent in google#1359
zombiezen · Feb 20, 2019 · a75e83d · a75e83d
1 parent 6838e15
commit a75e83d
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/blob/gcsblob/gcsblob_test.go b/blob/gcsblob/gcsblob_test.go
@@ -293,17 +293,38 @@ func TestURLOpenerForParams(t *testing.T) {
 
 	tests := []struct {
 		name     string
+		currOpts Options
 		query    url.Values
 		wantOpts Options
 		wantErr  bool
 	}{
+		{
+			name: "InvalidParam",
+			query: url.Values{
+				"foo": {"bar"},
+			},
+			wantErr: true,
+		},
 		{
 			name: "AccessID",
 			query: url.Values{
 				"access_id": {"bar"},
 			},
 			wantOpts: Options{GoogleAccessID: "bar"},
 		},
+		{
+			name:     "AccessID override",
+			currOpts: Options{GoogleAccessID: "foo"},
+			query: url.Values{
+				"access_id": {"bar"},
+			},
+			wantOpts: Options{GoogleAccessID: "bar"},
+		},
+		{
+			name:     "AccessID not overridden",
+			currOpts: Options{GoogleAccessID: "bar"},
+			wantOpts: Options{GoogleAccessID: "bar"},
+		},
 		{
 			name: "BadPrivateKeyPath",
 			query: url.Values{
@@ -322,7 +343,8 @@ func TestURLOpenerForParams(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			got, err := new(URLOpener).forParams(ctx, test.query)
+			o := &URLOpener{Options: test.currOpts}
+			got, err := o.forParams(ctx, test.query)
 			if (err != nil) != test.wantErr {
 				t.Errorf("got err %v want error %v", err, test.wantErr)
 			}