OLD | NEW |
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/http/http_stream_factory_impl.h" | 5 #include "net/http/http_stream_factory_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 waiter.WaitForStream(); | 938 waiter.WaitForStream(); |
939 EXPECT_TRUE(waiter.stream_done()); | 939 EXPECT_TRUE(waiter.stream_done()); |
940 EXPECT_TRUE(NULL == waiter.stream()); | 940 EXPECT_TRUE(NULL == waiter.stream()); |
941 ASSERT_TRUE(NULL != waiter.websocket_stream()); | 941 ASSERT_TRUE(NULL != waiter.websocket_stream()); |
942 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, | 942 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, |
943 waiter.websocket_stream()->type()); | 943 waiter.websocket_stream()->type()); |
944 EXPECT_EQ(0, GetSocketPoolGroupCount( | 944 EXPECT_EQ(0, GetSocketPoolGroupCount( |
945 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 945 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
946 EXPECT_EQ(0, GetSocketPoolGroupCount( | 946 EXPECT_EQ(0, GetSocketPoolGroupCount( |
947 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 947 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
948 EXPECT_EQ(1, GetSocketPoolGroupCount( | |
949 session->GetTransportSocketPool( | |
950 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | |
951 EXPECT_EQ(0, GetSocketPoolGroupCount( | 948 EXPECT_EQ(0, GetSocketPoolGroupCount( |
952 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | 949 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); |
953 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 950 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
954 } | 951 } |
955 | 952 |
956 TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) { | 953 TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) { |
957 SpdySessionDependencies session_deps( | 954 SpdySessionDependencies session_deps( |
958 GetParam(), ProxyService::CreateDirect()); | 955 GetParam(), ProxyService::CreateDirect()); |
959 | 956 |
960 MockRead mock_read(ASYNC, OK); | 957 MockRead mock_read(ASYNC, OK); |
(...skipping 29 matching lines...) Expand all Loading... |
990 EXPECT_TRUE(waiter.stream_done()); | 987 EXPECT_TRUE(waiter.stream_done()); |
991 EXPECT_TRUE(NULL == waiter.stream()); | 988 EXPECT_TRUE(NULL == waiter.stream()); |
992 ASSERT_TRUE(NULL != waiter.websocket_stream()); | 989 ASSERT_TRUE(NULL != waiter.websocket_stream()); |
993 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, | 990 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, |
994 waiter.websocket_stream()->type()); | 991 waiter.websocket_stream()->type()); |
995 EXPECT_EQ(0, GetSocketPoolGroupCount( | 992 EXPECT_EQ(0, GetSocketPoolGroupCount( |
996 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 993 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
997 EXPECT_EQ(0, GetSocketPoolGroupCount( | 994 EXPECT_EQ(0, GetSocketPoolGroupCount( |
998 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 995 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
999 EXPECT_EQ(1, GetSocketPoolGroupCount( | 996 EXPECT_EQ(1, GetSocketPoolGroupCount( |
1000 session->GetTransportSocketPool( | |
1001 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | |
1002 EXPECT_EQ(1, GetSocketPoolGroupCount( | |
1003 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | 997 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); |
1004 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 998 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
1005 } | 999 } |
1006 | 1000 |
1007 TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) { | 1001 TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) { |
1008 SpdySessionDependencies session_deps( | 1002 SpdySessionDependencies session_deps( |
1009 GetParam(), ProxyService::CreateFixed("myproxy:8888")); | 1003 GetParam(), ProxyService::CreateFixed("myproxy:8888")); |
1010 | 1004 |
1011 MockRead read(SYNCHRONOUS, "HTTP/1.0 200 Connection established\r\n\r\n"); | 1005 MockRead read(SYNCHRONOUS, "HTTP/1.0 200 Connection established\r\n\r\n"); |
1012 StaticSocketDataProvider socket_data(&read, 1, 0, 0); | 1006 StaticSocketDataProvider socket_data(&read, 1, 0, 0); |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1155 ASSERT_TRUE(NULL != waiter1.websocket_stream()); | 1149 ASSERT_TRUE(NULL != waiter1.websocket_stream()); |
1156 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, | 1150 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, |
1157 waiter1.websocket_stream()->type()); | 1151 waiter1.websocket_stream()->type()); |
1158 EXPECT_TRUE(NULL == waiter1.stream()); | 1152 EXPECT_TRUE(NULL == waiter1.stream()); |
1159 | 1153 |
1160 EXPECT_EQ(0, GetSocketPoolGroupCount( | 1154 EXPECT_EQ(0, GetSocketPoolGroupCount( |
1161 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 1155 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
1162 EXPECT_EQ(0, GetSocketPoolGroupCount( | 1156 EXPECT_EQ(0, GetSocketPoolGroupCount( |
1163 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 1157 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
1164 EXPECT_EQ(1, GetSocketPoolGroupCount( | 1158 EXPECT_EQ(1, GetSocketPoolGroupCount( |
1165 session->GetTransportSocketPool( | |
1166 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | |
1167 EXPECT_EQ(1, GetSocketPoolGroupCount( | |
1168 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | 1159 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); |
1169 EXPECT_TRUE(waiter1.used_proxy_info().is_direct()); | 1160 EXPECT_TRUE(waiter1.used_proxy_info().is_direct()); |
1170 } | 1161 } |
1171 | 1162 |
1172 // TODO(ricea): Re-enable once WebSocket-over-SPDY is implemented. | 1163 // TODO(ricea): Re-enable once WebSocket-over-SPDY is implemented. |
1173 TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) { | 1164 TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) { |
1174 SpdySessionDependencies session_deps(GetParam(), | 1165 SpdySessionDependencies session_deps(GetParam(), |
1175 ProxyService::CreateDirect()); | 1166 ProxyService::CreateDirect()); |
1176 | 1167 |
1177 MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING); | 1168 MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING); |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1317 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1308 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
1318 | 1309 |
1319 // Make sure there is no orphaned job. it is already canceled. | 1310 // Make sure there is no orphaned job. it is already canceled. |
1320 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( | 1311 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( |
1321 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); | 1312 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); |
1322 } | 1313 } |
1323 | 1314 |
1324 } // namespace | 1315 } // namespace |
1325 | 1316 |
1326 } // namespace net | 1317 } // namespace net |
OLD | NEW |