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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_stream_factory_impl_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_request_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_unittest.cc
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index 1067fdff11a8bf1abdd770296f466fb23a729f59..1e26e7ae96600784519190ec0fc00dfb890b678b 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -482,15 +482,9 @@ class HttpStreamFactoryTest : public ::testing::Test,
public ::testing::WithParamInterface<NextProto> {
};
-INSTANTIATE_TEST_CASE_P(NextProto,
- HttpStreamFactoryTest,
- testing::Values(kProtoSPDY31,
- kProtoHTTP2));
-
-TEST_P(HttpStreamFactoryTest, PreconnectDirect) {
+TEST_F(HttpStreamFactoryTest, PreconnectDirect) {
for (size_t i = 0; i < arraysize(kTests); ++i) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
std::unique_ptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps));
HttpNetworkSessionPeer peer(session.get());
@@ -519,10 +513,10 @@ TEST_P(HttpStreamFactoryTest, PreconnectDirect) {
}
}
-TEST_P(HttpStreamFactoryTest, PreconnectHttpProxy) {
+TEST_F(HttpStreamFactoryTest, PreconnectHttpProxy) {
for (size_t i = 0; i < arraysize(kTests); ++i) {
SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateFixed("http_proxy"));
+ ProxyService::CreateFixed("http_proxy"));
std::unique_ptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps));
HttpNetworkSessionPeer peer(session.get());
@@ -552,10 +546,10 @@ TEST_P(HttpStreamFactoryTest, PreconnectHttpProxy) {
}
}
-TEST_P(HttpStreamFactoryTest, PreconnectSocksProxy) {
+TEST_F(HttpStreamFactoryTest, PreconnectSocksProxy) {
for (size_t i = 0; i < arraysize(kTests); ++i) {
SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateFixed("socks4://socks_proxy:1080"));
+ ProxyService::CreateFixed("socks4://socks_proxy:1080"));
std::unique_ptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps));
HttpNetworkSessionPeer peer(session.get());
@@ -585,10 +579,9 @@ TEST_P(HttpStreamFactoryTest, PreconnectSocksProxy) {
}
}
-TEST_P(HttpStreamFactoryTest, PreconnectDirectWithExistingSpdySession) {
+TEST_F(HttpStreamFactoryTest, PreconnectDirectWithExistingSpdySession) {
for (size_t i = 0; i < arraysize(kTests); ++i) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
std::unique_ptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps));
HttpNetworkSessionPeer peer(session.get());
@@ -629,11 +622,10 @@ TEST_P(HttpStreamFactoryTest, PreconnectDirectWithExistingSpdySession) {
// Verify that preconnects to unsafe ports are cancelled before they reach
// the SocketPool.
-TEST_P(HttpStreamFactoryTest, PreconnectUnsafePort) {
+TEST_F(HttpStreamFactoryTest, PreconnectUnsafePort) {
ASSERT_FALSE(IsPortAllowedForScheme(7, "http"));
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
std::unique_ptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps));
HttpNetworkSessionPeer peer(session.get());
@@ -652,10 +644,10 @@ TEST_P(HttpStreamFactoryTest, PreconnectUnsafePort) {
EXPECT_EQ(-1, transport_conn_pool->last_num_streams());
}
-TEST_P(HttpStreamFactoryTest, JobNotifiesProxy) {
+TEST_F(HttpStreamFactoryTest, JobNotifiesProxy) {
const char* kProxyString = "PROXY bad:99; PROXY maybe:80; DIRECT";
SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateFixedFromPacResult(kProxyString));
+ ProxyService::CreateFixedFromPacResult(kProxyString));
// First connection attempt fails
StaticSocketDataProvider socket_data1;
@@ -692,7 +684,7 @@ TEST_P(HttpStreamFactoryTest, JobNotifiesProxy) {
EXPECT_TRUE(iter != retry_info.end());
}
-TEST_P(HttpStreamFactoryTest, UnreachableQuicProxyMarkedAsBad) {
+TEST_F(HttpStreamFactoryTest, UnreachableQuicProxyMarkedAsBad) {
const int mock_error[] = {ERR_PROXY_CONNECTION_FAILED,
ERR_NAME_NOT_RESOLVED,
ERR_INTERNET_DISCONNECTED,
@@ -840,7 +832,7 @@ class MockQuicData {
} // namespace
-TEST_P(HttpStreamFactoryTest, QuicLossyProxyMarkedAsBad) {
+TEST_F(HttpStreamFactoryTest, QuicLossyProxyMarkedAsBad) {
// Checks if a
std::unique_ptr<ProxyService> proxy_service;
proxy_service = ProxyService::CreateFixedFromPacResult("QUIC bad:99; DIRECT");
@@ -904,7 +896,7 @@ TEST_P(HttpStreamFactoryTest, QuicLossyProxyMarkedAsBad) {
EXPECT_TRUE(iter != retry_info.end());
}
-TEST_P(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {
+TEST_F(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {
for (int num_streams = 1; num_streams < 3; ++num_streams) {
GURL url = GURL("https://www.google.com");
@@ -923,7 +915,7 @@ TEST_P(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {
server, alternative_service_info_vector);
SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateFixed("http_proxy"));
+ ProxyService::CreateFixed("http_proxy"));
// Setup params to disable preconnect, but QUIC doesn't 0RTT.
HttpNetworkSession::Params params =
@@ -957,7 +949,7 @@ TEST_P(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {
}
}
-TEST_P(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) {
+TEST_F(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) {
for (int num_streams = 1; num_streams < 3; ++num_streams) {
GURL url = GURL("https://www.google.com");
@@ -974,7 +966,7 @@ TEST_P(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) {
http_server_properties.SetAlternativeServices(
server, alternative_service_info_vector);
- SpdySessionDependencies session_deps(GetParam());
+ SpdySessionDependencies session_deps;
// Setup params to disable preconnect, but QUIC does 0RTT.
HttpNetworkSession::Params params =
@@ -1015,9 +1007,8 @@ TEST_P(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) {
namespace {
-TEST_P(HttpStreamFactoryTest, PrivacyModeDisablesChannelId) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, PrivacyModeDisablesChannelId) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
StaticSocketDataProvider socket_data;
socket_data.set_connect_data(MockConnect(ASYNC, OK));
@@ -1082,9 +1073,8 @@ int GetSpdySessionCount(HttpNetworkSession* session) {
} // namespace
-TEST_P(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
StaticSocketDataProvider socket_data_1;
socket_data_1.set_connect_data(MockConnect(ASYNC, OK));
@@ -1145,9 +1135,8 @@ TEST_P(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
EXPECT_EQ(GetSocketPoolGroupCount(ssl_pool), 2);
}
-TEST_P(HttpStreamFactoryTest, GetLoadState) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, GetLoadState) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
// Force asynchronous host resolutions, so that the LoadState will be
// resolving the host.
@@ -1176,9 +1165,8 @@ TEST_P(HttpStreamFactoryTest, GetLoadState) {
waiter.WaitForStream();
}
-TEST_P(HttpStreamFactoryTest, RequestHttpStream) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, RequestHttpStream) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
StaticSocketDataProvider socket_data;
socket_data.set_connect_data(MockConnect(ASYNC, OK));
@@ -1218,9 +1206,8 @@ TEST_P(HttpStreamFactoryTest, RequestHttpStream) {
EXPECT_TRUE(waiter.used_proxy_info().is_direct());
}
-TEST_P(HttpStreamFactoryTest, RequestHttpStreamOverSSL) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, RequestHttpStreamOverSSL) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
MockRead mock_read(ASYNC, OK);
StaticSocketDataProvider socket_data(&mock_read, 1, nullptr, 0);
@@ -1263,9 +1250,9 @@ TEST_P(HttpStreamFactoryTest, RequestHttpStreamOverSSL) {
EXPECT_TRUE(waiter.used_proxy_info().is_direct());
}
-TEST_P(HttpStreamFactoryTest, RequestHttpStreamOverProxy) {
+TEST_F(HttpStreamFactoryTest, RequestHttpStreamOverProxy) {
SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateFixed("myproxy:8888"));
+ ProxyService::CreateFixed("myproxy:8888"));
StaticSocketDataProvider socket_data;
socket_data.set_connect_data(MockConnect(ASYNC, OK));
@@ -1312,9 +1299,8 @@ TEST_P(HttpStreamFactoryTest, RequestHttpStreamOverProxy) {
EXPECT_FALSE(waiter.used_proxy_info().is_direct());
}
-TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStream) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStream) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
StaticSocketDataProvider socket_data;
socket_data.set_connect_data(MockConnect(ASYNC, OK));
@@ -1352,9 +1338,8 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStream) {
EXPECT_TRUE(waiter.used_proxy_info().is_direct());
}
-TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) {
- SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
MockRead mock_read(ASYNC, OK);
StaticSocketDataProvider socket_data(&mock_read, 1, nullptr, 0);
@@ -1396,9 +1381,9 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) {
EXPECT_TRUE(waiter.used_proxy_info().is_direct());
}
-TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) {
+TEST_F(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) {
SpdySessionDependencies session_deps(
- GetParam(), ProxyService::CreateFixed("myproxy:8888"));
+ ProxyService::CreateFixed("myproxy:8888"));
MockRead read(SYNCHRONOUS, "HTTP/1.0 200 Connection established\r\n\r\n");
StaticSocketDataProvider socket_data(&read, 1, 0, 0);
@@ -1448,9 +1433,8 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) {
EXPECT_FALSE(waiter.used_proxy_info().is_direct());
}
-TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) {
- SpdySessionDependencies session_deps(GetParam(),
- ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, RequestSpdyHttpStream) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data(&mock_read, 1, nullptr, 0);
@@ -1458,7 +1442,7 @@ TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) {
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
- ssl_socket_data.SetNextProto(GetParam());
+ ssl_socket_data.SetNextProto(kProtoHTTP2);
session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
HostPortPair host_port_pair("www.google.com", 443);
@@ -1495,9 +1479,8 @@ TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) {
EXPECT_TRUE(waiter.used_proxy_info().is_direct());
}
-TEST_P(HttpStreamFactoryTest, RequestBidirectionalStreamImpl) {
- SpdySessionDependencies session_deps(GetParam(),
- ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, RequestBidirectionalStreamImpl) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
MockRead mock_read(ASYNC, OK);
SequencedSocketData socket_data(&mock_read, 1, nullptr, 0);
@@ -1505,7 +1488,7 @@ TEST_P(HttpStreamFactoryTest, RequestBidirectionalStreamImpl) {
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
- ssl_socket_data.SetNextProto(GetParam());
+ ssl_socket_data.SetNextProto(kProtoHTTP2);
session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
HostPortPair host_port_pair("www.google.com", 443);
@@ -1852,9 +1835,8 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest,
EXPECT_TRUE(waiter.used_proxy_info().is_direct());
}
-TEST_P(HttpStreamFactoryTest, RequestBidirectionalStreamImplFailure) {
- SpdySessionDependencies session_deps(GetParam(),
- ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, RequestBidirectionalStreamImplFailure) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
MockRead mock_read(ASYNC, OK);
SequencedSocketData socket_data(&mock_read, 1, nullptr, 0);
@@ -1902,9 +1884,8 @@ TEST_P(HttpStreamFactoryTest, RequestBidirectionalStreamImplFailure) {
// TODO(ricea): This test can be removed once the new WebSocket stack supports
// SPDY. Currently, even if we connect to a SPDY-supporting server, we need to
// use plain SSL.
-TEST_P(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStreamButGetSSL) {
- SpdySessionDependencies session_deps(GetParam(),
- ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStreamButGetSSL) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider socket_data(&mock_read, 1, nullptr, 0);
@@ -1949,9 +1930,8 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStreamButGetSSL) {
}
// TODO(ricea): Re-enable once WebSocket-over-SPDY is implemented.
-TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) {
- SpdySessionDependencies session_deps(GetParam(),
- ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider socket_data(&mock_read, 1, nullptr, 0);
@@ -1959,7 +1939,7 @@ TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) {
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
- ssl_socket_data.SetNextProto(GetParam());
+ ssl_socket_data.SetNextProto(kProtoHTTP2);
session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
HostPortPair host_port_pair("www.google.com", 80);
@@ -2018,9 +1998,8 @@ TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) {
}
// TODO(ricea): Re-enable once WebSocket over SPDY is implemented.
-TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
- SpdySessionDependencies session_deps(GetParam(),
- ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
+ SpdySessionDependencies session_deps(ProxyService::CreateDirect());
MockRead mock_read(ASYNC, OK);
SequencedSocketData socket_data(&mock_read, 1, nullptr, 0);
socket_data.set_connect_data(MockConnect(ASYNC, OK));
@@ -2032,7 +2011,7 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
session_deps.socket_factory->AddSocketDataProvider(&socket_data2);
SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
- ssl_socket_data.SetNextProto(GetParam());
+ ssl_socket_data.SetNextProto(kProtoHTTP2);
session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
std::unique_ptr<HttpNetworkSession> session(
« no previous file with comments | « net/http/http_stream_factory_impl_request_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698