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

Unified Diff: net/quic/quic_chromium_client_session_test.cc

Issue 1415933006: QUIC - delete #ifdef USE_OPENSSL in unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comments Created 5 years, 1 month 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/crypto/quic_crypto_server_config_test.cc ('k') | net/quic/quic_crypto_client_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_chromium_client_session_test.cc
diff --git a/net/quic/quic_chromium_client_session_test.cc b/net/quic/quic_chromium_client_session_test.cc
index e21d2652d88234e14944118c23e17a79ba778b7d..a2f0eaf572040f8b82c0a01cd3915504de958e28 100644
--- a/net/quic/quic_chromium_client_session_test.cc
+++ b/net/quic/quic_chromium_client_session_test.cc
@@ -22,7 +22,9 @@
#include "net/quic/crypto/quic_decrypter.h"
#include "net/quic/crypto/quic_encrypter.h"
#include "net/quic/crypto/quic_server_info.h"
+#include "net/quic/quic_flags.h"
#include "net/quic/quic_packet_reader.h"
+#include "net/quic/quic_protocol.h"
#include "net/quic/test_tools/crypto_test_utils.h"
#include "net/quic/test_tools/quic_chromium_client_session_peer.h"
#include "net/quic/test_tools/quic_spdy_session_peer.h"
@@ -112,8 +114,6 @@ INSTANTIATE_TEST_CASE_P(Tests,
QuicChromiumClientSessionTest,
::testing::ValuesIn(QuicSupportedVersions()));
-#if defined(OPENSSL)
-
TEST_P(QuicChromiumClientSessionTest, CryptoConnect) {
CompleteCryptoHandshake();
}
@@ -129,8 +129,16 @@ TEST_P(QuicChromiumClientSessionTest, MaxNumStreams) {
}
EXPECT_FALSE(session_.CreateOutgoingDynamicStream());
+ EXPECT_EQ(kDefaultMaxStreamsPerConnection, session_.GetNumOpenStreams());
+
// Close a stream and ensure I can now open a new one.
- session_.CloseStream(streams[0]->id());
+ QuicStreamId stream_id = streams[0]->id();
+ session_.CloseStream(stream_id);
+
+ EXPECT_FALSE(session_.CreateOutgoingDynamicStream());
+ QuicRstStreamFrame rst1(stream_id, QUIC_STREAM_NO_ERROR, 0);
+ session_.OnRstStream(rst1);
+ EXPECT_EQ(kDefaultMaxStreamsPerConnection - 1, session_.GetNumOpenStreams());
EXPECT_TRUE(session_.CreateOutgoingDynamicStream());
}
@@ -152,7 +160,10 @@ TEST_P(QuicChromiumClientSessionTest, MaxNumStreamsViaRequest) {
callback.callback()));
// Close a stream and ensure I can now open a new one.
- session_.CloseStream(streams[0]->id());
+ QuicStreamId stream_id = streams[0]->id();
+ session_.CloseStream(stream_id);
+ QuicRstStreamFrame rst1(stream_id, QUIC_STREAM_NO_ERROR, 0);
+ session_.OnRstStream(rst1);
ASSERT_TRUE(callback.have_result());
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_TRUE(stream != nullptr);
@@ -258,8 +269,6 @@ TEST_P(QuicChromiumClientSessionTest, ConnectionPooledWithMatchingPin) {
EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
}
-#endif
-
} // namespace
} // namespace test
} // namespace net
« no previous file with comments | « net/quic/crypto/quic_crypto_server_config_test.cc ('k') | net/quic/quic_crypto_client_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698