Index: net/http/http_auth_challenge_tokenizer_unittest.cc |
diff --git a/net/http/http_auth_challenge_tokenizer_unittest.cc b/net/http/http_auth_challenge_tokenizer_unittest.cc |
index 2cf657a17f5bd7ae78658925ac1595603c294767..1f3ffaca2a64c57e5f109afd995d67668f4253b9 100644 |
--- a/net/http/http_auth_challenge_tokenizer_unittest.cc |
+++ b/net/http/http_auth_challenge_tokenizer_unittest.cc |
@@ -14,7 +14,7 @@ TEST(HttpAuthChallengeTokenizerTest, Basic) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("Basic"), challenge.scheme()); |
+ EXPECT_EQ(std::string("basic"), challenge.NormalizedScheme()); |
EXPECT_TRUE(parameters.GetNext()); |
EXPECT_TRUE(parameters.valid()); |
EXPECT_EQ(std::string("realm"), parameters.name()); |
@@ -30,7 +30,7 @@ TEST(HttpAuthChallengeTokenizerTest, NoQuotes) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("Basic"), challenge.scheme()); |
+ EXPECT_EQ(std::string("basic"), challenge.NormalizedScheme()); |
EXPECT_TRUE(parameters.GetNext()); |
EXPECT_TRUE(parameters.valid()); |
EXPECT_EQ(std::string("realm"), parameters.name()); |
@@ -46,7 +46,7 @@ TEST(HttpAuthChallengeTokenizerTest, MismatchedQuotes) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("Basic"), challenge.scheme()); |
+ EXPECT_EQ(std::string("basic"), challenge.NormalizedScheme()); |
EXPECT_TRUE(parameters.GetNext()); |
EXPECT_TRUE(parameters.valid()); |
EXPECT_EQ(std::string("realm"), parameters.name()); |
@@ -62,7 +62,7 @@ TEST(HttpAuthChallengeTokenizerTest, MismatchedQuotesNoValue) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("Basic"), challenge.scheme()); |
+ EXPECT_EQ(std::string("basic"), challenge.NormalizedScheme()); |
EXPECT_TRUE(parameters.GetNext()); |
EXPECT_TRUE(parameters.valid()); |
EXPECT_EQ(std::string("realm"), parameters.name()); |
@@ -79,7 +79,7 @@ TEST(HttpAuthChallengeTokenizerTest, MismatchedQuotesSpaces) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("Basic"), challenge.scheme()); |
+ EXPECT_EQ(std::string("basic"), challenge.NormalizedScheme()); |
EXPECT_TRUE(parameters.GetNext()); |
EXPECT_TRUE(parameters.valid()); |
EXPECT_EQ(std::string("realm"), parameters.name()); |
@@ -96,7 +96,7 @@ TEST(HttpAuthChallengeTokenizerTest, MismatchedQuotesMultiple) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("Digest"), challenge.scheme()); |
+ EXPECT_EQ(std::string("digest"), challenge.NormalizedScheme()); |
EXPECT_TRUE(parameters.GetNext()); |
EXPECT_TRUE(parameters.valid()); |
EXPECT_EQ(std::string("qop"), parameters.name()); |
@@ -120,7 +120,7 @@ TEST(HttpAuthChallengeTokenizerTest, NoValue) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("Digest"), challenge.scheme()); |
+ EXPECT_EQ(std::string("digest"), challenge.NormalizedScheme()); |
EXPECT_FALSE(parameters.GetNext()); |
EXPECT_FALSE(parameters.valid()); |
} |
@@ -134,7 +134,7 @@ TEST(HttpAuthChallengeTokenizerTest, Multiple) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("Digest"), challenge.scheme()); |
+ EXPECT_EQ(std::string("digest"), challenge.NormalizedScheme()); |
EXPECT_TRUE(parameters.GetNext()); |
EXPECT_TRUE(parameters.valid()); |
EXPECT_EQ(std::string("algorithm"), parameters.name()); |
@@ -159,7 +159,7 @@ TEST(HttpAuthChallengeTokenizerTest, NoProperty) { |
HttpUtil::NameValuePairsIterator parameters = challenge.param_pairs(); |
EXPECT_TRUE(parameters.valid()); |
- EXPECT_EQ(std::string("NTLM"), challenge.scheme()); |
+ EXPECT_EQ(std::string("ntlm"), challenge.NormalizedScheme()); |
EXPECT_FALSE(parameters.GetNext()); |
} |
@@ -169,9 +169,21 @@ TEST(HttpAuthChallengeTokenizerTest, Base64) { |
HttpAuthChallengeTokenizer challenge(challenge_str.begin(), |
challenge_str.end()); |
- EXPECT_EQ(std::string("NTLM"), challenge.scheme()); |
+ EXPECT_EQ(std::string("ntlm"), challenge.NormalizedScheme()); |
// Notice the two equal statements below due to padding removal. |
EXPECT_EQ(std::string("SGVsbG8sIFdvcmxkCg=="), challenge.base64_param()); |
} |
+// An invalid scheme should be visible through scheme_begin(), scheme_end() but |
+// not through NormalizedScheme(). |
+TEST(HttpAuthChallengeTokenizerTest, InvalidScheme) { |
+ std::string challenge_str = "Blah? abcd"; |
+ HttpAuthChallengeTokenizer challenge(challenge_str.begin(), |
+ challenge_str.end()); |
+ EXPECT_EQ(std::string(), challenge.NormalizedScheme()); |
+ EXPECT_EQ( |
+ base::StringPiece("Blah?"), |
+ base::StringPiece(challenge.scheme_begin(), challenge.scheme_end())); |
+} |
+ |
} // namespace net |