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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 2140673002: Remove SPDY/3.1 tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/http/http_stream_factory_impl_unittest.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool_unittest.cc
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index c69900bf62b4b3d0b7e2bfa921e1b0ea73a55507..5d98c343aea7e9954a42a5845101e833b4be2d9d 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -178,7 +178,7 @@ class SSLClientSocketPoolTest
params.ssl_config_service = ssl_config_service_.get();
params.http_auth_handler_factory = http_auth_handler_factory_.get();
params.http_server_properties = http_server_properties_.get();
- params.spdy_default_protocol = GetParam();
+ params.spdy_default_protocol = kProtoHTTP2;
return new HttpNetworkSession(params);
}
@@ -211,12 +211,7 @@ class SSLClientSocketPoolTest
std::unique_ptr<SSLClientSocketPool> pool_;
};
-INSTANTIATE_TEST_CASE_P(NextProto,
- SSLClientSocketPoolTest,
- testing::Values(kProtoSPDY31,
- kProtoHTTP2));
-
-TEST_P(SSLClientSocketPoolTest, TCPFail) {
+TEST_F(SSLClientSocketPoolTest, TCPFail) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED));
socket_factory_.AddSocketDataProvider(&data);
@@ -238,7 +233,7 @@ TEST_P(SSLClientSocketPoolTest, TCPFail) {
IsError(ERR_CONNECTION_FAILED));
}
-TEST_P(SSLClientSocketPoolTest, TCPFailAsync) {
+TEST_F(SSLClientSocketPoolTest, TCPFailAsync) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_FAILED));
socket_factory_.AddSocketDataProvider(&data);
@@ -265,7 +260,7 @@ TEST_P(SSLClientSocketPoolTest, TCPFailAsync) {
IsError(ERR_CONNECTION_FAILED));
}
-TEST_P(SSLClientSocketPoolTest, BasicDirect) {
+TEST_F(SSLClientSocketPoolTest, BasicDirect) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
socket_factory_.AddSocketDataProvider(&data);
@@ -290,7 +285,7 @@ TEST_P(SSLClientSocketPoolTest, BasicDirect) {
// Make sure that SSLConnectJob passes on its priority to its
// socket request on Init (for the DIRECT case).
-TEST_P(SSLClientSocketPoolTest, SetSocketRequestPriorityOnInitDirect) {
+TEST_F(SSLClientSocketPoolTest, SetSocketRequestPriorityOnInitDirect) {
CreatePool(true /* tcp pool */, false, false);
scoped_refptr<SSLSocketParams> params =
SSLParams(ProxyServer::SCHEME_DIRECT, false);
@@ -313,7 +308,7 @@ TEST_P(SSLClientSocketPoolTest, SetSocketRequestPriorityOnInitDirect) {
}
}
-TEST_P(SSLClientSocketPoolTest, BasicDirectAsync) {
+TEST_F(SSLClientSocketPoolTest, BasicDirectAsync) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, OK);
@@ -338,7 +333,7 @@ TEST_P(SSLClientSocketPoolTest, BasicDirectAsync) {
TestLoadTimingInfo(handle);
}
-TEST_P(SSLClientSocketPoolTest, DirectCertError) {
+TEST_F(SSLClientSocketPoolTest, DirectCertError) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, ERR_CERT_COMMON_NAME_INVALID);
@@ -363,7 +358,7 @@ TEST_P(SSLClientSocketPoolTest, DirectCertError) {
TestLoadTimingInfo(handle);
}
-TEST_P(SSLClientSocketPoolTest, DirectSSLError) {
+TEST_F(SSLClientSocketPoolTest, DirectSSLError) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR);
@@ -388,7 +383,7 @@ TEST_P(SSLClientSocketPoolTest, DirectSSLError) {
EXPECT_TRUE(handle.is_ssl_error());
}
-TEST_P(SSLClientSocketPoolTest, DirectWithNPN) {
+TEST_F(SSLClientSocketPoolTest, DirectWithNPN) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, OK);
@@ -416,7 +411,7 @@ TEST_P(SSLClientSocketPoolTest, DirectWithNPN) {
EXPECT_TRUE(ssl_socket->WasNpnNegotiated());
}
-TEST_P(SSLClientSocketPoolTest, DirectNoSPDY) {
+TEST_F(SSLClientSocketPoolTest, DirectNoSPDY) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, OK);
@@ -442,11 +437,11 @@ TEST_P(SSLClientSocketPoolTest, DirectNoSPDY) {
EXPECT_TRUE(handle.is_ssl_error());
}
-TEST_P(SSLClientSocketPoolTest, DirectGotSPDY) {
+TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetParam());
+ ssl.SetNextProto(kProtoHTTP2);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
@@ -471,14 +466,14 @@ TEST_P(SSLClientSocketPoolTest, DirectGotSPDY) {
EXPECT_TRUE(ssl_socket->WasNpnNegotiated());
std::string proto;
ssl_socket->GetNextProto(&proto);
- EXPECT_EQ(GetParam(), SSLClientSocket::NextProtoFromString(proto));
+ EXPECT_EQ(kProtoHTTP2, SSLClientSocket::NextProtoFromString(proto));
}
-TEST_P(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
+TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(GetParam());
+ ssl.SetNextProto(kProtoHTTP2);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
@@ -503,10 +498,10 @@ TEST_P(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
EXPECT_TRUE(ssl_socket->WasNpnNegotiated());
std::string proto;
ssl_socket->GetNextProto(&proto);
- EXPECT_EQ(GetParam(), SSLClientSocket::NextProtoFromString(proto));
+ EXPECT_EQ(kProtoHTTP2, SSLClientSocket::NextProtoFromString(proto));
}
-TEST_P(SSLClientSocketPoolTest, SOCKSFail) {
+TEST_F(SSLClientSocketPoolTest, SOCKSFail) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED));
socket_factory_.AddSocketDataProvider(&data);
@@ -526,7 +521,7 @@ TEST_P(SSLClientSocketPoolTest, SOCKSFail) {
EXPECT_FALSE(handle.is_ssl_error());
}
-TEST_P(SSLClientSocketPoolTest, SOCKSFailAsync) {
+TEST_F(SSLClientSocketPoolTest, SOCKSFailAsync) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_FAILED));
socket_factory_.AddSocketDataProvider(&data);
@@ -550,7 +545,7 @@ TEST_P(SSLClientSocketPoolTest, SOCKSFailAsync) {
EXPECT_FALSE(handle.is_ssl_error());
}
-TEST_P(SSLClientSocketPoolTest, SOCKSBasic) {
+TEST_F(SSLClientSocketPoolTest, SOCKSBasic) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
socket_factory_.AddSocketDataProvider(&data);
@@ -576,7 +571,7 @@ TEST_P(SSLClientSocketPoolTest, SOCKSBasic) {
// Make sure that SSLConnectJob passes on its priority to its
// transport socket on Init (for the SOCKS_PROXY case).
-TEST_P(SSLClientSocketPoolTest, SetTransportPriorityOnInitSOCKS) {
+TEST_F(SSLClientSocketPoolTest, SetTransportPriorityOnInitSOCKS) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
socket_factory_.AddSocketDataProvider(&data);
@@ -595,7 +590,7 @@ TEST_P(SSLClientSocketPoolTest, SetTransportPriorityOnInitSOCKS) {
EXPECT_EQ(HIGHEST, transport_socket_pool_.last_request_priority());
}
-TEST_P(SSLClientSocketPoolTest, SOCKSBasicAsync) {
+TEST_F(SSLClientSocketPoolTest, SOCKSBasicAsync) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, OK);
@@ -622,7 +617,7 @@ TEST_P(SSLClientSocketPoolTest, SOCKSBasicAsync) {
TestLoadTimingInfo(handle);
}
-TEST_P(SSLClientSocketPoolTest, HttpProxyFail) {
+TEST_F(SSLClientSocketPoolTest, HttpProxyFail) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED));
socket_factory_.AddSocketDataProvider(&data);
@@ -642,7 +637,7 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyFail) {
EXPECT_FALSE(handle.is_ssl_error());
}
-TEST_P(SSLClientSocketPoolTest, HttpProxyFailAsync) {
+TEST_F(SSLClientSocketPoolTest, HttpProxyFailAsync) {
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_FAILED));
socket_factory_.AddSocketDataProvider(&data);
@@ -666,7 +661,7 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyFailAsync) {
EXPECT_FALSE(handle.is_ssl_error());
}
-TEST_P(SSLClientSocketPoolTest, HttpProxyBasic) {
+TEST_F(SSLClientSocketPoolTest, HttpProxyBasic) {
MockWrite writes[] = {
MockWrite(SYNCHRONOUS,
"CONNECT host:80 HTTP/1.1\r\n"
@@ -702,7 +697,7 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyBasic) {
// Make sure that SSLConnectJob passes on its priority to its
// transport socket on Init (for the HTTP_PROXY case).
-TEST_P(SSLClientSocketPoolTest, SetTransportPriorityOnInitHTTP) {
+TEST_F(SSLClientSocketPoolTest, SetTransportPriorityOnInitHTTP) {
MockWrite writes[] = {
MockWrite(SYNCHRONOUS,
"CONNECT host:80 HTTP/1.1\r\n"
@@ -733,7 +728,7 @@ TEST_P(SSLClientSocketPoolTest, SetTransportPriorityOnInitHTTP) {
EXPECT_EQ(HIGHEST, transport_socket_pool_.last_request_priority());
}
-TEST_P(SSLClientSocketPoolTest, HttpProxyBasicAsync) {
+TEST_F(SSLClientSocketPoolTest, HttpProxyBasicAsync) {
MockWrite writes[] = {
MockWrite(
"CONNECT host:80 HTTP/1.1\r\n"
@@ -770,7 +765,7 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyBasicAsync) {
TestLoadTimingInfoNoDns(handle);
}
-TEST_P(SSLClientSocketPoolTest, NeedProxyAuth) {
+TEST_F(SSLClientSocketPoolTest, NeedProxyAuth) {
MockWrite writes[] = {
MockWrite(
"CONNECT host:80 HTTP/1.1\r\n"
@@ -814,7 +809,7 @@ TEST_P(SSLClientSocketPoolTest, NeedProxyAuth) {
EXPECT_FALSE(tunnel_handle->socket()->IsConnected());
}
-TEST_P(SSLClientSocketPoolTest, IPPooling) {
+TEST_F(SSLClientSocketPoolTest, IPPooling) {
const int kTestPort = 80;
struct TestHosts {
std::string name;
@@ -856,7 +851,7 @@ TEST_P(SSLClientSocketPoolTest, IPPooling) {
SSLSocketDataProvider ssl(ASYNC, OK);
ssl.cert = X509Certificate::CreateFromBytes(
reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der));
- ssl.SetNextProto(GetParam());
+ ssl.SetNextProto(kProtoHTTP2);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
@@ -930,20 +925,20 @@ void SSLClientSocketPoolTest::TestIPPoolingDisabled(
// Verifies that an SSL connection with client authentication disables SPDY IP
// pooling.
-TEST_P(SSLClientSocketPoolTest, IPPoolingClientCert) {
+TEST_F(SSLClientSocketPoolTest, IPPoolingClientCert) {
SSLSocketDataProvider ssl(ASYNC, OK);
ssl.cert = X509Certificate::CreateFromBytes(
reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der));
ssl.client_cert_sent = true;
- ssl.SetNextProto(GetParam());
+ ssl.SetNextProto(kProtoHTTP2);
TestIPPoolingDisabled(&ssl);
}
// Verifies that an SSL connection with channel ID disables SPDY IP pooling.
-TEST_P(SSLClientSocketPoolTest, IPPoolingChannelID) {
+TEST_F(SSLClientSocketPoolTest, IPPoolingChannelID) {
SSLSocketDataProvider ssl(ASYNC, OK);
ssl.channel_id_sent = true;
- ssl.SetNextProto(GetParam());
+ ssl.SetNextProto(kProtoHTTP2);
TestIPPoolingDisabled(&ssl);
}
« no previous file with comments | « net/http/http_stream_factory_impl_unittest.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698