From 3085fe570382318e6690304640751bf312e1a0b8 Mon Sep 17 00:00:00 2001 From: Patrick Jones Date: Thu, 29 Oct 2020 12:22:08 -0700 Subject: [PATCH] google: clarify test structure. --- .../externalaccount/clientauth_test.go | 78 ++++++++----------- 1 file changed, 33 insertions(+), 45 deletions(-) diff --git a/google/internal/externalaccount/clientauth_test.go b/google/internal/externalaccount/clientauth_test.go index 44e6c9b..acacbeb 100644 --- a/google/internal/externalaccount/clientauth_test.go +++ b/google/internal/externalaccount/clientauth_test.go @@ -14,39 +14,27 @@ import ( var clientID = "rbrgnognrhongo3bi4gb9ghg9g" var clientSecret = "notsosecret" -var valuesData = url.Values{ - "audience": []string{"32555940559.apps.googleusercontent.com"}, - "grant_type": []string{"urn:ietf:params:oauth:grant-type:token-exchange"}, - "requested_token_type": []string{"urn:ietf:params:oauth:token-type:access_token"}, - "subject_token_type": []string{"urn:ietf:params:oauth:token-type:jwt"}, - "subject_token": []string{"eyJhbGciOiJSUzI1NiIsImtpZCI6IjJjNmZhNmY1OTUwYTdjZTQ2NWZjZjI0N2FhMGIwOTQ4MjhhYzk1MmMiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiIzMjU1NTk0MDU1OS5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbSIsImF1ZCI6IjMyNTU1OTQwNTU5LmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwic3ViIjoiMTEzMzE4NTQxMDA5MDU3Mzc4MzI4IiwiaGQiOiJnb29nbGUuY29tIiwiZW1haWwiOiJpdGh1cmllbEBnb29nbGUuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImF0X2hhc2giOiI5OVJVYVFrRHJsVDFZOUV0SzdiYXJnIiwiaWF0IjoxNjAxNTgxMzQ5LCJleHAiOjE2MDE1ODQ5NDl9.SZ-4DyDcogDh_CDUKHqPCiT8AKLg4zLMpPhGQzmcmHQ6cJiV0WRVMf5Lq911qsvuekgxfQpIdKNXlD6yk3FqvC2rjBbuEztMF-OD_2B8CEIYFlMLGuTQimJlUQksLKM-3B2ITRDCxnyEdaZik0OVssiy1CBTsllS5MgTFqic7w8w0Cd6diqNkfPFZRWyRYsrRDRlHHbH5_TUnv2wnLVHBHlNvU4wU2yyjDIoqOvTRp8jtXdq7K31CDhXd47-hXsVFQn2ZgzuUEAkH2Q6NIXACcVyZOrjBcZiOQI9IRWz-g03LzbzPSecO7I8dDrhqUSqMrdNUz_f8Kr8JFhuVMfVug"}, - "scope": []string{"https://www.googleapis.com/auth/devstorage.full_control"}, -} -var headerData = http.Header{ - "Content-Type": []string{"application/x-www-form-urlencoded"}, -} +var audience = []string{"32555940559.apps.googleusercontent.com"} +var grantType = []string{"urn:ietf:params:oauth:grant-type:token-exchange"} +var requestedTokenType = []string{"urn:ietf:params:oauth:token-type:access_token"} +var subjectTokenType = []string{"urn:ietf:params:oauth:token-type:jwt"} +var subjectToken = []string{"eyJhbGciOiJSUzI1NiIsImtpZCI6IjJjNmZhNmY1OTUwYTdjZTQ2NWZjZjI0N2FhMGIwOTQ4MjhhYzk1MmMiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiIzMjU1NTk0MDU1OS5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbSIsImF1ZCI6IjMyNTU1OTQwNTU5LmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwic3ViIjoiMTEzMzE4NTQxMDA5MDU3Mzc4MzI4IiwiaGQiOiJnb29nbGUuY29tIiwiZW1haWwiOiJpdGh1cmllbEBnb29nbGUuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImF0X2hhc2giOiI5OVJVYVFrRHJsVDFZOUV0SzdiYXJnIiwiaWF0IjoxNjAxNTgxMzQ5LCJleHAiOjE2MDE1ODQ5NDl9.SZ-4DyDcogDh_CDUKHqPCiT8AKLg4zLMpPhGQzmcmHQ6cJiV0WRVMf5Lq911qsvuekgxfQpIdKNXlD6yk3FqvC2rjBbuEztMF-OD_2B8CEIYFlMLGuTQimJlUQksLKM-3B2ITRDCxnyEdaZik0OVssiy1CBTsllS5MgTFqic7w8w0Cd6diqNkfPFZRWyRYsrRDRlHHbH5_TUnv2wnLVHBHlNvU4wU2yyjDIoqOvTRp8jtXdq7K31CDhXd47-hXsVFQn2ZgzuUEAkH2Q6NIXACcVyZOrjBcZiOQI9IRWz-g03LzbzPSecO7I8dDrhqUSqMrdNUz_f8Kr8JFhuVMfVug"} +var scope = []string{"https://www.googleapis.com/auth/devstorage.full_control"} -var sharedWant = map[string][]string{ - "audience": []string{"32555940559.apps.googleusercontent.com"}, - "grant_type": []string{"urn:ietf:params:oauth:grant-type:token-exchange"}, - "requested_token_type": []string{"urn:ietf:params:oauth:token-type:access_token"}, - "subject_token_type": []string{"urn:ietf:params:oauth:token-type:jwt"}, - "subject_token": []string{"eyJhbGciOiJSUzI1NiIsImtpZCI6IjJjNmZhNmY1OTUwYTdjZTQ2NWZjZjI0N2FhMGIwOTQ4MjhhYzk1MmMiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiIzMjU1NTk0MDU1OS5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbSIsImF1ZCI6IjMyNTU1OTQwNTU5LmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwic3ViIjoiMTEzMzE4NTQxMDA5MDU3Mzc4MzI4IiwiaGQiOiJnb29nbGUuY29tIiwiZW1haWwiOiJpdGh1cmllbEBnb29nbGUuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImF0X2hhc2giOiI5OVJVYVFrRHJsVDFZOUV0SzdiYXJnIiwiaWF0IjoxNjAxNTgxMzQ5LCJleHAiOjE2MDE1ODQ5NDl9.SZ-4DyDcogDh_CDUKHqPCiT8AKLg4zLMpPhGQzmcmHQ6cJiV0WRVMf5Lq911qsvuekgxfQpIdKNXlD6yk3FqvC2rjBbuEztMF-OD_2B8CEIYFlMLGuTQimJlUQksLKM-3B2ITRDCxnyEdaZik0OVssiy1CBTsllS5MgTFqic7w8w0Cd6diqNkfPFZRWyRYsrRDRlHHbH5_TUnv2wnLVHBHlNvU4wU2yyjDIoqOvTRp8jtXdq7K31CDhXd47-hXsVFQn2ZgzuUEAkH2Q6NIXACcVyZOrjBcZiOQI9IRWz-g03LzbzPSecO7I8dDrhqUSqMrdNUz_f8Kr8JFhuVMfVug"}, - "scope": []string{"https://www.googleapis.com/auth/devstorage.full_control"}, -} +var ContentType = []string{"application/x-www-form-urlencoded"} func TestClientAuthentication_InjectHeaderAuthentication(t *testing.T) { valuesH := url.Values{ - "audience": valuesData["audience"], - "grant_type": valuesData["grant_type"], - "requested_token_type": valuesData["requested_token_type"], - "subject_token_type": valuesData["subject_token_type"], - "subject_token": valuesData["subject_token"], - "scope": valuesData["scope"], + "audience": audience, + "grant_type": grantType, + "requested_token_type": requestedTokenType, + "subject_token_type": subjectTokenType, + "subject_token": subjectToken, + "scope": scope, } headerH := http.Header{ - "Content-Type": headerData["Content-Type"], + "Content-Type": ContentType, } headerAuthentication := ClientAuthentication{ @@ -56,22 +44,22 @@ func TestClientAuthentication_InjectHeaderAuthentication(t *testing.T) { } headerAuthentication.InjectAuthentication(valuesH, headerH) - if got, want := valuesH["audience"], sharedWant["audience"]; !reflect.DeepEqual(got, want) { + if got, want := valuesH["audience"], audience; !reflect.DeepEqual(got, want) { t.Errorf("audience = %q, want %q", got, want) } - if got, want := valuesH["grant_type"], sharedWant["grant_type"]; !reflect.DeepEqual(got, want) { + if got, want := valuesH["grant_type"], grantType; !reflect.DeepEqual(got, want) { t.Errorf("grant_type = %q, want %q", got, want) } - if got, want := valuesH["requested_token_type"], sharedWant["requested_token_type"]; !reflect.DeepEqual(got, want) { + if got, want := valuesH["requested_token_type"], requestedTokenType; !reflect.DeepEqual(got, want) { t.Errorf("requested_token_type = %q, want %q", got, want) } - if got, want := valuesH["subject_token_type"], sharedWant["subject_token_type"]; !reflect.DeepEqual(got, want) { + if got, want := valuesH["subject_token_type"], subjectTokenType; !reflect.DeepEqual(got, want) { t.Errorf("subject_token_type = %q, want %q", got, want) } - if got, want := valuesH["subject_token"], sharedWant["subject_token"]; !reflect.DeepEqual(got, want) { + if got, want := valuesH["subject_token"], subjectToken; !reflect.DeepEqual(got, want) { t.Errorf("subject_token = %q, want %q", got, want) } - if got, want := valuesH["scope"], sharedWant["scope"]; !reflect.DeepEqual(got, want) { + if got, want := valuesH["scope"], scope; !reflect.DeepEqual(got, want) { t.Errorf("scope = %q, want %q", got, want) } if got, want := headerH["Authorization"], []string{"Basic cmJyZ25vZ25yaG9uZ28zYmk0Z2I5Z2hnOWc6bm90c29zZWNyZXQ="}; !reflect.DeepEqual(got, want) { @@ -81,15 +69,15 @@ func TestClientAuthentication_InjectHeaderAuthentication(t *testing.T) { func TestClientAuthentication_ParamsAuthentication(t *testing.T) { valuesP := url.Values{ - "audience": valuesData["audience"], - "grant_type": valuesData["grant_type"], - "requested_token_type": valuesData["requested_token_type"], - "subject_token_type": valuesData["subject_token_type"], - "subject_token": valuesData["subject_token"], - "scope": valuesData["scope"], + "audience": audience, + "grant_type": grantType, + "requested_token_type": requestedTokenType, + "subject_token_type": subjectTokenType, + "subject_token": subjectToken, + "scope": scope, } headerP := http.Header{ - "Content-Type": headerData["Content-Type"], + "Content-Type": ContentType, } paramsAuthentication := ClientAuthentication{ AuthStyle: oauth2.AuthStyleInParams, @@ -98,22 +86,22 @@ func TestClientAuthentication_ParamsAuthentication(t *testing.T) { } paramsAuthentication.InjectAuthentication(valuesP, headerP) - if got, want := valuesP["audience"], sharedWant["audience"]; !reflect.DeepEqual(got, want) { + if got, want := valuesP["audience"], audience; !reflect.DeepEqual(got, want) { t.Errorf("audience = %q, want %q", got, want) } - if got, want := valuesP["grant_type"], sharedWant["grant_type"]; !reflect.DeepEqual(got, want) { + if got, want := valuesP["grant_type"], grantType; !reflect.DeepEqual(got, want) { t.Errorf("grant_type = %q, want %q", got, want) } - if got, want := valuesP["requested_token_type"], sharedWant["requested_token_type"]; !reflect.DeepEqual(got, want) { + if got, want := valuesP["requested_token_type"], requestedTokenType; !reflect.DeepEqual(got, want) { t.Errorf("requested_token_type = %q, want %q", got, want) } - if got, want := valuesP["subject_token_type"], sharedWant["subject_token_type"]; !reflect.DeepEqual(got, want) { + if got, want := valuesP["subject_token_type"], subjectTokenType; !reflect.DeepEqual(got, want) { t.Errorf("subject_token_type = %q, want %q", got, want) } - if got, want := valuesP["subject_token"], sharedWant["subject_token"]; !reflect.DeepEqual(got, want) { + if got, want := valuesP["subject_token"], subjectToken; !reflect.DeepEqual(got, want) { t.Errorf("subject_token = %q, want %q", got, want) } - if got, want := valuesP["scope"], sharedWant["scope"]; !reflect.DeepEqual(got, want) { + if got, want := valuesP["scope"], scope; !reflect.DeepEqual(got, want) { t.Errorf("scope = %q, want %q", got, want) } if got, want := valuesP["client_id"], []string{clientID}; !reflect.DeepEqual(got, want) {