Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc

Issue 649763002: git cl format the second third of the net/base directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/network_change_notifier.cc ('K') | « net/base/registry_controlled_domains/registry_controlled_domain.cc ('k') | net/base/sdch_dictionary_fetcher.h » ('j') | net/base/trace_net_log_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc
diff --git a/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc
index 7a4a5283a8120a295c2178ecb13ef4fef97e2255..73af5dbc743c5265b34b0ea9edcd0da9caef1e38 100644
--- a/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc
+++ b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc
@@ -39,25 +39,21 @@ std::string GetDomainFromHost(const std::string& host) {
return GetDomainAndRegistry(host, EXCLUDE_PRIVATE_REGISTRIES);
}
-size_t GetRegistryLengthFromURL(
- const std::string& url,
- UnknownRegistryFilter unknown_filter) {
- return GetRegistryLength(GURL(url),
- unknown_filter,
- EXCLUDE_PRIVATE_REGISTRIES);
+size_t GetRegistryLengthFromURL(const std::string& url,
+ UnknownRegistryFilter unknown_filter) {
+ return GetRegistryLength(
+ GURL(url), unknown_filter, EXCLUDE_PRIVATE_REGISTRIES);
}
size_t GetRegistryLengthFromURLIncludingPrivate(
const std::string& url,
UnknownRegistryFilter unknown_filter) {
- return GetRegistryLength(GURL(url),
- unknown_filter,
- INCLUDE_PRIVATE_REGISTRIES);
+ return GetRegistryLength(
+ GURL(url), unknown_filter, INCLUDE_PRIVATE_REGISTRIES);
}
-size_t GetRegistryLengthFromHost(
- const std::string& host,
- UnknownRegistryFilter unknown_filter) {
+size_t GetRegistryLengthFromHost(const std::string& host,
+ UnknownRegistryFilter unknown_filter) {
return GetRegistryLength(host, unknown_filter, EXCLUDE_PRIVATE_REGISTRIES);
}
@@ -96,16 +92,16 @@ TEST_F(RegistryControlledDomainTest, TestGetDomainAndRegistry) {
EXPECT_EQ("", GetDomainFromURL("http://bar.jp")); // 3
EXPECT_EQ("", GetDomainFromURL("http://baz.bar.jp")); // 3 4
EXPECT_EQ("a.b.baz.bar.jp", GetDomainFromURL("http://a.b.baz.bar.jp"));
- // 4
+ // 4
EXPECT_EQ("pref.bar.jp", GetDomainFromURL("http://baz.pref.bar.jp")); // 5
EXPECT_EQ("b.bar.baz.com.", GetDomainFromURL("http://a.b.bar.baz.com."));
- // 6
- EXPECT_EQ("a.d.c", GetDomainFromURL("http://a.d.c")); // 7
- EXPECT_EQ("a.d.c", GetDomainFromURL("http://.a.d.c")); // 7
- EXPECT_EQ("a.d.c", GetDomainFromURL("http://..a.d.c")); // 7
- EXPECT_EQ("b.c", GetDomainFromURL("http://a.b.c")); // 7 8
- EXPECT_EQ("baz.com", GetDomainFromURL("http://baz.com")); // none
- EXPECT_EQ("baz.com.", GetDomainFromURL("http://baz.com.")); // none
+ // 6
+ EXPECT_EQ("a.d.c", GetDomainFromURL("http://a.d.c")); // 7
+ EXPECT_EQ("a.d.c", GetDomainFromURL("http://.a.d.c")); // 7
+ EXPECT_EQ("a.d.c", GetDomainFromURL("http://..a.d.c")); // 7
+ EXPECT_EQ("b.c", GetDomainFromURL("http://a.b.c")); // 7 8
+ EXPECT_EQ("baz.com", GetDomainFromURL("http://baz.com")); // none
+ EXPECT_EQ("baz.com.", GetDomainFromURL("http://baz.com.")); // none
EXPECT_EQ("", GetDomainFromURL(std::string()));
EXPECT_EQ("", GetDomainFromURL("http://"));
@@ -148,119 +144,161 @@ TEST_F(RegistryControlledDomainTest, TestGetRegistryLength) {
UseDomainData(test1::kDafsa);
// Test GURL version of GetRegistryLength().
- EXPECT_EQ(2U, GetRegistryLengthFromURL("http://a.baz.jp/file.html",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 1
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://a.baz.jp./file.html",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 1
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://ac.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 2
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://a.bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 3
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 3
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://baz.bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 3 4
- EXPECT_EQ(12U, GetRegistryLengthFromURL("http://a.b.baz.bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 4
- EXPECT_EQ(6U, GetRegistryLengthFromURL("http://baz.pref.bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 5
- EXPECT_EQ(11U, GetRegistryLengthFromURL("http://a.b.bar.baz.com",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 6
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://a.d.c",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 7
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://.a.d.c",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 7
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://..a.d.c",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 7
- EXPECT_EQ(1U, GetRegistryLengthFromURL("http://a.b.c",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 7 8
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://baz.com",
- EXCLUDE_UNKNOWN_REGISTRIES)); // none
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://baz.com.",
- EXCLUDE_UNKNOWN_REGISTRIES)); // none
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://baz.com",
- INCLUDE_UNKNOWN_REGISTRIES)); // none
- EXPECT_EQ(4U, GetRegistryLengthFromURL("http://baz.com.",
- INCLUDE_UNKNOWN_REGISTRIES)); // none
-
- EXPECT_EQ(std::string::npos,
+ EXPECT_EQ(2U,
+ GetRegistryLengthFromURL("http://a.baz.jp/file.html",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 1
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://a.baz.jp./file.html",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 1
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://ac.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 2
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://a.bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 3
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 3
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://baz.bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 3 4
+ EXPECT_EQ(12U,
+ GetRegistryLengthFromURL("http://a.b.baz.bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 4
+ EXPECT_EQ(6U,
+ GetRegistryLengthFromURL("http://baz.pref.bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 5
+ EXPECT_EQ(11U,
+ GetRegistryLengthFromURL("http://a.b.bar.baz.com",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 6
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://a.d.c",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 7
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://.a.d.c",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 7
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://..a.d.c",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 7
+ EXPECT_EQ(1U,
+ GetRegistryLengthFromURL("http://a.b.c",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 7 8
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://baz.com",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // none
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://baz.com.",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // none
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://baz.com",
+ INCLUDE_UNKNOWN_REGISTRIES)); // none
+ EXPECT_EQ(4U,
+ GetRegistryLengthFromURL("http://baz.com.",
+ INCLUDE_UNKNOWN_REGISTRIES)); // none
+
+ EXPECT_EQ(
+ std::string::npos,
GetRegistryLengthFromURL(std::string(), EXCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(std::string::npos,
- GetRegistryLengthFromURL("http://", EXCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURL("http://", EXCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(std::string::npos,
- GetRegistryLengthFromURL("file:///C:/file.html",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://foo.com..",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://...",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://192.168.0.1",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://localhost",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://localhost",
- INCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://localhost.",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://localhost.",
- INCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http:////Comment",
- EXCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURL("file:///C:/file.html",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U,
+ GetRegistryLengthFromURL("http://foo.com..", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://...", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://192.168.0.1",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U,
+ GetRegistryLengthFromURL("http://localhost", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U,
+ GetRegistryLengthFromURL("http://localhost", INCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://localhost.",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://localhost.",
+ INCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U,
+ GetRegistryLengthFromURL("http:////Comment", EXCLUDE_UNKNOWN_REGISTRIES));
// Test std::string version of GetRegistryLength(). Uses the same
// underpinnings as the GURL version, so this is really more of a check of
// CanonicalizeHost().
- EXPECT_EQ(2U, GetRegistryLengthFromHost("a.baz.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 1
- EXPECT_EQ(3U, GetRegistryLengthFromHost("a.baz.jp.",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 1
- EXPECT_EQ(0U, GetRegistryLengthFromHost("ac.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 2
- EXPECT_EQ(0U, GetRegistryLengthFromHost("a.bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 3
- EXPECT_EQ(0U, GetRegistryLengthFromHost("bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 3
- EXPECT_EQ(0U, GetRegistryLengthFromHost("baz.bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 3 4
- EXPECT_EQ(12U, GetRegistryLengthFromHost("a.b.baz.bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 4
- EXPECT_EQ(6U, GetRegistryLengthFromHost("baz.pref.bar.jp",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 5
- EXPECT_EQ(11U, GetRegistryLengthFromHost("a.b.bar.baz.com",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 6
- EXPECT_EQ(3U, GetRegistryLengthFromHost("a.d.c",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 7
- EXPECT_EQ(3U, GetRegistryLengthFromHost(".a.d.c",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 7
- EXPECT_EQ(3U, GetRegistryLengthFromHost("..a.d.c",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 7
- EXPECT_EQ(1U, GetRegistryLengthFromHost("a.b.c",
- EXCLUDE_UNKNOWN_REGISTRIES)); // 7 8
- EXPECT_EQ(0U, GetRegistryLengthFromHost("baz.com",
- EXCLUDE_UNKNOWN_REGISTRIES)); // none
- EXPECT_EQ(0U, GetRegistryLengthFromHost("baz.com.",
- EXCLUDE_UNKNOWN_REGISTRIES)); // none
- EXPECT_EQ(3U, GetRegistryLengthFromHost("baz.com",
- INCLUDE_UNKNOWN_REGISTRIES)); // none
- EXPECT_EQ(4U, GetRegistryLengthFromHost("baz.com.",
- INCLUDE_UNKNOWN_REGISTRIES)); // none
-
- EXPECT_EQ(std::string::npos,
+ EXPECT_EQ(2U,
+ GetRegistryLengthFromHost("a.baz.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 1
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromHost("a.baz.jp.",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 1
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("ac.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 2
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("a.bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 3
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 3
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("baz.bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 3 4
+ EXPECT_EQ(12U,
+ GetRegistryLengthFromHost("a.b.baz.bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 4
+ EXPECT_EQ(6U,
+ GetRegistryLengthFromHost("baz.pref.bar.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 5
+ EXPECT_EQ(11U,
+ GetRegistryLengthFromHost("a.b.bar.baz.com",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 6
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromHost("a.d.c",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 7
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromHost(".a.d.c",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 7
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromHost("..a.d.c",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 7
+ EXPECT_EQ(1U,
+ GetRegistryLengthFromHost("a.b.c",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // 7 8
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("baz.com",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // none
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("baz.com.",
+ EXCLUDE_UNKNOWN_REGISTRIES)); // none
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromHost("baz.com",
+ INCLUDE_UNKNOWN_REGISTRIES)); // none
+ EXPECT_EQ(4U,
+ GetRegistryLengthFromHost("baz.com.",
+ INCLUDE_UNKNOWN_REGISTRIES)); // none
+
+ EXPECT_EQ(
+ std::string::npos,
GetRegistryLengthFromHost(std::string(), EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromHost("foo.com..",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromHost("..",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromHost("192.168.0.1",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromHost("localhost",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromHost("localhost",
- INCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromHost("localhost.",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromHost("localhost.",
- INCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("foo.com..", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("..", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U, GetRegistryLengthFromHost("192.168.0.1", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("localhost", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromHost("localhost", INCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U, GetRegistryLengthFromHost("localhost.", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U, GetRegistryLengthFromHost("localhost.", INCLUDE_UNKNOWN_REGISTRIES));
}
TEST_F(RegistryControlledDomainTest, TestSameDomainOrHost) {
@@ -277,37 +315,44 @@ TEST_F(RegistryControlledDomainTest, TestSameDomainOrHost) {
EXPECT_FALSE(CompareDomains("http://a.com/file.html", // a.com
"http://b.com/file.html")); // b.com
EXPECT_TRUE(CompareDomains("http://a.x.com/file.html",
- "http://b.x.com/file.html")); // x.com
+ "http://b.x.com/file.html")); // x.com
EXPECT_TRUE(CompareDomains("http://a.x.com/file.html",
- "http://.x.com/file.html")); // x.com
+ "http://.x.com/file.html")); // x.com
EXPECT_TRUE(CompareDomains("http://a.x.com/file.html",
- "http://..b.x.com/file.html")); // x.com
+ "http://..b.x.com/file.html")); // x.com
EXPECT_TRUE(CompareDomains("http://intranet/file.html",
- "http://intranet/file.html")); // intranet
+ "http://intranet/file.html")); // intranet
EXPECT_TRUE(CompareDomains("http://127.0.0.1/file.html",
"http://127.0.0.1/file.html")); // 127.0.0.1
EXPECT_FALSE(CompareDomains("http://192.168.0.1/file.html", // 192.168.0.1
"http://127.0.0.1/file.html")); // 127.0.0.1
EXPECT_FALSE(CompareDomains("file:///C:/file.html",
- "file:///C:/file.html")); // no host
+ "file:///C:/file.html")); // no host
}
TEST_F(RegistryControlledDomainTest, TestDefaultData) {
// Note that no data is set: we're using the default rules.
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://google.com",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://stanford.edu",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://ustreas.gov",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://icann.net",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(3U, GetRegistryLengthFromURL("http://ferretcentral.org",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://nowhere.notavaliddomain",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(15U, GetRegistryLengthFromURL("http://nowhere.notavaliddomain",
- INCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://google.com",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://stanford.edu",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://ustreas.gov",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 3U,
+ GetRegistryLengthFromURL("http://icann.net", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(3U,
+ GetRegistryLengthFromURL("http://ferretcentral.org",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://nowhere.notavaliddomain",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(15U,
+ GetRegistryLengthFromURL("http://nowhere.notavaliddomain",
+ INCLUDE_UNKNOWN_REGISTRIES));
}
TEST_F(RegistryControlledDomainTest, TestPrivateRegistryHandling) {
@@ -319,48 +364,56 @@ TEST_F(RegistryControlledDomainTest, TestPrivateRegistryHandling) {
// 'priv.no' and 'private'.
// Non-private registries.
- EXPECT_EQ(2U, GetRegistryLengthFromURL("http://priv.no",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(2U, GetRegistryLengthFromURL("http://foo.priv.no",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(2U, GetRegistryLengthFromURL("http://foo.jp",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(2U, GetRegistryLengthFromURL("http://www.foo.jp",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://private",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://foo.private",
- EXCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(0U, GetRegistryLengthFromURL("http://private",
- INCLUDE_UNKNOWN_REGISTRIES));
- EXPECT_EQ(7U, GetRegistryLengthFromURL("http://foo.private",
- INCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 2U,
+ GetRegistryLengthFromURL("http://priv.no", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(2U,
+ GetRegistryLengthFromURL("http://foo.priv.no",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 2U,
+ GetRegistryLengthFromURL("http://foo.jp", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(2U,
+ GetRegistryLengthFromURL("http://www.foo.jp",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U,
+ GetRegistryLengthFromURL("http://private", EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(0U,
+ GetRegistryLengthFromURL("http://foo.private",
+ EXCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(
+ 0U,
+ GetRegistryLengthFromURL("http://private", INCLUDE_UNKNOWN_REGISTRIES));
+ EXPECT_EQ(7U,
+ GetRegistryLengthFromURL("http://foo.private",
+ INCLUDE_UNKNOWN_REGISTRIES));
// Private registries.
EXPECT_EQ(0U,
- GetRegistryLengthFromURLIncludingPrivate("http://priv.no",
- EXCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURLIncludingPrivate(
+ "http://priv.no", EXCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(7U,
- GetRegistryLengthFromURLIncludingPrivate("http://foo.priv.no",
- EXCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURLIncludingPrivate(
+ "http://foo.priv.no", EXCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(2U,
- GetRegistryLengthFromURLIncludingPrivate("http://foo.jp",
- EXCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURLIncludingPrivate(
+ "http://foo.jp", EXCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(2U,
- GetRegistryLengthFromURLIncludingPrivate("http://www.foo.jp",
- EXCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURLIncludingPrivate(
+ "http://www.foo.jp", EXCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(0U,
- GetRegistryLengthFromURLIncludingPrivate("http://private",
- EXCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURLIncludingPrivate(
+ "http://private", EXCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(7U,
- GetRegistryLengthFromURLIncludingPrivate("http://foo.private",
- EXCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURLIncludingPrivate(
+ "http://foo.private", EXCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(0U,
- GetRegistryLengthFromURLIncludingPrivate("http://private",
- INCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURLIncludingPrivate(
+ "http://private", INCLUDE_UNKNOWN_REGISTRIES));
EXPECT_EQ(7U,
- GetRegistryLengthFromURLIncludingPrivate("http://foo.private",
- INCLUDE_UNKNOWN_REGISTRIES));
+ GetRegistryLengthFromURLIncludingPrivate(
+ "http://foo.private", INCLUDE_UNKNOWN_REGISTRIES));
}
TEST_F(RegistryControlledDomainTest, TestDafsaTwoByteOffsets) {
« net/base/network_change_notifier.cc ('K') | « net/base/registry_controlled_domains/registry_controlled_domain.cc ('k') | net/base/sdch_dictionary_fetcher.h » ('j') | net/base/trace_net_log_observer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698