| Index: net/base/dns_util_unittest.cc
|
| diff --git a/net/base/dns_util_unittest.cc b/net/base/dns_util_unittest.cc
|
| index 06f1fb25877cc61cdc2688ef9e86c294777a19d5..1937a74c3ffc51ea70b6d335045d1c38437a332c 100644
|
| --- a/net/base/dns_util_unittest.cc
|
| +++ b/net/base/dns_util_unittest.cc
|
| @@ -7,8 +7,7 @@
|
|
|
| namespace net {
|
|
|
| -class DNSUtilTest : public testing::Test {
|
| -};
|
| +class DNSUtilTest : public testing::Test {};
|
|
|
| // IncludeNUL converts a char* to a std::string and includes the terminating
|
| // NUL in the result.
|
| @@ -31,18 +30,41 @@ TEST_F(DNSUtilTest, DNSDomainFromDot) {
|
| EXPECT_EQ(out, IncludeNUL("\003www\006google\003com"));
|
|
|
| // Label is 63 chars: still valid
|
| - EXPECT_TRUE(DNSDomainFromDot("z23456789a123456789a123456789a123456789a123456789a123456789a123", &out));
|
| - EXPECT_EQ(out, IncludeNUL("\077z23456789a123456789a123456789a123456789a123456789a123456789a123"));
|
| + EXPECT_TRUE(DNSDomainFromDot(
|
| + "z23456789a123456789a123456789a123456789a123456789a123456789a123", &out));
|
| + EXPECT_EQ(out,
|
| + IncludeNUL(
|
| + "\077z23456789a123456789a123456789a123456789a123456789a12345678"
|
| + "9a123"));
|
|
|
| // Label is too long: invalid
|
| - EXPECT_FALSE(DNSDomainFromDot("123456789a123456789a123456789a123456789a123456789a123456789a1234", &out));
|
| + EXPECT_FALSE(DNSDomainFromDot(
|
| + "123456789a123456789a123456789a123456789a123456789a123456789a1234",
|
| + &out));
|
|
|
| // 253 characters in the name: still valid
|
| - EXPECT_TRUE(DNSDomainFromDot("abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abc", &out));
|
| - EXPECT_EQ(out, IncludeNUL("\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\003abc"));
|
| + EXPECT_TRUE(DNSDomainFromDot(
|
| + "abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi."
|
| + "abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi."
|
| + "abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi.abcdefghi."
|
| + "abcdefghi.abcdefghi.abcdefghi.abcdefghi.abc",
|
| + &out));
|
| + EXPECT_EQ(out,
|
| + IncludeNUL(
|
| + "\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdef"
|
| + "ghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abc"
|
| + "defghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011"
|
| + "abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi"
|
| + "\011abcdefghi\011abcdefghi\011abcdefghi\011abcdefghi\011abcdef"
|
| + "ghi\011abcdefghi\003abc"));
|
|
|
| // 254 characters in the name: invalid
|
| - EXPECT_FALSE(DNSDomainFromDot("123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.1234", &out));
|
| + EXPECT_FALSE(DNSDomainFromDot(
|
| + "123456789.123456789.123456789.123456789.123456789.123456789.123456789."
|
| + "123456789.123456789.123456789.123456789.123456789.123456789.123456789."
|
| + "123456789.123456789.123456789.123456789.123456789.123456789.123456789."
|
| + "123456789.123456789.123456789.123456789.1234",
|
| + &out));
|
|
|
| // Zero length labels should be dropped.
|
| EXPECT_TRUE(DNSDomainFromDot("www.google.com.", &out));
|
|
|