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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_server_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/mime_util_unittest.cc ('K') | « net/proxy/proxy_server.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_server_unittest.cc
diff --git a/net/proxy/proxy_server_unittest.cc b/net/proxy/proxy_server_unittest.cc
index 7646467538bcb2ae00959290cb0e22328bd88831..aab217625e7ac94003187a1bd5fb33cc6a4de471 100644
--- a/net/proxy/proxy_server_unittest.cc
+++ b/net/proxy/proxy_server_unittest.cc
@@ -18,151 +18,68 @@ TEST(ProxyServerTest, FromURI) {
int expected_port;
const char* expected_pac_string;
} tests[] = {
- // HTTP proxy URIs:
- {
- "foopy:10", // No scheme.
- "foopy:10",
- net::ProxyServer::SCHEME_HTTP,
- "foopy",
- 10,
- "PROXY foopy:10"
- },
- {
- "http://foopy", // No port.
- "foopy:80",
- net::ProxyServer::SCHEME_HTTP,
- "foopy",
- 80,
- "PROXY foopy:80"
- },
- {
- "http://foopy:10",
- "foopy:10",
- net::ProxyServer::SCHEME_HTTP,
- "foopy",
- 10,
- "PROXY foopy:10"
- },
+ // HTTP proxy URIs:
+ {"foopy:10", // No scheme.
+ "foopy:10", net::ProxyServer::SCHEME_HTTP, "foopy", 10,
+ "PROXY foopy:10"},
+ {"http://foopy", // No port.
+ "foopy:80", net::ProxyServer::SCHEME_HTTP, "foopy", 80,
+ "PROXY foopy:80"},
+ {"http://foopy:10", "foopy:10", net::ProxyServer::SCHEME_HTTP, "foopy",
+ 10, "PROXY foopy:10"},
- // IPv6 HTTP proxy URIs:
- {
- "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:10", // No scheme.
- "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:10",
- net::ProxyServer::SCHEME_HTTP,
- "FEDC:BA98:7654:3210:FEDC:BA98:7654:3210",
- 10,
- "PROXY [FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:10"
- },
- {
- "http://[3ffe:2a00:100:7031::1]", // No port.
- "[3ffe:2a00:100:7031::1]:80",
- net::ProxyServer::SCHEME_HTTP,
- "3ffe:2a00:100:7031::1",
- 80,
- "PROXY [3ffe:2a00:100:7031::1]:80"
- },
- {
- "http://[::192.9.5.5]",
- "[::192.9.5.5]:80",
- net::ProxyServer::SCHEME_HTTP,
- "::192.9.5.5",
- 80,
- "PROXY [::192.9.5.5]:80"
- },
- {
- "http://[::FFFF:129.144.52.38]:80",
- "[::FFFF:129.144.52.38]:80",
- net::ProxyServer::SCHEME_HTTP,
- "::FFFF:129.144.52.38",
- 80,
- "PROXY [::FFFF:129.144.52.38]:80"
- },
+ // IPv6 HTTP proxy URIs:
+ {"[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:10", // No scheme.
+ "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:10",
+ net::ProxyServer::SCHEME_HTTP,
+ "FEDC:BA98:7654:3210:FEDC:BA98:7654:3210", 10,
+ "PROXY [FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:10"},
+ {"http://[3ffe:2a00:100:7031::1]", // No port.
+ "[3ffe:2a00:100:7031::1]:80", net::ProxyServer::SCHEME_HTTP,
+ "3ffe:2a00:100:7031::1", 80, "PROXY [3ffe:2a00:100:7031::1]:80"},
+ {"http://[::192.9.5.5]", "[::192.9.5.5]:80",
+ net::ProxyServer::SCHEME_HTTP, "::192.9.5.5", 80,
+ "PROXY [::192.9.5.5]:80"},
+ {"http://[::FFFF:129.144.52.38]:80", "[::FFFF:129.144.52.38]:80",
+ net::ProxyServer::SCHEME_HTTP, "::FFFF:129.144.52.38", 80,
+ "PROXY [::FFFF:129.144.52.38]:80"},
- // SOCKS4 proxy URIs:
- {
- "socks4://foopy", // No port.
- "socks4://foopy:1080",
- net::ProxyServer::SCHEME_SOCKS4,
- "foopy",
- 1080,
- "SOCKS foopy:1080"
- },
- {
- "socks4://foopy:10",
- "socks4://foopy:10",
- net::ProxyServer::SCHEME_SOCKS4,
- "foopy",
- 10,
- "SOCKS foopy:10"
- },
+ // SOCKS4 proxy URIs:
+ {"socks4://foopy", // No port.
+ "socks4://foopy:1080", net::ProxyServer::SCHEME_SOCKS4, "foopy", 1080,
+ "SOCKS foopy:1080"},
+ {"socks4://foopy:10", "socks4://foopy:10",
+ net::ProxyServer::SCHEME_SOCKS4, "foopy", 10, "SOCKS foopy:10"},
- // SOCKS5 proxy URIs
- {
- "socks5://foopy", // No port.
- "socks5://foopy:1080",
- net::ProxyServer::SCHEME_SOCKS5,
- "foopy",
- 1080,
- "SOCKS5 foopy:1080"
- },
- {
- "socks5://foopy:10",
- "socks5://foopy:10",
- net::ProxyServer::SCHEME_SOCKS5,
- "foopy",
- 10,
- "SOCKS5 foopy:10"
- },
+ // SOCKS5 proxy URIs
+ {"socks5://foopy", // No port.
+ "socks5://foopy:1080", net::ProxyServer::SCHEME_SOCKS5, "foopy", 1080,
+ "SOCKS5 foopy:1080"},
+ {"socks5://foopy:10", "socks5://foopy:10",
+ net::ProxyServer::SCHEME_SOCKS5, "foopy", 10, "SOCKS5 foopy:10"},
- // SOCKS proxy URIs (should default to SOCKS5)
- {
- "socks://foopy", // No port.
- "socks5://foopy:1080",
- net::ProxyServer::SCHEME_SOCKS5,
- "foopy",
- 1080,
- "SOCKS5 foopy:1080"
- },
- {
- "socks://foopy:10",
- "socks5://foopy:10",
- net::ProxyServer::SCHEME_SOCKS5,
- "foopy",
- 10,
- "SOCKS5 foopy:10"
- },
+ // SOCKS proxy URIs (should default to SOCKS5)
+ {"socks://foopy", // No port.
+ "socks5://foopy:1080", net::ProxyServer::SCHEME_SOCKS5, "foopy", 1080,
+ "SOCKS5 foopy:1080"},
+ {"socks://foopy:10", "socks5://foopy:10",
+ net::ProxyServer::SCHEME_SOCKS5, "foopy", 10, "SOCKS5 foopy:10"},
- // HTTPS proxy URIs:
- {
- "https://foopy", // No port
- "https://foopy:443",
- net::ProxyServer::SCHEME_HTTPS,
- "foopy",
- 443,
- "HTTPS foopy:443"
- },
- {
- "https://foopy:10", // Non-standard port
- "https://foopy:10",
- net::ProxyServer::SCHEME_HTTPS,
- "foopy",
- 10,
- "HTTPS foopy:10"
- },
- {
- "https://1.2.3.4:10", // IP Address
- "https://1.2.3.4:10",
- net::ProxyServer::SCHEME_HTTPS,
- "1.2.3.4",
- 10,
- "HTTPS 1.2.3.4:10"
- },
- };
+ // HTTPS proxy URIs:
+ {"https://foopy", // No port
+ "https://foopy:443", net::ProxyServer::SCHEME_HTTPS, "foopy", 443,
+ "HTTPS foopy:443"},
+ {"https://foopy:10", // Non-standard port
+ "https://foopy:10", net::ProxyServer::SCHEME_HTTPS, "foopy", 10,
+ "HTTPS foopy:10"},
+ {"https://1.2.3.4:10", // IP Address
+ "https://1.2.3.4:10", net::ProxyServer::SCHEME_HTTPS, "1.2.3.4", 10,
+ "HTTPS 1.2.3.4:10"},
+ };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
- net::ProxyServer uri =
- net::ProxyServer::FromURI(tests[i].input_uri,
- net::ProxyServer::SCHEME_HTTP);
+ net::ProxyServer uri = net::ProxyServer::FromURI(
+ tests[i].input_uri, net::ProxyServer::SCHEME_HTTP);
EXPECT_TRUE(uri.is_valid());
EXPECT_FALSE(uri.is_direct());
EXPECT_EQ(tests[i].expected_uri, uri.ToURI());
@@ -192,14 +109,13 @@ TEST(ProxyServerTest, Direct) {
// Test parsing some invalid inputs.
TEST(ProxyServerTest, Invalid) {
const char* tests[] = {
- "",
- " ",
- "dddf:", // not a valid port
- "dddd:d", // not a valid port
- "http://", // not a valid host/port.
- "direct://xyz", // direct is not allowed a host/port.
- "http:/", // ambiguous, but will fail because of bad port.
- "http:", // ambiguous, but will fail because of bad port.
+ "", " ",
+ "dddf:", // not a valid port
+ "dddd:d", // not a valid port
+ "http://", // not a valid host/port.
+ "direct://xyz", // direct is not allowed a host/port.
+ "http:/", // ambiguous, but will fail because of bad port.
+ "http:", // ambiguous, but will fail because of bad port.
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
@@ -215,9 +131,7 @@ TEST(ProxyServerTest, Invalid) {
// Test that LWS (SP | HT) is disregarded from the ends.
TEST(ProxyServerTest, Whitespace) {
const char* tests[] = {
- " foopy:80",
- "foopy:80 \t",
- " \tfoopy:80 ",
+ " foopy:80", "foopy:80 \t", " \tfoopy:80 ",
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
@@ -233,51 +147,41 @@ TEST(ProxyServerTest, FromPACString) {
const char* input_pac;
const char* expected_uri;
} tests[] = {
- {
- "PROXY foopy:10",
- "foopy:10",
- },
- {
- " PROXY foopy:10 ",
- "foopy:10",
- },
- {
- "pRoXy foopy:10",
- "foopy:10",
- },
- {
- "PROXY foopy", // No port.
- "foopy:80",
- },
- {
- "socks foopy",
- "socks4://foopy:1080",
- },
- {
- "socks4 foopy",
- "socks4://foopy:1080",
- },
- {
- "socks5 foopy",
- "socks5://foopy:1080",
- },
- {
- "socks5 foopy:11",
- "socks5://foopy:11",
- },
- {
- " direct ",
- "direct://",
- },
- {
- "https foopy",
- "https://foopy:443",
- },
- {
- "https foopy:10",
- "https://foopy:10",
- },
- };
+ {
+ "PROXY foopy:10", "foopy:10",
+ },
+ {
+ " PROXY foopy:10 ", "foopy:10",
+ },
+ {
+ "pRoXy foopy:10", "foopy:10",
+ },
+ {
+ "PROXY foopy", // No port.
+ "foopy:80",
+ },
+ {
+ "socks foopy", "socks4://foopy:1080",
+ },
+ {
+ "socks4 foopy", "socks4://foopy:1080",
+ },
+ {
+ "socks5 foopy", "socks5://foopy:1080",
+ },
+ {
+ "socks5 foopy:11", "socks5://foopy:11",
+ },
+ {
+ " direct ", "direct://",
+ },
+ {
+ "https foopy", "https://foopy:443",
+ },
+ {
+ "https foopy:10", "https://foopy:10",
+ },
+ };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
net::ProxyServer uri = net::ProxyServer::FromPacString(tests[i].input_pac);
@@ -289,10 +193,10 @@ TEST(ProxyServerTest, FromPACString) {
// Test parsing a ProxyServer from an invalid PAC representation.
TEST(ProxyServerTest, FromPACStringInvalid) {
const char* tests[] = {
- "PROXY", // missing host/port.
- "HTTPS", // missing host/port.
- "SOCKS", // missing host/port.
- "DIRECT foopy:10", // direct cannot have host/port.
+ "PROXY", // missing host/port.
+ "HTTPS", // missing host/port.
+ "SOCKS", // missing host/port.
+ "DIRECT foopy:10", // direct cannot have host/port.
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
@@ -313,37 +217,23 @@ TEST(ProxyServerTest, ComparatorAndEquality) {
// 1 means server1 is greater than server2
int expected_comparison;
} tests[] = {
- { // Equal.
- "foo:11",
- "http://foo:11",
- 0
- },
- { // Port is different.
- "foo:333",
- "foo:444",
- -1
- },
- { // Host is different.
- "foo:33",
- "bar:33",
- 1
- },
- { // Scheme is different.
- "socks4://foo:33",
- "http://foo:33",
- 1
- },
- };
+ {// Equal.
+ "foo:11", "http://foo:11", 0},
+ {// Port is different.
+ "foo:333", "foo:444", -1},
+ {// Host is different.
+ "foo:33", "bar:33", 1},
+ {// Scheme is different.
+ "socks4://foo:33", "http://foo:33", 1},
+ };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
// Parse the expected inputs to ProxyServer instances.
- const net::ProxyServer server1 =
- net::ProxyServer::FromURI(
- tests[i].server1, net::ProxyServer::SCHEME_HTTP);
+ const net::ProxyServer server1 = net::ProxyServer::FromURI(
+ tests[i].server1, net::ProxyServer::SCHEME_HTTP);
- const net::ProxyServer server2 =
- net::ProxyServer::FromURI(
- tests[i].server2, net::ProxyServer::SCHEME_HTTP);
+ const net::ProxyServer server2 = net::ProxyServer::FromURI(
+ tests[i].server2, net::ProxyServer::SCHEME_HTTP);
switch (tests[i].expected_comparison) {
case -1:
« net/base/mime_util_unittest.cc ('K') | « net/proxy/proxy_server.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698