| Index: third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp b/third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp
|
| index 09d551d5a5b22041aac817fbe82653fc69763804..a95d0cd8341f18e82dec7441f9365aaaf728bfb0 100644
|
| --- a/third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp
|
| @@ -11,15 +11,6 @@
|
|
|
| namespace blink {
|
|
|
| -namespace {
|
| -
|
| -size_t parseHTTPHeader(const char* data, String& failureReason, AtomicString& nameStr, AtomicString& valueStr)
|
| -{
|
| - return blink::parseHTTPHeader(data, strlen(data), failureReason, nameStr, valueStr);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| TEST(HTTPParsersTest, ParseCacheControl)
|
| {
|
| CacheControlHeader header;
|
| @@ -102,125 +93,6 @@ TEST(HTTPParsersTest, ParseCacheControl)
|
| EXPECT_TRUE(std::isnan(header.maxAge));
|
| }
|
|
|
| -TEST(HTTPParsersTest, parseHTTPHeaderSimple)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(12u, parseHTTPHeader("foo: bar\r\notherdata", failureReason, name, value));
|
| - EXPECT_TRUE(failureReason.isEmpty());
|
| - EXPECT_EQ("foo", name.string());
|
| - EXPECT_EQ("bar", value.string());
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderEmptyName)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader(": bar\r\notherdata", failureReason, name, value));
|
| - EXPECT_EQ("Header name is missing", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderEmptyValue)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(7u, parseHTTPHeader("foo: \r\notherdata", failureReason, name, value));
|
| - EXPECT_TRUE(failureReason.isEmpty());
|
| - EXPECT_EQ("foo", name.string());
|
| - EXPECT_TRUE(value.isEmpty());
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderInvalidName)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader("\xfa: \r\notherdata", failureReason, name, value));
|
| - EXPECT_EQ("Invalid UTF-8 sequence in header name", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderInvalidValue)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader("foo: \xfa\r\notherdata", failureReason, name, value));
|
| - EXPECT_EQ("Invalid UTF-8 sequence in header value", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderEmpty)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader("", failureReason, name, value));
|
| - EXPECT_EQ("Unterminated header name", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderEmptyLine)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(2u, parseHTTPHeader("\r\notherdata", failureReason, name, value));
|
| - EXPECT_TRUE(failureReason.isEmpty());
|
| - EXPECT_TRUE(name.isNull());
|
| - EXPECT_TRUE(value.isNull());
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderUnexpectedCRinName)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader("foo\rotherdata\n", failureReason, name, value));
|
| - EXPECT_EQ("Unexpected CR in name at foo", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderUnexpectedLFinName)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader("foo\notherdata\n", failureReason, name, value));
|
| - EXPECT_EQ("Unexpected LF in name at foo", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderUnexpectedLFinValue)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader("foo: bar\notherdata\n", failureReason, name, value));
|
| - EXPECT_EQ("Unexpected LF in value at bar", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderNoLFAtEndOfLine)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader("foo: bar\r", failureReason, name, value));
|
| - EXPECT_EQ("LF doesn't follow CR after value at ", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderNoLF)
|
| -{
|
| - String failureReason;
|
| - AtomicString name, value;
|
| - EXPECT_EQ(0u, parseHTTPHeader("foo: bar\rhoge\r\n", failureReason, name, value));
|
| - EXPECT_EQ("LF doesn't follow CR after value at hoge\r\n", failureReason);
|
| -}
|
| -
|
| -TEST(HTTPParsersTest, parseHTTPHeaderTwoLines)
|
| -{
|
| - const char data[] = "foo: bar\r\nhoge: fuga\r\nxxx";
|
| - String failureReason;
|
| - AtomicString name, value;
|
| -
|
| - EXPECT_EQ(10u, parseHTTPHeader(data, failureReason, name, value));
|
| - EXPECT_TRUE(failureReason.isEmpty());
|
| - EXPECT_EQ("foo", name.string());
|
| - EXPECT_EQ("bar", value.string());
|
| -
|
| - EXPECT_EQ(12u, parseHTTPHeader(data + 10, failureReason, name, value));
|
| - EXPECT_TRUE(failureReason.isEmpty());
|
| - EXPECT_EQ("hoge", name.string());
|
| - EXPECT_EQ("fuga", value.string());
|
| -}
|
| -
|
| TEST(HTTPParsersTest, CommaDelimitedHeaderSet)
|
| {
|
| CommaDelimitedHeaderSet set1;
|
| @@ -263,4 +135,3 @@ TEST(HTTPParsersTest, HTTPFieldContent)
|
| }
|
|
|
| } // namespace blink
|
| -
|
|
|