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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_stream_unittest.cc

Issue 2365263004: Make (almost) all SpdySessions secure in unittests. (Closed)
Patch Set: Created 4 years, 3 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/spdy/spdy_session_unittest.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_stream_unittest.cc
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index 2c4f272128eed343e63e9f113f22e1f7d456635c..298b6a20c605765875374945cb64f2db1352eaa4 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -29,7 +29,9 @@
#include "net/spdy/spdy_session.h"
#include "net/spdy/spdy_stream_test_util.h"
#include "net/spdy/spdy_test_util_common.h"
+#include "net/test/cert_test_util.h"
#include "net/test/gtest_util.h"
+#include "net/test/test_data_directory.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -58,7 +60,7 @@ class SpdyStreamTest : public ::testing::Test {
typedef base::Callback<void(const base::WeakPtr<SpdyStream>&, int32_t)>
UnstallFunction;
- SpdyStreamTest() : offset_(0) {
+ SpdyStreamTest() : offset_(0), ssl_(SYNCHRONOUS, OK) {
spdy_util_.set_default_url(GURL(kStreamUrl));
session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);
}
@@ -68,7 +70,7 @@ class SpdyStreamTest : public ::testing::Test {
base::WeakPtr<SpdySession> CreateDefaultSpdySession() {
SpdySessionKey key(HostPortPair("www.example.org", 80),
ProxyServer::Direct(), PRIVACY_MODE_DISABLED);
- return CreateInsecureSpdySession(session_.get(), key, NetLogWithSource());
+ return CreateSecureSpdySession(session_.get(), key, NetLogWithSource());
}
void TearDown() override { base::RunLoop().RunUntilIdle(); }
@@ -121,6 +123,14 @@ class SpdyStreamTest : public ::testing::Test {
session->InsertActivatedStream(std::move(activated));
}
+ void AddSSLSocketData() {
+ // Load a cert that is valid for
+ // www.example.org, mail.example.org, and mail.example.com.
+ ssl_.cert = ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem");
+ ASSERT_TRUE(ssl_.cert);
+ session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl_);
+ }
+
SpdyTestUtil spdy_util_;
SpdySessionDependencies session_deps_;
std::unique_ptr<HttpNetworkSession> session_;
@@ -130,6 +140,7 @@ class SpdyStreamTest : public ::testing::Test {
std::vector<MockWrite> writes_;
std::vector<MockRead> reads_;
int offset_;
+ SSLSocketDataProvider ssl_;
};
TEST_F(SpdyStreamTest, SendDataAfterOpen) {
@@ -156,9 +167,10 @@ TEST_F(SpdyStreamTest, SendDataAfterOpen) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -235,9 +247,10 @@ TEST_F(SpdyStreamTest, Trailers) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -274,9 +287,10 @@ TEST_F(SpdyStreamTest, PushedStream) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> spdy_session(CreateDefaultSpdySession());
// Conjure up a stream.
@@ -358,9 +372,10 @@ TEST_F(SpdyStreamTest, StreamError) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream =
@@ -432,9 +447,10 @@ TEST_F(SpdyStreamTest, SendLargeDataAfterOpenRequestResponse) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -487,9 +503,10 @@ TEST_F(SpdyStreamTest, SendLargeDataAfterOpenBidirectional) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -540,9 +557,10 @@ TEST_F(SpdyStreamTest, UpperCaseHeaders) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -591,9 +609,10 @@ TEST_F(SpdyStreamTest, UpperCaseHeadersOnPush) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -658,9 +677,10 @@ TEST_F(SpdyStreamTest, UpperCaseHeadersInHeadersFrame) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -732,9 +752,10 @@ TEST_F(SpdyStreamTest, DuplicateHeaders) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -794,9 +815,10 @@ TEST_F(SpdyStreamTest, IncreaseSendWindowSizeOverflow) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
GURL url(kStreamUrl);
@@ -882,9 +904,10 @@ void SpdyStreamTest::RunResumeAfterUnstallRequestResponseTest(
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -961,9 +984,10 @@ void SpdyStreamTest::RunResumeAfterUnstallBidirectionalTest(
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
@@ -1042,9 +1066,10 @@ TEST_F(SpdyStreamTest, ReceivedBytes) {
GetNumWrites());
MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
-
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ AddSSLSocketData();
+
base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
« no previous file with comments | « net/spdy/spdy_session_unittest.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698