Index: net/tools/dump_cache/url_utilities_unittest.cc |
diff --git a/net/tools/dump_cache/url_utilities_unittest.cc b/net/tools/dump_cache/url_utilities_unittest.cc |
index 3220472b9015803230ac647e8ed3a395d3e2b963..4934faeb74a82289eea34b7120ee81c5e8de946f 100644 |
--- a/net/tools/dump_cache/url_utilities_unittest.cc |
+++ b/net/tools/dump_cache/url_utilities_unittest.cc |
@@ -13,25 +13,18 @@ |
namespace net { |
TEST(UrlUtilitiesTest, GetUrlHost) { |
- EXPECT_EQ("www.foo.com", |
- UrlUtilities::GetUrlHost("http://www.foo.com")); |
- EXPECT_EQ("www.foo.com", |
- UrlUtilities::GetUrlHost("http://www.foo.com:80")); |
- EXPECT_EQ("www.foo.com", |
- UrlUtilities::GetUrlHost("http://www.foo.com:80/")); |
- EXPECT_EQ("www.foo.com", |
- UrlUtilities::GetUrlHost("http://www.foo.com/news")); |
+ EXPECT_EQ("www.foo.com", UrlUtilities::GetUrlHost("http://www.foo.com")); |
+ EXPECT_EQ("www.foo.com", UrlUtilities::GetUrlHost("http://www.foo.com:80")); |
+ EXPECT_EQ("www.foo.com", UrlUtilities::GetUrlHost("http://www.foo.com:80/")); |
+ EXPECT_EQ("www.foo.com", UrlUtilities::GetUrlHost("http://www.foo.com/news")); |
EXPECT_EQ("www.foo.com", |
UrlUtilities::GetUrlHost("www.foo.com:80/news?q=hello")); |
- EXPECT_EQ("www.foo.com", |
- UrlUtilities::GetUrlHost("www.foo.com/news?q=a:b")); |
- EXPECT_EQ("www.foo.com", |
- UrlUtilities::GetUrlHost("www.foo.com:80")); |
+ EXPECT_EQ("www.foo.com", UrlUtilities::GetUrlHost("www.foo.com/news?q=a:b")); |
+ EXPECT_EQ("www.foo.com", UrlUtilities::GetUrlHost("www.foo.com:80")); |
} |
TEST(UrlUtilitiesTest, GetUrlHostPath) { |
- EXPECT_EQ("www.foo.com", |
- UrlUtilities::GetUrlHostPath("http://www.foo.com")); |
+ EXPECT_EQ("www.foo.com", UrlUtilities::GetUrlHostPath("http://www.foo.com")); |
EXPECT_EQ("www.foo.com:80", |
UrlUtilities::GetUrlHostPath("http://www.foo.com:80")); |
EXPECT_EQ("www.foo.com:80/", |
@@ -42,39 +35,32 @@ TEST(UrlUtilitiesTest, GetUrlHostPath) { |
UrlUtilities::GetUrlHostPath("www.foo.com:80/news?q=hello")); |
EXPECT_EQ("www.foo.com/news?q=a:b", |
UrlUtilities::GetUrlHostPath("www.foo.com/news?q=a:b")); |
- EXPECT_EQ("www.foo.com:80", |
- UrlUtilities::GetUrlHostPath("www.foo.com:80")); |
+ EXPECT_EQ("www.foo.com:80", UrlUtilities::GetUrlHostPath("www.foo.com:80")); |
} |
TEST(UrlUtilitiesTest, GetUrlPath) { |
- EXPECT_EQ("/", |
- UrlUtilities::GetUrlPath("http://www.foo.com")); |
- EXPECT_EQ("/", |
- UrlUtilities::GetUrlPath("http://www.foo.com:80")); |
- EXPECT_EQ("/", |
- UrlUtilities::GetUrlPath("http://www.foo.com:80/")); |
- EXPECT_EQ("/news", |
- UrlUtilities::GetUrlPath("http://www.foo.com/news")); |
+ EXPECT_EQ("/", UrlUtilities::GetUrlPath("http://www.foo.com")); |
+ EXPECT_EQ("/", UrlUtilities::GetUrlPath("http://www.foo.com:80")); |
+ EXPECT_EQ("/", UrlUtilities::GetUrlPath("http://www.foo.com:80/")); |
+ EXPECT_EQ("/news", UrlUtilities::GetUrlPath("http://www.foo.com/news")); |
EXPECT_EQ("/news?q=hello", |
UrlUtilities::GetUrlPath("www.foo.com:80/news?q=hello")); |
- EXPECT_EQ("/news?q=a:b", |
- UrlUtilities::GetUrlPath("www.foo.com/news?q=a:b")); |
- EXPECT_EQ("/", |
- UrlUtilities::GetUrlPath("www.foo.com:80")); |
+ EXPECT_EQ("/news?q=a:b", UrlUtilities::GetUrlPath("www.foo.com/news?q=a:b")); |
+ EXPECT_EQ("/", UrlUtilities::GetUrlPath("www.foo.com:80")); |
} |
TEST(UrlUtilitiesTest, Unescape) { |
// Basic examples are left alone. |
- EXPECT_EQ("http://www.foo.com", |
- UrlUtilities::Unescape("http://www.foo.com")); |
+ EXPECT_EQ("http://www.foo.com", UrlUtilities::Unescape("http://www.foo.com")); |
EXPECT_EQ("www.foo.com:80/news?q=hello", |
UrlUtilities::Unescape("www.foo.com:80/news?q=hello")); |
// All chars can be unescaped. |
EXPECT_EQ("~`!@#$%^&*()_-+={[}]|\\:;\"'<,>.?/", |
- UrlUtilities::Unescape("%7E%60%21%40%23%24%25%5E%26%2A%28%29%5F%2D" |
- "%2B%3D%7B%5B%7D%5D%7C%5C%3A%3B%22%27%3C%2C" |
- "%3E%2E%3F%2F")); |
+ UrlUtilities::Unescape( |
+ "%7E%60%21%40%23%24%25%5E%26%2A%28%29%5F%2D" |
+ "%2B%3D%7B%5B%7D%5D%7C%5C%3A%3B%22%27%3C%2C" |
+ "%3E%2E%3F%2F")); |
for (int c = 0; c < 256; ++c) { |
std::string unescaped_char(1, implicit_cast<unsigned char>(c)); |
std::string escaped_char = base::StringPrintf("%%%02X", c); |
@@ -111,4 +97,3 @@ TEST(UrlUtilitiesTest, Unescape) { |
} |
} // namespace net |
- |