Index: net/quic/quic_headers_stream_test.cc |
diff --git a/net/quic/quic_headers_stream_test.cc b/net/quic/quic_headers_stream_test.cc |
index 1c83b7748896562ab20fd076cc90231d663fc33b..cf00f7bff28f7a9b3874252822877e1b1b4f98f2 100644 |
--- a/net/quic/quic_headers_stream_test.cc |
+++ b/net/quic/quic_headers_stream_test.cc |
@@ -27,40 +27,42 @@ namespace { |
class MockVisitor : public SpdyFramerVisitorInterface { |
public: |
MOCK_METHOD1(OnError, void(SpdyFramer* framer)); |
- MOCK_METHOD3(OnDataFrameHeader, void(SpdyStreamId stream_id, |
- size_t length, |
- bool fin)); |
- MOCK_METHOD4(OnStreamFrameData, void(SpdyStreamId stream_id, |
- const char* data, |
- size_t len, |
- bool fin)); |
- MOCK_METHOD3(OnControlFrameHeaderData, bool(SpdyStreamId stream_id, |
- const char* header_data, |
- size_t len)); |
- MOCK_METHOD5(OnSynStream, void(SpdyStreamId stream_id, |
- SpdyStreamId associated_stream_id, |
- SpdyPriority priority, |
- bool fin, |
- bool unidirectional)); |
+ MOCK_METHOD3(OnDataFrameHeader, |
+ void(SpdyStreamId stream_id, size_t length, bool fin)); |
+ MOCK_METHOD4( |
+ OnStreamFrameData, |
+ void(SpdyStreamId stream_id, const char* data, size_t len, bool fin)); |
+ MOCK_METHOD3(OnControlFrameHeaderData, |
+ bool(SpdyStreamId stream_id, |
+ const char* header_data, |
+ size_t len)); |
+ MOCK_METHOD5(OnSynStream, |
+ void(SpdyStreamId stream_id, |
+ SpdyStreamId associated_stream_id, |
+ SpdyPriority priority, |
+ bool fin, |
+ bool unidirectional)); |
MOCK_METHOD2(OnSynReply, void(SpdyStreamId stream_id, bool fin)); |
- MOCK_METHOD2(OnRstStream, void(SpdyStreamId stream_id, |
- SpdyRstStreamStatus status)); |
+ MOCK_METHOD2(OnRstStream, |
+ void(SpdyStreamId stream_id, SpdyRstStreamStatus status)); |
MOCK_METHOD1(OnSettings, void(bool clear_persisted)); |
MOCK_METHOD3(OnSetting, void(SpdySettingsIds id, uint8 flags, uint32 value)); |
MOCK_METHOD0(OnSettingsAck, void()); |
MOCK_METHOD0(OnSettingsEnd, void()); |
MOCK_METHOD2(OnPing, void(SpdyPingId unique_id, bool is_ack)); |
- MOCK_METHOD2(OnGoAway, void(SpdyStreamId last_accepted_stream_id, |
- SpdyGoAwayStatus status)); |
+ MOCK_METHOD2(OnGoAway, |
+ void(SpdyStreamId last_accepted_stream_id, |
+ SpdyGoAwayStatus status)); |
MOCK_METHOD3(OnHeaders, void(SpdyStreamId stream_id, bool fin, bool end)); |
- MOCK_METHOD2(OnWindowUpdate, void(SpdyStreamId stream_id, |
- uint32 delta_window_size)); |
- MOCK_METHOD2(OnCredentialFrameData, bool(const char* credential_data, |
- size_t len)); |
+ MOCK_METHOD2(OnWindowUpdate, |
+ void(SpdyStreamId stream_id, uint32 delta_window_size)); |
+ MOCK_METHOD2(OnCredentialFrameData, |
+ bool(const char* credential_data, size_t len)); |
MOCK_METHOD1(OnBlocked, void(SpdyStreamId stream_id)); |
- MOCK_METHOD3(OnPushPromise, void(SpdyStreamId stream_id, |
- SpdyStreamId promised_stream_id, |
- bool end)); |
+ MOCK_METHOD3(OnPushPromise, |
+ void(SpdyStreamId stream_id, |
+ SpdyStreamId promised_stream_id, |
+ bool end)); |
MOCK_METHOD2(OnContinuation, void(SpdyStreamId stream_id, bool end)); |
}; |
@@ -78,7 +80,7 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> { |
headers_stream_(QuicSessionPeer::GetHeadersStream(&session_)), |
body_("hello world"), |
framer_(SPDY3) { |
- headers_[":version"] = "HTTP/1.1"; |
+ headers_[":version"] = "HTTP/1.1"; |
headers_[":status"] = "200 Ok"; |
headers_["content-length"] = "11"; |
framer_.set_visitor(&visitor_); |
@@ -89,7 +91,7 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> { |
QuicConsumedData SaveIov(const IOVector& data) { |
const iovec* iov = data.iovec(); |
int count = data.Capacity(); |
- for (int i = 0 ; i < count; ++i) { |
+ for (int i = 0; i < count; ++i) { |
saved_data_.append(static_cast<char*>(iov[i].iov_base), iov[i].iov_len); |
} |
return QuicConsumedData(saved_data_.length(), false); |
@@ -110,8 +112,7 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> { |
WriteHeadersAndCheckData(stream_id, fin, priority, SYN_STREAM); |
} |
- void WriteHeadersAndExpectSynReply(QuicStreamId stream_id, |
- bool fin) { |
+ void WriteHeadersAndExpectSynReply(QuicStreamId stream_id, bool fin) { |
WriteHeadersAndCheckData(stream_id, fin, 0, SYN_REPLY); |
} |
@@ -126,9 +127,13 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> { |
// Parse the outgoing data and check that it matches was was written. |
if (type == SYN_STREAM) { |
- EXPECT_CALL(visitor_, OnSynStream(stream_id, kNoAssociatedStream, 0, |
- // priority, |
- fin, kNotUnidirectional)); |
+ EXPECT_CALL(visitor_, |
+ OnSynStream(stream_id, |
+ kNoAssociatedStream, |
+ 0, |
+ // priority, |
+ fin, |
+ kNotUnidirectional)); |
} else { |
EXPECT_CALL(visitor_, OnSynReply(stream_id, fin)); |
} |
@@ -147,21 +152,17 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> { |
void CheckHeaders() { |
SpdyHeaderBlock headers; |
- EXPECT_EQ(saved_header_data_.length(), |
- framer_.ParseHeaderBlockInBuffer(saved_header_data_.data(), |
- saved_header_data_.length(), |
- &headers)); |
+ EXPECT_EQ( |
+ saved_header_data_.length(), |
+ framer_.ParseHeaderBlockInBuffer( |
+ saved_header_data_.data(), saved_header_data_.length(), &headers)); |
EXPECT_EQ(headers_, headers); |
saved_header_data_.clear(); |
} |
- bool is_server() { |
- return GetParam(); |
- } |
+ bool is_server() { return GetParam(); } |
- void CloseConnection() { |
- QuicConnectionPeer::CloseConnection(connection_); |
- } |
+ void CloseConnection() { QuicConnectionPeer::CloseConnection(connection_); } |
static const bool kNotUnidirectional = false; |
static const bool kNoAssociatedStream = false; |
@@ -188,7 +189,7 @@ TEST_P(QuicHeadersStreamTest, EffectivePriority) { |
} |
TEST_P(QuicHeadersStreamTest, WriteHeaders) { |
- for (QuicStreamId stream_id = 5; stream_id < 9; stream_id +=2) { |
+ for (QuicStreamId stream_id = 5; stream_id < 9; stream_id += 2) { |
for (int count = 0; count < 2; ++count) { |
bool fin = (count == 0); |
if (is_server()) { |
@@ -203,7 +204,7 @@ TEST_P(QuicHeadersStreamTest, WriteHeaders) { |
} |
TEST_P(QuicHeadersStreamTest, ProcessRawData) { |
- for (QuicStreamId stream_id = 5; stream_id < 9; stream_id +=2) { |
+ for (QuicStreamId stream_id = 5; stream_id < 9; stream_id += 2) { |
for (int count = 0; count < 2; ++count) { |
bool fin = (count == 0); |
for (QuicPriority priority = 0; priority < 7; ++priority) { |
@@ -222,9 +223,8 @@ TEST_P(QuicHeadersStreamTest, ProcessRawData) { |
frame.reset(framer_.SerializeSynReply(syn_reply)); |
} |
EXPECT_CALL(session_, OnStreamHeaders(stream_id, _)) |
- .WillRepeatedly(WithArgs<1>( |
- Invoke(this, |
- &QuicHeadersStreamTest::SaveHeaderDataStringPiece))); |
+ .WillRepeatedly(WithArgs<1>(Invoke( |
+ this, &QuicHeadersStreamTest::SaveHeaderDataStringPiece))); |
EXPECT_CALL(session_, |
OnStreamHeadersComplete(stream_id, fin, frame->size())); |
headers_stream_->ProcessRawData(frame->data(), frame->size()); |
@@ -241,8 +241,8 @@ TEST_P(QuicHeadersStreamTest, ProcessSpdyDataFrame) { |
EXPECT_CALL(*connection_, |
SendConnectionCloseWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA, |
"SPDY DATA frame received.")) |
- .WillOnce(InvokeWithoutArgs(this, |
- &QuicHeadersStreamTest::CloseConnection)); |
+ .WillOnce( |
+ InvokeWithoutArgs(this, &QuicHeadersStreamTest::CloseConnection)); |
headers_stream_->ProcessRawData(frame->data(), frame->size()); |
} |
@@ -250,11 +250,10 @@ TEST_P(QuicHeadersStreamTest, ProcessSpdyRstStreamFrame) { |
SpdyRstStreamIR data(2, RST_STREAM_PROTOCOL_ERROR, ""); |
scoped_ptr<SpdySerializedFrame> frame(framer_.SerializeFrame(data)); |
EXPECT_CALL(*connection_, |
- SendConnectionCloseWithDetails( |
- QUIC_INVALID_HEADERS_STREAM_DATA, |
- "SPDY RST_STREAM frame received.")) |
- .WillOnce(InvokeWithoutArgs(this, |
- &QuicHeadersStreamTest::CloseConnection)); |
+ SendConnectionCloseWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA, |
+ "SPDY RST_STREAM frame received.")) |
+ .WillOnce( |
+ InvokeWithoutArgs(this, &QuicHeadersStreamTest::CloseConnection)); |
headers_stream_->ProcessRawData(frame->data(), frame->size()); |
} |
@@ -263,11 +262,10 @@ TEST_P(QuicHeadersStreamTest, ProcessSpdySettingsFrame) { |
data.AddSetting(SETTINGS_UPLOAD_BANDWIDTH, true, true, 0); |
scoped_ptr<SpdySerializedFrame> frame(framer_.SerializeFrame(data)); |
EXPECT_CALL(*connection_, |
- SendConnectionCloseWithDetails( |
- QUIC_INVALID_HEADERS_STREAM_DATA, |
- "SPDY SETTINGS frame received.")) |
- .WillOnce(InvokeWithoutArgs(this, |
- &QuicHeadersStreamTest::CloseConnection)); |
+ SendConnectionCloseWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA, |
+ "SPDY SETTINGS frame received.")) |
+ .WillOnce( |
+ InvokeWithoutArgs(this, &QuicHeadersStreamTest::CloseConnection)); |
headers_stream_->ProcessRawData(frame->data(), frame->size()); |
} |
@@ -277,8 +275,8 @@ TEST_P(QuicHeadersStreamTest, ProcessSpdyPingFrame) { |
EXPECT_CALL(*connection_, |
SendConnectionCloseWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA, |
"SPDY PING frame received.")) |
- .WillOnce(InvokeWithoutArgs(this, |
- &QuicHeadersStreamTest::CloseConnection)); |
+ .WillOnce( |
+ InvokeWithoutArgs(this, &QuicHeadersStreamTest::CloseConnection)); |
headers_stream_->ProcessRawData(frame->data(), frame->size()); |
} |
@@ -288,8 +286,8 @@ TEST_P(QuicHeadersStreamTest, ProcessSpdyGoAwayFrame) { |
EXPECT_CALL(*connection_, |
SendConnectionCloseWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA, |
"SPDY GOAWAY frame received.")) |
- .WillOnce(InvokeWithoutArgs(this, |
- &QuicHeadersStreamTest::CloseConnection)); |
+ .WillOnce( |
+ InvokeWithoutArgs(this, &QuicHeadersStreamTest::CloseConnection)); |
headers_stream_->ProcessRawData(frame->data(), frame->size()); |
} |
@@ -299,20 +297,20 @@ TEST_P(QuicHeadersStreamTest, ProcessSpdyHeadersFrame) { |
EXPECT_CALL(*connection_, |
SendConnectionCloseWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA, |
"SPDY HEADERS frame received.")) |
- .WillOnce(InvokeWithoutArgs(this, |
- &QuicHeadersStreamTest::CloseConnection)); |
+ .WillOnce( |
+ InvokeWithoutArgs(this, &QuicHeadersStreamTest::CloseConnection)); |
headers_stream_->ProcessRawData(frame->data(), frame->size()); |
} |
TEST_P(QuicHeadersStreamTest, ProcessSpdyWindowUpdateFrame) { |
SpdyWindowUpdateIR data(1, 1); |
scoped_ptr<SpdySerializedFrame> frame(framer_.SerializeFrame(data)); |
- EXPECT_CALL(*connection_, |
- SendConnectionCloseWithDetails( |
- QUIC_INVALID_HEADERS_STREAM_DATA, |
- "SPDY WINDOW_UPDATE frame received.")) |
- .WillOnce(InvokeWithoutArgs(this, |
- &QuicHeadersStreamTest::CloseConnection)); |
+ EXPECT_CALL( |
+ *connection_, |
+ SendConnectionCloseWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA, |
+ "SPDY WINDOW_UPDATE frame received.")) |
+ .WillOnce( |
+ InvokeWithoutArgs(this, &QuicHeadersStreamTest::CloseConnection)); |
headers_stream_->ProcessRawData(frame->data(), frame->size()); |
} |