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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_server_id_test.cc

Issue 1411063004: Remove insecure QUIC support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enough! Created 5 years, 2 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/quic/quic_server_id.cc ('k') | net/quic/quic_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_server_id_test.cc
diff --git a/net/quic/quic_server_id_test.cc b/net/quic/quic_server_id_test.cc
index 1e08b30d50f8ecb627d876b4f46f8c52f85faf16..e23d816298fb8dd0a7304d2e5da0188d9c9d9da4 100644
--- a/net/quic/quic_server_id_test.cc
+++ b/net/quic/quic_server_id_test.cc
@@ -15,82 +15,35 @@ namespace {
TEST(QuicServerIdTest, ToString) {
HostPortPair google_host_port_pair("google.com", 10);
- QuicServerId google_http_server_id(google_host_port_pair, false,
- PRIVACY_MODE_DISABLED);
- string google_http_server_id_str = google_http_server_id.ToString();
- EXPECT_EQ("http://google.com:10", google_http_server_id_str);
+ QuicServerId google_server_id(google_host_port_pair, PRIVACY_MODE_DISABLED);
+ string google_server_id_str = google_server_id.ToString();
+ EXPECT_EQ("https://google.com:10", google_server_id_str);
- QuicServerId google_https_server_id(google_host_port_pair, true,
- PRIVACY_MODE_DISABLED);
- string google_https_server_id_str = google_https_server_id.ToString();
- EXPECT_EQ("https://google.com:10", google_https_server_id_str);
-
- QuicServerId private_http_server_id(google_host_port_pair, false,
- PRIVACY_MODE_ENABLED);
- string private_http_server_id_str = private_http_server_id.ToString();
- EXPECT_EQ("http://google.com:10/private", private_http_server_id_str);
-
- QuicServerId private_https_server_id(google_host_port_pair, true,
- PRIVACY_MODE_ENABLED);
- string private_https_server_id_str = private_https_server_id.ToString();
- EXPECT_EQ("https://google.com:10/private", private_https_server_id_str);
+ QuicServerId private_server_id(google_host_port_pair, PRIVACY_MODE_ENABLED);
+ string private_server_id_str = private_server_id.ToString();
+ EXPECT_EQ("https://google.com:10/private", private_server_id_str);
}
TEST(QuicServerIdTest, LessThan) {
- QuicServerId a_10_http(HostPortPair("a.com", 10), false,
- PRIVACY_MODE_DISABLED);
- QuicServerId a_10_https(HostPortPair("a.com", 10), true,
- PRIVACY_MODE_DISABLED);
- QuicServerId a_11_http(HostPortPair("a.com", 11), false,
- PRIVACY_MODE_DISABLED);
- QuicServerId a_11_https(HostPortPair("a.com", 11), true,
- PRIVACY_MODE_DISABLED);
- QuicServerId b_10_http(HostPortPair("b.com", 10), false,
- PRIVACY_MODE_DISABLED);
- QuicServerId b_10_https(HostPortPair("b.com", 10), true,
- PRIVACY_MODE_DISABLED);
- QuicServerId b_11_http(HostPortPair("b.com", 11), false,
- PRIVACY_MODE_DISABLED);
- QuicServerId b_11_https(HostPortPair("b.com", 11), true,
- PRIVACY_MODE_DISABLED);
+ QuicServerId a_10_https(HostPortPair("a.com", 10), PRIVACY_MODE_DISABLED);
+ QuicServerId a_11_https(HostPortPair("a.com", 11), PRIVACY_MODE_DISABLED);
+ QuicServerId b_10_https(HostPortPair("b.com", 10), PRIVACY_MODE_DISABLED);
+ QuicServerId b_11_https(HostPortPair("b.com", 11), PRIVACY_MODE_DISABLED);
- QuicServerId a_10_http_private(HostPortPair("a.com", 10), false,
- PRIVACY_MODE_ENABLED);
- QuicServerId a_10_https_private(HostPortPair("a.com", 10), true,
+ QuicServerId a_10_https_private(HostPortPair("a.com", 10),
PRIVACY_MODE_ENABLED);
- QuicServerId a_11_http_private(HostPortPair("a.com", 11), false,
- PRIVACY_MODE_ENABLED);
- QuicServerId a_11_https_private(HostPortPair("a.com", 11), true,
+ QuicServerId a_11_https_private(HostPortPair("a.com", 11),
PRIVACY_MODE_ENABLED);
- QuicServerId b_10_http_private(HostPortPair("b.com", 10), false,
- PRIVACY_MODE_ENABLED);
- QuicServerId b_10_https_private(HostPortPair("b.com", 10), true,
+ QuicServerId b_10_https_private(HostPortPair("b.com", 10),
PRIVACY_MODE_ENABLED);
- QuicServerId b_11_http_private(HostPortPair("b.com", 11), false,
- PRIVACY_MODE_ENABLED);
- QuicServerId b_11_https_private(HostPortPair("b.com", 11), true,
+ QuicServerId b_11_https_private(HostPortPair("b.com", 11),
PRIVACY_MODE_ENABLED);
- // Test combinations of host, port, https and privacy being same on left and
+ // Test combinations of host, port, and privacy being same on left and
// right side of less than.
- EXPECT_FALSE(a_10_http < a_10_http);
- EXPECT_TRUE(a_10_http < a_10_https);
- EXPECT_FALSE(a_10_https < a_10_http);
EXPECT_FALSE(a_10_https < a_10_https);
-
- EXPECT_TRUE(a_10_http < a_10_http_private);
- EXPECT_TRUE(a_10_http < a_10_https_private);
- EXPECT_FALSE(a_10_https < a_10_http_private);
EXPECT_TRUE(a_10_https < a_10_https_private);
-
- EXPECT_FALSE(a_10_http_private < a_10_http);
- EXPECT_TRUE(a_10_http_private < a_10_https);
- EXPECT_FALSE(a_10_https_private < a_10_http);
EXPECT_FALSE(a_10_https_private < a_10_https);
-
- EXPECT_FALSE(a_10_http_private < a_10_http_private);
- EXPECT_TRUE(a_10_http_private < a_10_https_private);
- EXPECT_FALSE(a_10_https_private < a_10_http_private);
EXPECT_FALSE(a_10_https_private < a_10_https_private);
// Test with either host, port or https being different on left and right side
@@ -100,98 +53,35 @@ TEST(QuicServerIdTest, LessThan) {
for (int i = 0; i < 4; i++) {
left_privacy = static_cast<PrivacyMode>(i / 2);
right_privacy = static_cast<PrivacyMode>(i % 2);
- QuicServerId a_10_http_left_private(HostPortPair("a.com", 10), false,
- left_privacy);
- QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
- right_privacy);
- QuicServerId a_10_https_left_private(HostPortPair("a.com", 10), true,
+ QuicServerId a_10_https_left_private(HostPortPair("a.com", 10),
left_privacy);
- QuicServerId a_10_https_right_private(HostPortPair("a.com", 10), true,
+ QuicServerId a_10_https_right_private(HostPortPair("a.com", 10),
right_privacy);
- QuicServerId a_11_http_left_private(HostPortPair("a.com", 11), false,
- left_privacy);
- QuicServerId a_11_http_right_private(HostPortPair("a.com", 11), false,
- right_privacy);
- QuicServerId a_11_https_left_private(HostPortPair("a.com", 11), true,
+ QuicServerId a_11_https_left_private(HostPortPair("a.com", 11),
left_privacy);
- QuicServerId a_11_https_right_private(HostPortPair("a.com", 11), true,
+ QuicServerId a_11_https_right_private(HostPortPair("a.com", 11),
right_privacy);
- QuicServerId b_10_http_left_private(HostPortPair("b.com", 10), false,
- left_privacy);
- QuicServerId b_10_http_right_private(HostPortPair("b.com", 10), false,
- right_privacy);
- QuicServerId b_10_https_left_private(HostPortPair("b.com", 10), true,
+ QuicServerId b_10_https_left_private(HostPortPair("b.com", 10),
left_privacy);
- QuicServerId b_10_https_right_private(HostPortPair("b.com", 10), true,
+ QuicServerId b_10_https_right_private(HostPortPair("b.com", 10),
right_privacy);
- QuicServerId b_11_http_left_private(HostPortPair("b.com", 11), false,
- left_privacy);
- QuicServerId b_11_http_right_private(HostPortPair("b.com", 11), false,
- right_privacy);
- QuicServerId b_11_https_left_private(HostPortPair("b.com", 11), true,
+ QuicServerId b_11_https_left_private(HostPortPair("b.com", 11),
left_privacy);
- QuicServerId b_11_https_right_private(HostPortPair("b.com", 11), true,
+ QuicServerId b_11_https_right_private(HostPortPair("b.com", 11),
right_privacy);
- EXPECT_TRUE(a_10_http_left_private < a_11_http_right_private);
- EXPECT_TRUE(a_10_http_left_private < a_11_https_right_private);
- EXPECT_TRUE(a_10_https_left_private < a_11_http_right_private);
EXPECT_TRUE(a_10_https_left_private < a_11_https_right_private);
-
- EXPECT_TRUE(a_10_http_left_private < b_10_http_right_private);
- EXPECT_TRUE(a_10_http_left_private < b_10_https_right_private);
- EXPECT_TRUE(a_10_https_left_private < b_10_http_right_private);
EXPECT_TRUE(a_10_https_left_private < b_10_https_right_private);
-
- EXPECT_TRUE(a_10_http_left_private < b_11_http_right_private);
- EXPECT_TRUE(a_10_http_left_private < b_11_https_right_private);
- EXPECT_TRUE(a_10_https_left_private < b_11_http_right_private);
EXPECT_TRUE(a_10_https_left_private < b_11_https_right_private);
-
- EXPECT_FALSE(a_11_http_left_private < a_10_http_right_private);
- EXPECT_FALSE(a_11_http_left_private < a_10_https_right_private);
- EXPECT_FALSE(a_11_https_left_private < a_10_http_right_private);
EXPECT_FALSE(a_11_https_left_private < a_10_https_right_private);
-
- EXPECT_FALSE(a_11_http_left_private < b_10_http_right_private);
- EXPECT_FALSE(a_11_http_left_private < b_10_https_right_private);
- EXPECT_FALSE(a_11_https_left_private < b_10_http_right_private);
EXPECT_FALSE(a_11_https_left_private < b_10_https_right_private);
-
- EXPECT_TRUE(a_11_http_left_private < b_11_http_right_private);
- EXPECT_TRUE(a_11_http_left_private < b_11_https_right_private);
- EXPECT_TRUE(a_11_https_left_private < b_11_http_right_private);
EXPECT_TRUE(a_11_https_left_private < b_11_https_right_private);
-
- EXPECT_FALSE(b_10_http_left_private < a_10_http_right_private);
- EXPECT_FALSE(b_10_http_left_private < a_10_https_right_private);
- EXPECT_FALSE(b_10_https_left_private < a_10_http_right_private);
EXPECT_FALSE(b_10_https_left_private < a_10_https_right_private);
-
- EXPECT_TRUE(b_10_http_left_private < a_11_http_right_private);
- EXPECT_TRUE(b_10_http_left_private < a_11_https_right_private);
- EXPECT_TRUE(b_10_https_left_private < a_11_http_right_private);
EXPECT_TRUE(b_10_https_left_private < a_11_https_right_private);
-
- EXPECT_TRUE(b_10_http_left_private < b_11_http_right_private);
- EXPECT_TRUE(b_10_http_left_private < b_11_https_right_private);
- EXPECT_TRUE(b_10_https_left_private < b_11_http_right_private);
EXPECT_TRUE(b_10_https_left_private < b_11_https_right_private);
-
- EXPECT_FALSE(b_11_http_left_private < a_10_http_right_private);
- EXPECT_FALSE(b_11_http_left_private < a_10_https_right_private);
- EXPECT_FALSE(b_11_https_left_private < a_10_http_right_private);
EXPECT_FALSE(b_11_https_left_private < a_10_https_right_private);
-
- EXPECT_FALSE(b_11_http_left_private < a_11_http_right_private);
- EXPECT_FALSE(b_11_http_left_private < a_11_https_right_private);
- EXPECT_FALSE(b_11_https_left_private < a_11_http_right_private);
EXPECT_FALSE(b_11_https_left_private < a_11_https_right_private);
-
- EXPECT_FALSE(b_11_http_left_private < b_10_http_right_private);
- EXPECT_FALSE(b_11_http_left_private < b_10_https_right_private);
- EXPECT_FALSE(b_11_https_left_private < b_10_http_right_private);
EXPECT_FALSE(b_11_https_left_private < b_10_https_right_private);
}
}
@@ -201,85 +91,53 @@ TEST(QuicServerIdTest, Equals) {
PrivacyMode right_privacy;
for (int i = 0; i < 2; i++) {
left_privacy = right_privacy = static_cast<PrivacyMode>(i);
- QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
- right_privacy);
- QuicServerId a_10_https_right_private(HostPortPair("a.com", 10), true,
+ QuicServerId a_10_https_right_private(HostPortPair("a.com", 10),
right_privacy);
- QuicServerId a_11_http_right_private(HostPortPair("a.com", 11), false,
- right_privacy);
- QuicServerId a_11_https_right_private(HostPortPair("a.com", 11), true,
+ QuicServerId a_11_https_right_private(HostPortPair("a.com", 11),
right_privacy);
- QuicServerId b_10_http_right_private(HostPortPair("b.com", 10), false,
- right_privacy);
- QuicServerId b_10_https_right_private(HostPortPair("b.com", 10), true,
+ QuicServerId b_10_https_right_private(HostPortPair("b.com", 10),
right_privacy);
- QuicServerId b_11_http_right_private(HostPortPair("b.com", 11), false,
- right_privacy);
- QuicServerId b_11_https_right_private(HostPortPair("b.com", 11), true,
+ QuicServerId b_11_https_right_private(HostPortPair("b.com", 11),
right_privacy);
- QuicServerId new_a_10_http_left_private(HostPortPair("a.com", 10), false,
- left_privacy);
- QuicServerId new_a_10_https_left_private(HostPortPair("a.com", 10), true,
+ QuicServerId new_a_10_https_left_private(HostPortPair("a.com", 10),
left_privacy);
- QuicServerId new_a_11_http_left_private(HostPortPair("a.com", 11), false,
- left_privacy);
- QuicServerId new_a_11_https_left_private(HostPortPair("a.com", 11), true,
+ QuicServerId new_a_11_https_left_private(HostPortPair("a.com", 11),
left_privacy);
- QuicServerId new_b_10_http_left_private(HostPortPair("b.com", 10), false,
- left_privacy);
- QuicServerId new_b_10_https_left_private(HostPortPair("b.com", 10), true,
+ QuicServerId new_b_10_https_left_private(HostPortPair("b.com", 10),
left_privacy);
- QuicServerId new_b_11_http_left_private(HostPortPair("b.com", 11), false,
- left_privacy);
- QuicServerId new_b_11_https_left_private(HostPortPair("b.com", 11), true,
+ QuicServerId new_b_11_https_left_private(HostPortPair("b.com", 11),
left_privacy);
- EXPECT_EQ(new_a_10_http_left_private, a_10_http_right_private);
EXPECT_EQ(new_a_10_https_left_private, a_10_https_right_private);
- EXPECT_EQ(new_a_11_http_left_private, a_11_http_right_private);
EXPECT_EQ(new_a_11_https_left_private, a_11_https_right_private);
- EXPECT_EQ(new_b_10_http_left_private, b_10_http_right_private);
EXPECT_EQ(new_b_10_https_left_private, b_10_https_right_private);
- EXPECT_EQ(new_b_11_http_left_private, b_11_http_right_private);
EXPECT_EQ(new_b_11_https_left_private, b_11_https_right_private);
}
for (int i = 0; i < 2; i++) {
right_privacy = static_cast<PrivacyMode>(i);
- QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
- right_privacy);
- QuicServerId a_10_https_right_private(HostPortPair("a.com", 10), true,
+ QuicServerId a_10_https_right_private(HostPortPair("a.com", 10),
right_privacy);
- QuicServerId a_11_http_right_private(HostPortPair("a.com", 11), false,
- right_privacy);
- QuicServerId a_11_https_right_private(HostPortPair("a.com", 11), true,
+ QuicServerId a_11_https_right_private(HostPortPair("a.com", 11),
right_privacy);
- QuicServerId b_10_http_right_private(HostPortPair("b.com", 10), false,
- right_privacy);
- QuicServerId b_10_https_right_private(HostPortPair("b.com", 10), true,
+ QuicServerId b_10_https_right_private(HostPortPair("b.com", 10),
right_privacy);
- QuicServerId b_11_http_right_private(HostPortPair("b.com", 11), false,
- right_privacy);
- QuicServerId b_11_https_right_private(HostPortPair("b.com", 11), true,
+ QuicServerId b_11_https_right_private(HostPortPair("b.com", 11),
right_privacy);
- QuicServerId new_a_10_http_left_private(HostPortPair("a.com", 10), false,
- PRIVACY_MODE_DISABLED);
+ QuicServerId new_a_10_https_left_private(HostPortPair("a.com", 10),
+ PRIVACY_MODE_DISABLED);
- EXPECT_FALSE(new_a_10_http_left_private == a_10_https_right_private);
- EXPECT_FALSE(new_a_10_http_left_private == a_11_http_right_private);
- EXPECT_FALSE(new_a_10_http_left_private == b_10_http_right_private);
- EXPECT_FALSE(new_a_10_http_left_private == a_11_https_right_private);
- EXPECT_FALSE(new_a_10_http_left_private == b_10_https_right_private);
- EXPECT_FALSE(new_a_10_http_left_private == b_11_http_right_private);
- EXPECT_FALSE(new_a_10_http_left_private == b_11_https_right_private);
+ EXPECT_FALSE(new_a_10_https_left_private == a_11_https_right_private);
+ EXPECT_FALSE(new_a_10_https_left_private == b_10_https_right_private);
+ EXPECT_FALSE(new_a_10_https_left_private == b_11_https_right_private);
}
- QuicServerId a_10_http_private(HostPortPair("a.com", 10), false,
- PRIVACY_MODE_ENABLED);
- QuicServerId new_a_10_http_no_private(HostPortPair("a.com", 10), false,
- PRIVACY_MODE_DISABLED);
- EXPECT_FALSE(new_a_10_http_no_private == a_10_http_private);
+ QuicServerId a_10_https_private(HostPortPair("a.com", 10),
+ PRIVACY_MODE_ENABLED);
+ QuicServerId new_a_10_https_no_private(HostPortPair("a.com", 10),
+ PRIVACY_MODE_DISABLED);
+ EXPECT_FALSE(new_a_10_https_no_private == a_10_https_private);
}
} // namespace
« no previous file with comments | « net/quic/quic_server_id.cc ('k') | net/quic/quic_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698