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

Unified Diff: net/dns/address_sorter_posix_unittest.cc

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 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
« no previous file with comments | « net/disk_cache/blockfile/stats.cc ('k') | net/dns/dns_config_service_posix_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/address_sorter_posix_unittest.cc
diff --git a/net/dns/address_sorter_posix_unittest.cc b/net/dns/address_sorter_posix_unittest.cc
index 5dcfe709c8f58e21ad39e294cff335b3b77810d7..88a135fef9d82a011d0b0b05161259745e530da4 100644
--- a/net/dns/address_sorter_posix_unittest.cc
+++ b/net/dns/address_sorter_posix_unittest.cc
@@ -151,9 +151,9 @@ class AddressSorterPosixTest : public testing::Test {
// Verify that NULL-terminated |addresses| matches (-1)-terminated |order|
// after sorting.
- void Verify(const char* addresses[], const int order[]) {
+ void Verify(const char* const addresses[], const int order[]) {
AddressList list;
- for (const char** addr = addresses; *addr != NULL; ++addr)
+ for (const char* const* addr = addresses; *addr != NULL; ++addr)
list.push_back(IPEndPoint(ParseIP(*addr), 80));
for (size_t i = 0; order[i] >= 0; ++i)
CHECK_LT(order[i], static_cast<int>(list.size()));
@@ -181,7 +181,7 @@ class AddressSorterPosixTest : public testing::Test {
// Rule 1: Avoid unusable destinations.
TEST_F(AddressSorterPosixTest, Rule1) {
AddMapping("10.0.0.231", "10.0.0.1");
- const char* addresses[] = { "::1", "10.0.0.231", "127.0.0.1", NULL };
+ const char* const addresses[] = { "::1", "10.0.0.231", "127.0.0.1", NULL };
const int order[] = { 1, -1 };
Verify(addresses, order);
}
@@ -196,11 +196,11 @@ TEST_F(AddressSorterPosixTest, Rule2) {
AddMapping("8.0.0.1", "169.254.0.10"); // global vs. link-local
// In all three cases, matching scope is preferred.
const int order[] = { 1, 0, -1 };
- const char* addresses1[] = { "3002::2", "3002::1", NULL };
+ const char* const addresses1[] = { "3002::2", "3002::1", NULL };
Verify(addresses1, order);
- const char* addresses2[] = { "fec1::2", "ff32::1", NULL };
+ const char* const addresses2[] = { "fec1::2", "ff32::1", NULL };
Verify(addresses2, order);
- const char* addresses3[] = { "8.0.0.1", "fec1::1", NULL };
+ const char* const addresses3[] = { "8.0.0.1", "fec1::1", NULL };
Verify(addresses3, order);
}
@@ -210,7 +210,7 @@ TEST_F(AddressSorterPosixTest, Rule3) {
AddMapping("3002::1", "4000::10");
GetSourceInfo("4000::10")->deprecated = true;
AddMapping("3002::2", "4000::20");
- const char* addresses[] = { "3002::1", "3002::2", NULL };
+ const char* const addresses[] = { "3002::1", "3002::2", NULL };
const int order[] = { 1, 0, -1 };
Verify(addresses, order);
}
@@ -220,7 +220,7 @@ TEST_F(AddressSorterPosixTest, Rule4) {
AddMapping("3002::1", "4000::10");
AddMapping("3002::2", "4000::20");
GetSourceInfo("4000::20")->home = true;
- const char* addresses[] = { "3002::1", "3002::2", NULL };
+ const char* const addresses[] = { "3002::1", "3002::2", NULL };
const int order[] = { 1, 0, -1 };
Verify(addresses, order);
}
@@ -233,11 +233,11 @@ TEST_F(AddressSorterPosixTest, Rule5) {
AddMapping("2002::1", "2001::10"); // 6to4 vs. Teredo
const int order[] = { 1, 0, -1 };
{
- const char* addresses[] = { "2001::1", "::1", NULL };
+ const char* const addresses[] = { "2001::1", "::1", NULL };
Verify(addresses, order);
}
{
- const char* addresses[] = { "2002::1", "::ffff:1234:1", NULL };
+ const char* const addresses[] = { "2002::1", "::ffff:1234:1", NULL };
Verify(addresses, order);
}
}
@@ -248,8 +248,8 @@ TEST_F(AddressSorterPosixTest, Rule6) {
AddMapping("ff32::1", "fe81::10"); // multicast
AddMapping("::ffff:1234:1", "::ffff:1234:10"); // IPv4-mapped
AddMapping("2001::1", "2001::10"); // Teredo
- const char* addresses[] = { "2001::1", "::ffff:1234:1", "ff32::1", "::1",
- NULL };
+ const char* const addresses[] = { "2001::1", "::ffff:1234:1", "ff32::1",
+ "::1", NULL };
const int order[] = { 3, 2, 1, 0, -1 };
Verify(addresses, order);
}
@@ -259,7 +259,7 @@ TEST_F(AddressSorterPosixTest, Rule7) {
AddMapping("3002::1", "4000::10");
AddMapping("3002::2", "4000::20");
GetSourceInfo("4000::20")->native = true;
- const char* addresses[] = { "3002::1", "3002::2", NULL };
+ const char* const addresses[] = { "3002::1", "3002::2", NULL };
const int order[] = { 1, 0, -1 };
Verify(addresses, order);
}
@@ -273,8 +273,8 @@ TEST_F(AddressSorterPosixTest, Rule8) {
AddMapping("ff32::1", "4000::10"); // link-local
AddMapping("ff35::1", "4000::10"); // site-local
AddMapping("ff38::1", "4000::10"); // org-local
- const char* addresses[] = { "ff38::1", "3000::1", "ff35::1", "ff32::1",
- "fe81::1", NULL };
+ const char* const addresses[] = { "ff38::1", "3000::1", "ff35::1", "ff32::1",
+ "fe81::1", NULL };
const int order[] = { 4, 1, 3, 2, 0, -1 };
Verify(addresses, order);
}
@@ -287,8 +287,8 @@ TEST_F(AddressSorterPosixTest, Rule9) {
GetSourceInfo("4000::10")->prefix_length = 15;
AddMapping("4002::1", "4000::10"); // 14 bit match
AddMapping("4080::1", "4000::10"); // 8 bit match
- const char* addresses[] = { "4080::1", "4002::1", "4000::1", "3000::1",
- NULL };
+ const char* const addresses[] = { "4080::1", "4002::1", "4000::1", "3000::1",
+ NULL };
const int order[] = { 3, 2, 1, 0, -1 };
Verify(addresses, order);
}
@@ -298,7 +298,7 @@ TEST_F(AddressSorterPosixTest, Rule10) {
AddMapping("4000::1", "4000::10");
AddMapping("4000::2", "4000::10");
AddMapping("4000::3", "4000::10");
- const char* addresses[] = { "4000::1", "4000::2", "4000::3", NULL };
+ const char* const addresses[] = { "4000::1", "4000::2", "4000::3", NULL };
const int order[] = { 0, 1, 2, -1 };
Verify(addresses, order);
}
@@ -310,8 +310,8 @@ TEST_F(AddressSorterPosixTest, MultipleRules) {
AddMapping("4000::1", "4000::10"); // global unicast
AddMapping("ff32::2", "fe81::20"); // deprecated link-local multicast
GetSourceInfo("fe81::20")->deprecated = true;
- const char* addresses[] = { "ff3e::1", "ff32::2", "4000::1", "ff32::1", "::1",
- "8.0.0.1", NULL };
+ const char* const addresses[] = { "ff3e::1", "ff32::2", "4000::1", "ff32::1",
+ "::1", "8.0.0.1", NULL };
const int order[] = { 4, 3, 0, 2, 1, -1 };
Verify(addresses, order);
}
« no previous file with comments | « net/disk_cache/blockfile/stats.cc ('k') | net/dns/dns_config_service_posix_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698