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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/core/quic_spdy_stream_test.cc

Issue 2740453006: Add QuicStringPiece which is actually StringPiece. (Closed)
Patch Set: fix compile error and rebase Created 3 years, 9 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/quic/core/quic_spdy_stream.cc ('k') | net/quic/core/quic_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_spdy_stream_test.cc
diff --git a/net/quic/core/quic_spdy_stream_test.cc b/net/quic/core/quic_spdy_stream_test.cc
index 54011aa91c972dfbf19f9e8883875087d9a3d382..a34b0c782442f2e03fad954bf55961c71469b8a6 100644
--- a/net/quic/core/quic_spdy_stream_test.cc
+++ b/net/quic/core/quic_spdy_stream_test.cc
@@ -12,6 +12,7 @@
#include "net/quic/core/quic_write_blocked_list.h"
#include "net/quic/core/spdy_utils.h"
#include "net/quic/platform/api/quic_ptr_util.h"
+#include "net/quic/platform/api/quic_string_piece.h"
#include "net/quic/platform/api/quic_text_utils.h"
#include "net/quic/test_tools/quic_flow_controller_peer.h"
#include "net/quic/test_tools/quic_session_peer.h"
@@ -20,7 +21,6 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-using base::StringPiece;
using std::string;
using testing::AnyNumber;
using testing::Invoke;
@@ -250,7 +250,7 @@ TEST_P(QuicSpdyStreamTest, ProcessHeadersAndBody) {
QuicHeaderList headers = ProcessHeaders(false, headers_);
EXPECT_EQ(headers, stream_->header_list());
stream_->ConsumeHeaderList();
- QuicStreamFrame frame(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, QuicStringPiece(body));
stream_->OnStreamFrame(frame);
EXPECT_EQ(QuicHeaderList(), stream_->header_list());
EXPECT_EQ(body, stream_->data());
@@ -266,10 +266,10 @@ TEST_P(QuicSpdyStreamTest, ProcessHeadersAndBodyFragments) {
stream_->ConsumeHeaderList();
for (size_t offset = 0; offset < body.size(); offset += fragment_size) {
size_t remaining_data = body.size() - offset;
- StringPiece fragment(body.data() + offset,
- std::min(fragment_size, remaining_data));
+ QuicStringPiece fragment(body.data() + offset,
+ std::min(fragment_size, remaining_data));
QuicStreamFrame frame(kClientDataStreamId1, false, offset,
- StringPiece(fragment));
+ QuicStringPiece(fragment));
stream_->OnStreamFrame(frame);
}
ASSERT_EQ(body, stream_->data()) << "fragment_size: " << fragment_size;
@@ -285,14 +285,15 @@ TEST_P(QuicSpdyStreamTest, ProcessHeadersAndBodyFragmentsSplit) {
ASSERT_EQ(headers, stream_->header_list());
stream_->ConsumeHeaderList();
- StringPiece fragment1(body.data(), split_point);
+ QuicStringPiece fragment1(body.data(), split_point);
QuicStreamFrame frame1(kClientDataStreamId1, false, 0,
- StringPiece(fragment1));
+ QuicStringPiece(fragment1));
stream_->OnStreamFrame(frame1);
- StringPiece fragment2(body.data() + split_point, body.size() - split_point);
+ QuicStringPiece fragment2(body.data() + split_point,
+ body.size() - split_point);
QuicStreamFrame frame2(kClientDataStreamId1, false, split_point,
- StringPiece(fragment2));
+ QuicStringPiece(fragment2));
stream_->OnStreamFrame(frame2);
ASSERT_EQ(body, stream_->data()) << "split_point: " << split_point;
@@ -305,7 +306,7 @@ TEST_P(QuicSpdyStreamTest, ProcessHeadersAndBodyReadv) {
string body = "this is the body";
ProcessHeaders(false, headers_);
- QuicStreamFrame frame(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, QuicStringPiece(body));
stream_->OnStreamFrame(frame);
stream_->ConsumeHeaderList();
@@ -326,7 +327,7 @@ TEST_P(QuicSpdyStreamTest, ProcessHeadersAndBodyMarkConsumed) {
string body = "this is the body";
ProcessHeaders(false, headers_);
- QuicStreamFrame frame(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, QuicStringPiece(body));
stream_->OnStreamFrame(frame);
stream_->ConsumeHeaderList();
@@ -345,7 +346,7 @@ TEST_P(QuicSpdyStreamTest, ProcessHeadersAndBodyIncrementalReadv) {
string body = "this is the body";
ProcessHeaders(false, headers_);
- QuicStreamFrame frame(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, QuicStringPiece(body));
stream_->OnStreamFrame(frame);
stream_->ConsumeHeaderList();
@@ -366,7 +367,7 @@ TEST_P(QuicSpdyStreamTest, ProcessHeadersUsingReadvWithMultipleIovecs) {
string body = "this is the body";
ProcessHeaders(false, headers_);
- QuicStreamFrame frame(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, QuicStringPiece(body));
stream_->OnStreamFrame(frame);
stream_->ConsumeHeaderList();
@@ -441,7 +442,7 @@ TEST_P(QuicSpdyStreamTest, StreamFlowControlNoWindowUpdateIfNotConsumed) {
string body(kWindow / 3, 'a');
ProcessHeaders(false, headers_);
- QuicStreamFrame frame1(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame1(kClientDataStreamId1, false, 0, QuicStringPiece(body));
stream_->OnStreamFrame(frame1);
EXPECT_EQ(kWindow - (kWindow / 3), QuicFlowControllerPeer::ReceiveWindowSize(
stream_->flow_controller()));
@@ -450,7 +451,7 @@ TEST_P(QuicSpdyStreamTest, StreamFlowControlNoWindowUpdateIfNotConsumed) {
// half full. This should all be buffered, decreasing the receive window but
// not sending WINDOW_UPDATE.
QuicStreamFrame frame2(kClientDataStreamId1, false, kWindow / 3,
- StringPiece(body));
+ QuicStringPiece(body));
stream_->OnStreamFrame(frame2);
EXPECT_EQ(
kWindow - (2 * kWindow / 3),
@@ -477,7 +478,7 @@ TEST_P(QuicSpdyStreamTest, StreamFlowControlWindowUpdate) {
ProcessHeaders(false, headers_);
stream_->ConsumeHeaderList();
- QuicStreamFrame frame1(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame1(kClientDataStreamId1, false, 0, QuicStringPiece(body));
stream_->OnStreamFrame(frame1);
EXPECT_EQ(kWindow - (kWindow / 3), QuicFlowControllerPeer::ReceiveWindowSize(
stream_->flow_controller()));
@@ -487,7 +488,7 @@ TEST_P(QuicSpdyStreamTest, StreamFlowControlWindowUpdate) {
// offset and send a WINDOW_UPDATE. The result will be again an available
// window of kWindow bytes.
QuicStreamFrame frame2(kClientDataStreamId1, false, kWindow / 3,
- StringPiece(body));
+ QuicStringPiece(body));
EXPECT_CALL(*connection_,
SendWindowUpdate(kClientDataStreamId1,
QuicFlowControllerPeer::ReceiveWindowOffset(
@@ -531,9 +532,9 @@ TEST_P(QuicSpdyStreamTest, ConnectionFlowControlWindowUpdate) {
// Each stream gets a quarter window of data. This should not trigger a
// WINDOW_UPDATE for either stream, nor for the connection.
string body(kWindow / 4, 'a');
- QuicStreamFrame frame1(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame1(kClientDataStreamId1, false, 0, QuicStringPiece(body));
stream_->OnStreamFrame(frame1);
- QuicStreamFrame frame2(kClientDataStreamId2, false, 0, StringPiece(body));
+ QuicStreamFrame frame2(kClientDataStreamId2, false, 0, QuicStringPiece(body));
stream2_->OnStreamFrame(frame2);
// Now receive a further single byte on one stream - again this does not
@@ -547,7 +548,7 @@ TEST_P(QuicSpdyStreamTest, ConnectionFlowControlWindowUpdate) {
session_->flow_controller()) +
1 + kWindow / 2));
QuicStreamFrame frame3(kClientDataStreamId1, false, (kWindow / 4),
- StringPiece("a"));
+ QuicStringPiece("a"));
stream_->OnStreamFrame(frame3);
}
@@ -568,7 +569,7 @@ TEST_P(QuicSpdyStreamTest, StreamFlowControlViolation) {
// Receive data to overflow the window, violating flow control.
string body(kWindow + 1, 'a');
- QuicStreamFrame frame(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, QuicStringPiece(body));
EXPECT_CALL(*connection_,
CloseConnection(QUIC_FLOW_CONTROL_RECEIVED_TOO_MUCH_DATA, _, _));
stream_->OnStreamFrame(frame);
@@ -606,7 +607,7 @@ TEST_P(QuicSpdyStreamTest, ConnectionFlowControlViolation) {
// Send enough data to overflow the connection level flow control window.
string body(kConnectionWindow + 1, 'a');
EXPECT_LT(body.size(), kStreamWindow);
- QuicStreamFrame frame(kClientDataStreamId1, false, 0, StringPiece(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, QuicStringPiece(body));
EXPECT_CALL(*connection_,
CloseConnection(QUIC_FLOW_CONTROL_RECEIVED_TOO_MUCH_DATA, _, _));
« no previous file with comments | « net/quic/core/quic_spdy_stream.cc ('k') | net/quic/core/quic_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698