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

Side by Side Diff: net/base/net_util_unittest.cc

Issue 1158923005: Use the exact-width integer types defined in <stdint.h> rather than (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweak comments. Exclude mime_sniffer*. Rebase. Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/net_util.h" 5 #include "net/base/net_util.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <ostream> 9 #include <ostream>
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 namespace { 50 namespace {
51 51
52 struct HeaderCase { 52 struct HeaderCase {
53 const char* const header_name; 53 const char* const header_name;
54 const char* const expected; 54 const char* const expected;
55 }; 55 };
56 56
57 // Fills in sockaddr for the given 32-bit address (IPv4.) 57 // Fills in sockaddr for the given 32-bit address (IPv4.)
58 // |bytes| should be an array of length 4. 58 // |bytes| should be an array of length 4.
59 void MakeIPv4Address(const uint8* bytes, int port, SockaddrStorage* storage) { 59 void MakeIPv4Address(const uint8_t* bytes, int port, SockaddrStorage* storage) {
60 memset(&storage->addr_storage, 0, sizeof(storage->addr_storage)); 60 memset(&storage->addr_storage, 0, sizeof(storage->addr_storage));
61 storage->addr_len = sizeof(struct sockaddr_in); 61 storage->addr_len = sizeof(struct sockaddr_in);
62 struct sockaddr_in* addr4 = reinterpret_cast<sockaddr_in*>(storage->addr); 62 struct sockaddr_in* addr4 = reinterpret_cast<sockaddr_in*>(storage->addr);
63 addr4->sin_port = base::HostToNet16(port); 63 addr4->sin_port = base::HostToNet16(port);
64 addr4->sin_family = AF_INET; 64 addr4->sin_family = AF_INET;
65 memcpy(&addr4->sin_addr, bytes, 4); 65 memcpy(&addr4->sin_addr, bytes, 4);
66 } 66 }
67 67
68 // Fills in sockaddr for the given 128-bit address (IPv6.) 68 // Fills in sockaddr for the given 128-bit address (IPv6.)
69 // |bytes| should be an array of length 16. 69 // |bytes| should be an array of length 16.
70 void MakeIPv6Address(const uint8* bytes, int port, SockaddrStorage* storage) { 70 void MakeIPv6Address(const uint8_t* bytes, int port, SockaddrStorage* storage) {
71 memset(&storage->addr_storage, 0, sizeof(storage->addr_storage)); 71 memset(&storage->addr_storage, 0, sizeof(storage->addr_storage));
72 storage->addr_len = sizeof(struct sockaddr_in6); 72 storage->addr_len = sizeof(struct sockaddr_in6);
73 struct sockaddr_in6* addr6 = reinterpret_cast<sockaddr_in6*>(storage->addr); 73 struct sockaddr_in6* addr6 = reinterpret_cast<sockaddr_in6*>(storage->addr);
74 addr6->sin6_port = base::HostToNet16(port); 74 addr6->sin6_port = base::HostToNet16(port);
75 addr6->sin6_family = AF_INET6; 75 addr6->sin6_family = AF_INET6;
76 memcpy(&addr6->sin6_addr, bytes, 16); 76 memcpy(&addr6->sin6_addr, bytes, 16);
77 } 77 }
78 78
79 } // anonymous namespace 79 } // anonymous namespace
80 80
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 { GURL("http://[::a]:33/x"), "[::a]:33"}, 325 { GURL("http://[::a]:33/x"), "[::a]:33"},
326 }; 326 };
327 for (size_t i = 0; i < arraysize(tests); ++i) { 327 for (size_t i = 0; i < arraysize(tests); ++i) {
328 std::string host_and_port = GetHostAndOptionalPort(tests[i].url); 328 std::string host_and_port = GetHostAndOptionalPort(tests[i].url);
329 EXPECT_EQ(std::string(tests[i].expected_host_and_port), host_and_port); 329 EXPECT_EQ(std::string(tests[i].expected_host_and_port), host_and_port);
330 } 330 }
331 } 331 }
332 332
333 TEST(NetUtilTest, NetAddressToString_IPv4) { 333 TEST(NetUtilTest, NetAddressToString_IPv4) {
334 const struct { 334 const struct {
335 uint8 addr[4]; 335 uint8_t addr[4];
336 const char* const result; 336 const char* const result;
337 } tests[] = { 337 } tests[] = {
338 {{0, 0, 0, 0}, "0.0.0.0"}, 338 {{0, 0, 0, 0}, "0.0.0.0"},
339 {{127, 0, 0, 1}, "127.0.0.1"}, 339 {{127, 0, 0, 1}, "127.0.0.1"},
340 {{192, 168, 0, 1}, "192.168.0.1"}, 340 {{192, 168, 0, 1}, "192.168.0.1"},
341 }; 341 };
342 342
343 for (size_t i = 0; i < arraysize(tests); ++i) { 343 for (size_t i = 0; i < arraysize(tests); ++i) {
344 SockaddrStorage storage; 344 SockaddrStorage storage;
345 MakeIPv4Address(tests[i].addr, 80, &storage); 345 MakeIPv4Address(tests[i].addr, 80, &storage);
346 std::string result = NetAddressToString(storage.addr, storage.addr_len); 346 std::string result = NetAddressToString(storage.addr, storage.addr_len);
347 EXPECT_EQ(std::string(tests[i].result), result); 347 EXPECT_EQ(std::string(tests[i].result), result);
348 } 348 }
349 } 349 }
350 350
351 TEST(NetUtilTest, NetAddressToString_IPv6) { 351 TEST(NetUtilTest, NetAddressToString_IPv6) {
352 const struct { 352 const struct {
353 uint8 addr[16]; 353 uint8_t addr[16];
354 const char* const result; 354 const char* const result;
355 } tests[] = { 355 } tests[] = {
356 {{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10, 0xFE, 0xDC, 0xBA, 356 {{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10, 0xFE, 0xDC, 0xBA,
357 0x98, 0x76, 0x54, 0x32, 0x10}, 357 0x98, 0x76, 0x54, 0x32, 0x10},
358 "fedc:ba98:7654:3210:fedc:ba98:7654:3210"}, 358 "fedc:ba98:7654:3210:fedc:ba98:7654:3210"},
359 }; 359 };
360 360
361 for (size_t i = 0; i < arraysize(tests); ++i) { 361 for (size_t i = 0; i < arraysize(tests); ++i) {
362 SockaddrStorage storage; 362 SockaddrStorage storage;
363 MakeIPv6Address(tests[i].addr, 80, &storage); 363 MakeIPv6Address(tests[i].addr, 80, &storage);
364 EXPECT_EQ(std::string(tests[i].result), 364 EXPECT_EQ(std::string(tests[i].result),
365 NetAddressToString(storage.addr, storage.addr_len)); 365 NetAddressToString(storage.addr, storage.addr_len));
366 } 366 }
367 } 367 }
368 368
369 TEST(NetUtilTest, NetAddressToStringWithPort_IPv4) { 369 TEST(NetUtilTest, NetAddressToStringWithPort_IPv4) {
370 uint8 addr[] = {127, 0, 0, 1}; 370 uint8_t addr[] = {127, 0, 0, 1};
371 SockaddrStorage storage; 371 SockaddrStorage storage;
372 MakeIPv4Address(addr, 166, &storage); 372 MakeIPv4Address(addr, 166, &storage);
373 std::string result = NetAddressToStringWithPort(storage.addr, 373 std::string result = NetAddressToStringWithPort(storage.addr,
374 storage.addr_len); 374 storage.addr_len);
375 EXPECT_EQ("127.0.0.1:166", result); 375 EXPECT_EQ("127.0.0.1:166", result);
376 } 376 }
377 377
378 TEST(NetUtilTest, NetAddressToStringWithPort_IPv6) { 378 TEST(NetUtilTest, NetAddressToStringWithPort_IPv6) {
379 uint8 addr[] = { 379 uint8_t addr[] = {
380 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10, 0xFE, 0xDC, 0xBA, 380 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10, 0xFE, 0xDC, 0xBA,
381 0x98, 0x76, 0x54, 0x32, 0x10 381 0x98, 0x76, 0x54, 0x32, 0x10
382 }; 382 };
383 SockaddrStorage storage; 383 SockaddrStorage storage;
384 MakeIPv6Address(addr, 361, &storage); 384 MakeIPv6Address(addr, 361, &storage);
385 std::string result = NetAddressToStringWithPort(storage.addr, 385 std::string result = NetAddressToStringWithPort(storage.addr,
386 storage.addr_len); 386 storage.addr_len);
387 387
388 // May fail on systems that don't support IPv6. 388 // May fail on systems that don't support IPv6.
389 if (!result.empty()) 389 if (!result.empty())
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 TEST_P(NetUtilNonUniqueNameTest, IsHostnameNonUnique) { 624 TEST_P(NetUtilNonUniqueNameTest, IsHostnameNonUnique) {
625 const NonUniqueNameTestData& test_data = GetParam(); 625 const NonUniqueNameTestData& test_data = GetParam();
626 626
627 EXPECT_EQ(test_data.is_unique, IsUnique(test_data.hostname)); 627 EXPECT_EQ(test_data.is_unique, IsUnique(test_data.hostname));
628 } 628 }
629 629
630 INSTANTIATE_TEST_CASE_P(, NetUtilNonUniqueNameTest, 630 INSTANTIATE_TEST_CASE_P(, NetUtilNonUniqueNameTest,
631 testing::ValuesIn(kNonUniqueNameTestData)); 631 testing::ValuesIn(kNonUniqueNameTestData));
632 632
633 } // namespace net 633 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698