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

Unified Diff: net/spdy/spdy_session_unittest.cc

Issue 2593063003: Add Socket::ReadIfReady() (Closed)
Patch Set: Fix tests for real Created 3 years, 11 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
« net/spdy/spdy_session.cc ('K') | « net/spdy/spdy_session.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_unittest.cc
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index da5e6389278416e58ec69c0460aac70a89cf13c2..034640dcd20562166474f607198281b8de95f81b 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -11,8 +11,10 @@
#include "base/base64.h"
#include "base/bind.h"
#include "base/callback.h"
+#include "base/metrics/field_trial.h"
#include "base/run_loop.h"
#include "base/test/histogram_tester.h"
+#include "base/test/mock_entropy_provider.h"
#include "net/base/host_port_pair.h"
#include "net/base/io_buffer.h"
#include "net/base/ip_endpoint.h"
@@ -5426,6 +5428,83 @@ TEST_F(SpdySessionTest, RejectInvalidUnknownFrames) {
EXPECT_FALSE(session_->OnUnknownFrame(8, 0));
}
+enum ReadIfReadySupport {
+ // ReadIfReady() field trial is enabled, but ReadyIfReady() is unimplemented.
+ READ_IF_READY_ENABLED_SUPPORTED,
+ // ReadIfReady() field trial is enabled, and ReadyIfReady() is implemented.
+ READ_IF_READY_ENABLED_NOT_SUPPORTED,
+ // ReadIfReady() field trial is disabled.
+ READ_IF_READY_DISABLED,
+};
+
+class SpdySessionReadyIfReadyTest
+ : public SpdySessionTest,
+ public testing::WithParamInterface<ReadIfReadySupport> {
+ public:
+ void SetUp() override {
+ if (GetParam() != READ_IF_READY_DISABLED) {
+ field_trial_list_.reset(new base::FieldTrialList(
+ base::MakeUnique<base::MockEntropyProvider>()));
+ base::FieldTrialList::CreateFieldTrial(Socket::kReadIfReadyTrialName,
+ "enable");
+ }
+ if (GetParam() == READ_IF_READY_ENABLED_SUPPORTED)
+ session_deps_.socket_factory->set_enable_read_if_ready(true);
+ SpdySessionTest::SetUp();
+ }
+
+ private:
+ std::unique_ptr<base::FieldTrialList> field_trial_list_;
+};
+
+INSTANTIATE_TEST_CASE_P(/* no prefix */,
+ SpdySessionReadyIfReadyTest,
+ testing::Values(READ_IF_READY_ENABLED_SUPPORTED,
+ READ_IF_READY_ENABLED_NOT_SUPPORTED,
+ READ_IF_READY_DISABLED));
+
+// Tests basic functionality of ReadIfReady() when it is enabled or disabled.
+TEST_P(SpdySessionReadyIfReadyTest, ReadIfReady) {
+ SpdySerializedFrame req(
+ spdy_util_.ConstructSpdyGet(nullptr, 0, 1, HIGHEST, true));
+ MockWrite writes[] = {
+ CreateMockWrite(req, 0),
+ };
+
+ SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
+ SpdySerializedFrame body(spdy_util_.ConstructSpdyDataFrame(1, true));
+ MockRead reads[] = {
+ CreateMockRead(resp, 1), CreateMockRead(body, 2),
+ MockRead(ASYNC, 0, 3) // EOF
+ };
+
+ session_deps_.host_resolver->set_synchronous_mode(true);
+
+ SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
+ session_deps_.socket_factory->AddSocketDataProvider(&data);
+
+ AddSSLSocketData();
+
+ CreateNetworkSession();
+ CreateSecureSpdySession();
+
+ base::WeakPtr<SpdyStream> spdy_stream =
+ CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, session_,
+ test_url_, HIGHEST, NetLogWithSource());
+ ASSERT_TRUE(spdy_stream);
+ EXPECT_EQ(0u, spdy_stream->stream_id());
+ test::StreamDelegateDoNothing delegate(spdy_stream);
+ spdy_stream->SetDelegate(&delegate);
+
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
+ spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
+
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_FALSE(spdy_stream);
+ EXPECT_EQ(1u, delegate.stream_id());
+}
+
class SendInitialSettingsOnNewSpdySessionTest : public SpdySessionTest {
protected:
void RunInitialSettingsTest(const SettingsMap expected_settings) {
« net/spdy/spdy_session.cc ('K') | « net/spdy/spdy_session.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698