diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /net/base/registry_controlled_domain_unittest.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'net/base/registry_controlled_domain_unittest.cc')
| -rw-r--r-- | net/base/registry_controlled_domain_unittest.cc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/net/base/registry_controlled_domain_unittest.cc b/net/base/registry_controlled_domain_unittest.cc index 09c173b..8c90c99 100644 --- a/net/base/registry_controlled_domain_unittest.cc +++ b/net/base/registry_controlled_domain_unittest.cc @@ -213,30 +213,30 @@ TEST_F(RegistryControlledDomainTest, TestSameDomainOrHost) { TestRegistryControlledDomainService::UseDomainData( Perfect_Hash_Test2::FindDomain); - EXPECT_EQ(true, CompareDomains("http://a.b.bar.jp/file.html", - "http://a.b.bar.jp/file.html")); // b.bar.jp - EXPECT_EQ(true, CompareDomains("http://a.b.bar.jp/file.html", - "http://b.b.bar.jp/file.html")); // b.bar.jp - EXPECT_EQ(false, CompareDomains("http://a.foo.jp/file.html", // foo.jp - "http://a.not.jp/file.html")); // not.jp - EXPECT_EQ(false, CompareDomains("http://a.foo.jp/file.html", // foo.jp - "http://a.foo.jp./file.html")); // foo.jp. - EXPECT_EQ(false, CompareDomains("http://a.com/file.html", // a.com - "http://b.com/file.html")); // b.com - EXPECT_EQ(true, CompareDomains("http://a.x.com/file.html", - "http://b.x.com/file.html")); // x.com - EXPECT_EQ(true, CompareDomains("http://a.x.com/file.html", - "http://.x.com/file.html")); // x.com - EXPECT_EQ(true, CompareDomains("http://a.x.com/file.html", - "http://..b.x.com/file.html")); // x.com - EXPECT_EQ(true, CompareDomains("http://intranet/file.html", - "http://intranet/file.html")); // intranet - EXPECT_EQ(true, CompareDomains("http://127.0.0.1/file.html", - "http://127.0.0.1/file.html")); // 127.0.0.1 - EXPECT_EQ(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_EQ(false, CompareDomains("file:///C:/file.html", - "file:///C:/file.html")); // no host + EXPECT_TRUE(CompareDomains("http://a.b.bar.jp/file.html", + "http://a.b.bar.jp/file.html")); // b.bar.jp + EXPECT_TRUE(CompareDomains("http://a.b.bar.jp/file.html", + "http://b.b.bar.jp/file.html")); // b.bar.jp + EXPECT_FALSE(CompareDomains("http://a.foo.jp/file.html", // foo.jp + "http://a.not.jp/file.html")); // not.jp + EXPECT_FALSE(CompareDomains("http://a.foo.jp/file.html", // foo.jp + "http://a.foo.jp./file.html")); // foo.jp. + 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 + EXPECT_TRUE(CompareDomains("http://a.x.com/file.html", + "http://.x.com/file.html")); // x.com + EXPECT_TRUE(CompareDomains("http://a.x.com/file.html", + "http://..b.x.com/file.html")); // x.com + EXPECT_TRUE(CompareDomains("http://intranet/file.html", + "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 } TEST_F(RegistryControlledDomainTest, TestDefaultData) { |