Index: chrome/common/net/gaia/oauth_request_signer_unittest.cc |
=================================================================== |
--- chrome/common/net/gaia/oauth_request_signer_unittest.cc (revision 137977) |
+++ chrome/common/net/gaia/oauth_request_signer_unittest.cc (working copy) |
@@ -21,8 +21,8 @@ |
"0123456789" |
"-._~"); |
ASSERT_EQ(OAuthRequestSigner::Encode( |
- "https://www.google.com/accounts/OAuthLogin"), |
- "https%3A%2F%2Fwww.google.com%2Faccounts%2FOAuthLogin"); |
+ "https://accounts.google.com/OAuthLogin"), |
+ "https%3A%2F%2Faccounts.google.com%2FOAuthLogin"); |
ASSERT_EQ(OAuthRequestSigner::Encode("%"), "%25"); |
ASSERT_EQ(OAuthRequestSigner::Encode("%25"), "%2525"); |
ASSERT_EQ(OAuthRequestSigner::Encode( |
@@ -74,7 +74,7 @@ |
TEST(OAuthRequestSignerTest, SignGet1) { |
GURL request_url("https://www.google.com/accounts/o8/GetOAuthToken"); |
OAuthRequestSigner::Parameters parameters; |
- parameters["scope"] = "https://www.google.com/accounts/OAuthLogin"; |
+ parameters["scope"] = "https://accounts.google.com/OAuthLogin"; |
parameters["oauth_nonce"] = "2oiE_aHdk5qRTz0L9C8Lq0g"; |
parameters["xaouth_display_name"] = "Chromium"; |
parameters["oauth_timestamp"] = "1308152953"; |
@@ -92,18 +92,18 @@ |
ASSERT_EQ("https://www.google.com/accounts/o8/GetOAuthToken" |
"?oauth_consumer_key=johndoe" |
"&oauth_nonce=2oiE_aHdk5qRTz0L9C8Lq0g" |
- "&oauth_signature=y9GCmlGSvNuTAotxsBMyxb6j%2BE8%3D" |
+ "&oauth_signature=PFqDTaiyey1UObcvOyI4Ng2HXW0%3D" |
"&oauth_signature_method=HMAC-SHA1" |
"&oauth_timestamp=1308152953" |
"&oauth_token=4%2FVGY0MsQadcmO8VnCv9gnhoEooq1v" |
"&oauth_version=1.0" |
- "&scope=https%3A%2F%2Fwww.google.com%2Faccounts%2FOAuthLogin" |
+ "&scope=https%3A%2F%2Faccounts.google.com%2FOAuthLogin" |
"&xaouth_display_name=Chromium", |
signed_text); |
} |
TEST(OAuthRequestSignerTest, SignGet2) { |
- GURL request_url("https://www.google.com/accounts/OAuthGetAccessToken"); |
+ GURL request_url("https://accounts.google.com/OAuthGetAccessToken"); |
OAuthRequestSigner::Parameters parameters; |
parameters["oauth_timestamp"] = "1308147831"; |
parameters["oauth_nonce"] = "4d4hZW9DygWQujP2tz06UN"; |
@@ -119,10 +119,10 @@ |
"", // token secret |
&signed_text)); |
ASSERT_EQ(signed_text, |
- "https://www.google.com/accounts/OAuthGetAccessToken" |
+ "https://accounts.google.com/OAuthGetAccessToken" |
"?oauth_consumer_key=anonymous" |
"&oauth_nonce=4d4hZW9DygWQujP2tz06UN" |
- "&oauth_signature=2KVN8YCOKgiNIA16EGTcfESvdvA%3D" |
+ "&oauth_signature=YiJv%2BEOWsvCDCi13%2FhQBFrr0J7c%3D" |
"&oauth_signature_method=HMAC-SHA1" |
"&oauth_timestamp=1308147831" |
"&oauth_token=4%2FCcC-hgdj1TNnWaX8NTQ76YDXCBEK" |
@@ -131,7 +131,7 @@ |
TEST(OAuthRequestSignerTest, ParseAndSignGet1) { |
GURL request_url("https://www.google.com/accounts/o8/GetOAuthToken" |
- "?scope=https://www.google.com/accounts/OAuthLogin" |
+ "?scope=https://accounts.google.com/OAuthLogin" |
"&oauth_nonce=2oiE_aHdk5qRTz0L9C8Lq0g" |
"&xaouth_display_name=Chromium" |
"&oauth_timestamp=1308152953"); |
@@ -148,18 +148,18 @@ |
ASSERT_EQ("https://www.google.com/accounts/o8/GetOAuthToken" |
"?oauth_consumer_key=anonymous" |
"&oauth_nonce=2oiE_aHdk5qRTz0L9C8Lq0g" |
- "&oauth_signature=S%2B6dcftDfbINlavHuma4NLJ98Ys%3D" |
+ "&oauth_signature=PH7KP6cP%2BzZ1SJ6WGqBgXwQP9Mc%3D" |
"&oauth_signature_method=HMAC-SHA1" |
"&oauth_timestamp=1308152953" |
"&oauth_token=4%2FCcC-hgdj1TNnWaX8NTQ76YDXCBEK" |
"&oauth_version=1.0" |
- "&scope=https%3A%2F%2Fwww.google.com%2Faccounts%2FOAuthLogin" |
+ "&scope=https%3A%2F%2Faccounts.google.com%2FOAuthLogin" |
"&xaouth_display_name=Chromium", |
signed_text); |
} |
TEST(OAuthRequestSignerTest, ParseAndSignGet2) { |
- GURL request_url("https://www.google.com/accounts/OAuthGetAccessToken" |
+ GURL request_url("https://accounts.google.com/OAuthGetAccessToken" |
"?oauth_timestamp=1308147831" |
"&oauth_nonce=4d4hZW9DygWQujP2tz06UN"); |
std::string signed_text; |
@@ -173,10 +173,10 @@ |
"", // token secret |
&signed_text)); |
ASSERT_EQ(signed_text, |
- "https://www.google.com/accounts/OAuthGetAccessToken" |
+ "https://accounts.google.com/OAuthGetAccessToken" |
"?oauth_consumer_key=anonymous" |
"&oauth_nonce=4d4hZW9DygWQujP2tz06UN" |
- "&oauth_signature=2KVN8YCOKgiNIA16EGTcfESvdvA%3D" |
+ "&oauth_signature=YiJv%2BEOWsvCDCi13%2FhQBFrr0J7c%3D" |
"&oauth_signature_method=HMAC-SHA1" |
"&oauth_timestamp=1308147831" |
"&oauth_token=4%2FCcC-hgdj1TNnWaX8NTQ76YDXCBEK" |
@@ -186,7 +186,7 @@ |
TEST(OAuthRequestSignerTest, SignPost1) { |
GURL request_url("https://www.google.com/accounts/o8/GetOAuthToken"); |
OAuthRequestSigner::Parameters parameters; |
- parameters["scope"] = "https://www.google.com/accounts/OAuthLogin"; |
+ parameters["scope"] = "https://accounts.google.com/OAuthLogin"; |
parameters["oauth_nonce"] = "2oiE_aHdk5qRTz0L9C8Lq0g"; |
parameters["xaouth_display_name"] = "Chromium"; |
parameters["oauth_timestamp"] = "1308152953"; |
@@ -203,18 +203,18 @@ |
&signed_text)); |
ASSERT_EQ("oauth_consumer_key=anonymous" |
"&oauth_nonce=2oiE_aHdk5qRTz0L9C8Lq0g" |
- "&oauth_signature=F%2BINyO4xgon5wUxcdcxWC11Ep7Y%3D" |
+ "&oauth_signature=vVlfv6dnV2%2Fx7TozS0Gf83zS2%2BQ%3D" |
"&oauth_signature_method=HMAC-SHA1" |
"&oauth_timestamp=1308152953" |
"&oauth_token=4%2FX8x0r7bHif_VNCLjUMutxGkzo13d" |
"&oauth_version=1.0" |
- "&scope=https%3A%2F%2Fwww.google.com%2Faccounts%2FOAuthLogin" |
+ "&scope=https%3A%2F%2Faccounts.google.com%2FOAuthLogin" |
"&xaouth_display_name=Chromium", |
signed_text); |
} |
TEST(OAuthRequestSignerTest, SignPost2) { |
- GURL request_url("https://www.google.com/accounts/OAuthGetAccessToken"); |
+ GURL request_url("https://accounts.google.com/OAuthGetAccessToken"); |
OAuthRequestSigner::Parameters parameters; |
parameters["oauth_timestamp"] = "1234567890"; |
parameters["oauth_nonce"] = "17171717171717171"; |
@@ -232,7 +232,7 @@ |
ASSERT_EQ(signed_text, |
"oauth_consumer_key=anonymous" |
"&oauth_nonce=17171717171717171" |
- "&oauth_signature=BIuPHITrcptxSefd8H9Iazo8Pmo%3D" |
+ "&oauth_signature=tPX2XqKQICWzopZ80CFGX%2F53DLo%3D" |
"&oauth_signature_method=HMAC-SHA1" |
"&oauth_timestamp=1234567890" |
"&oauth_token=4%2FCcC-hgdj1TNnWaX8NTQ76YDXCBEK" |
@@ -241,7 +241,7 @@ |
TEST(OAuthRequestSignerTest, ParseAndSignPost1) { |
GURL request_url("https://www.google.com/accounts/o8/GetOAuthToken" |
- "?scope=https://www.google.com/accounts/OAuthLogin" |
+ "?scope=https://accounts.google.com/OAuthLogin" |
"&oauth_nonce=2oiE_aHdk5qRTz0L9C8Lq0g" |
"&xaouth_display_name=Chromium" |
"&oauth_timestamp=1308152953"); |
@@ -257,18 +257,18 @@ |
&signed_text)); |
ASSERT_EQ("oauth_consumer_key=anonymous" |
"&oauth_nonce=2oiE_aHdk5qRTz0L9C8Lq0g" |
- "&oauth_signature=F%2BINyO4xgon5wUxcdcxWC11Ep7Y%3D" |
+ "&oauth_signature=vVlfv6dnV2%2Fx7TozS0Gf83zS2%2BQ%3D" |
"&oauth_signature_method=HMAC-SHA1" |
"&oauth_timestamp=1308152953" |
"&oauth_token=4%2FX8x0r7bHif_VNCLjUMutxGkzo13d" |
"&oauth_version=1.0" |
- "&scope=https%3A%2F%2Fwww.google.com%2Faccounts%2FOAuthLogin" |
+ "&scope=https%3A%2F%2Faccounts.google.com%2FOAuthLogin" |
"&xaouth_display_name=Chromium", |
signed_text); |
} |
TEST(OAuthRequestSignerTest, ParseAndSignPost2) { |
- GURL request_url("https://www.google.com/accounts/OAuthGetAccessToken" |
+ GURL request_url("https://accounts.google.com/OAuthGetAccessToken" |
"?oauth_timestamp=1234567890" |
"&oauth_nonce=17171717171717171"); |
std::string signed_text; |
@@ -284,7 +284,7 @@ |
ASSERT_EQ(signed_text, |
"oauth_consumer_key=anonymous" |
"&oauth_nonce=17171717171717171" |
- "&oauth_signature=BIuPHITrcptxSefd8H9Iazo8Pmo%3D" |
+ "&oauth_signature=tPX2XqKQICWzopZ80CFGX%2F53DLo%3D" |
"&oauth_signature_method=HMAC-SHA1" |
"&oauth_timestamp=1234567890" |
"&oauth_token=4%2FCcC-hgdj1TNnWaX8NTQ76YDXCBEK" |
@@ -294,7 +294,7 @@ |
TEST(OAuthRequestSignerTest, SignAuthHeader) { |
GURL request_url("https://www.google.com/accounts/o8/GetOAuthToken"); |
OAuthRequestSigner::Parameters parameters; |
- parameters["scope"] = "https://www.google.com/accounts/OAuthLogin"; |
+ parameters["scope"] = "https://accounts.google.com/OAuthLogin"; |
parameters["oauth_nonce"] = "2oiE_aHdk5qRTz0L9C8Lq0g"; |
parameters["xaouth_display_name"] = "Chromium"; |
parameters["oauth_timestamp"] = "1308152953"; |
@@ -312,12 +312,12 @@ |
ASSERT_EQ("OAuth " |
"oauth_consumer_key=\"johndoe\", " |
"oauth_nonce=\"2oiE_aHdk5qRTz0L9C8Lq0g\", " |
- "oauth_signature=\"y9GCmlGSvNuTAotxsBMyxb6j%2BE8%3D\", " |
+ "oauth_signature=\"PFqDTaiyey1UObcvOyI4Ng2HXW0%3D\", " |
"oauth_signature_method=\"HMAC-SHA1\", " |
"oauth_timestamp=\"1308152953\", " |
"oauth_token=\"4%2FVGY0MsQadcmO8VnCv9gnhoEooq1v\", " |
"oauth_version=\"1.0\", " |
- "scope=\"https%3A%2F%2Fwww.google.com%2Faccounts%2FOAuthLogin\", " |
+ "scope=\"https%3A%2F%2Faccounts.google.com%2FOAuthLogin\", " |
"xaouth_display_name=\"Chromium\"", |
signed_text); |
} |
Property changes on: chrome/common/net/gaia/oauth_request_signer_unittest.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |