| Index: net/tools/tld_cleanup/tld_cleanup_util_unittest.cc
|
| diff --git a/net/tools/tld_cleanup/tld_cleanup_util_unittest.cc b/net/tools/tld_cleanup/tld_cleanup_util_unittest.cc
|
| index 6b1d02a84712779483c728c0f3b619736ec5b912..ae86a9c04920658651eaa830dbd6b959faf6aed4 100644
|
| --- a/net/tools/tld_cleanup/tld_cleanup_util_unittest.cc
|
| +++ b/net/tools/tld_cleanup/tld_cleanup_util_unittest.cc
|
| @@ -12,17 +12,15 @@ namespace net {
|
| namespace tld_cleanup {
|
|
|
| std::string SetupData(std::string icann_domains, std::string private_domains) {
|
| - return "// ===BEGIN ICANN DOMAINS===\n" +
|
| - icann_domains +
|
| - "// ===END ICANN DOMAINS===\n" +
|
| - "// ===BEGIN PRIVATE DOMAINS===\n" +
|
| - private_domains +
|
| - "// ===END PRIVATE DOMAINS===\n";
|
| + return "// ===BEGIN ICANN DOMAINS===\n" + icann_domains +
|
| + "// ===END ICANN DOMAINS===\n" + "// ===BEGIN PRIVATE DOMAINS===\n" +
|
| + private_domains + "// ===END PRIVATE DOMAINS===\n";
|
| }
|
|
|
| TEST(TldCleanupUtilTest, TwoRealTldsSuccessfullyRead) {
|
| - std::string icann_domains = "foo\n"
|
| - "bar\n";
|
| + std::string icann_domains =
|
| + "foo\n"
|
| + "bar\n";
|
| std::string private_domains = "";
|
| std::string data = SetupData(icann_domains, private_domains);
|
| RuleMap rules;
|
| @@ -62,8 +60,9 @@ TEST(TldCleanupUtilTest, RealTldAutomaticallyAddedForSubdomain) {
|
| }
|
|
|
| TEST(TldCleanupUtilTest, PrivateTldMarkedAsPrivate) {
|
| - std::string icann_domains = "foo\n"
|
| - "bar\n";
|
| + std::string icann_domains =
|
| + "foo\n"
|
| + "bar\n";
|
| std::string private_domains = "baz\n";
|
| std::string data = SetupData(icann_domains, private_domains);
|
| RuleMap rules;
|
| @@ -108,8 +107,9 @@ TEST(TldCleanupUtilTest, PrivateDomainMarkedAsPrivate) {
|
| }
|
|
|
| TEST(TldCleanupUtilTest, ExtraTldRuleIsNotMarkedPrivate) {
|
| - std::string icann_domains = "foo.bar\n"
|
| - "baz.bar\n";
|
| + std::string icann_domains =
|
| + "foo.bar\n"
|
| + "baz.bar\n";
|
| std::string private_domains = "qux.bar\n";
|
| std::string data = SetupData(icann_domains, private_domains);
|
| RuleMap rules;
|
| @@ -139,8 +139,9 @@ TEST(TldCleanupUtilTest, ExtraTldRuleIsNotMarkedPrivate) {
|
| }
|
|
|
| TEST(TldCleanupUtilTest, WildcardAndExceptionParsedCorrectly) {
|
| - std::string icann_domains = "*.bar\n"
|
| - "!foo.bar\n";
|
| + std::string icann_domains =
|
| + "*.bar\n"
|
| + "!foo.bar\n";
|
| std::string private_domains = "!baz.bar\n";
|
| std::string data = SetupData(icann_domains, private_domains);
|
| RuleMap rules;
|
|
|