Use valid stream data in in QuicSimpleServerSessionTest() and QuicServerSessionBaseTest().
PiperOrigin-RevId: 370486764
Change-Id: I9e1e15348ed54c0e8b55198bf241a12b1a88665e
diff --git a/quic/core/http/quic_server_session_base_test.cc b/quic/core/http/quic_server_session_base_test.cc
index c8f12e9..52ddc91 100644
--- a/quic/core/http/quic_server_session_base_test.cc
+++ b/quic/core/http/quic_server_session_base_test.cc
@@ -10,7 +10,6 @@
#include <utility>
#include "absl/memory/memory.h"
-#include "absl/strings/string_view.h"
#include "quic/core/crypto/null_encrypter.h"
#include "quic/core/crypto/quic_crypto_server_config.h"
#include "quic/core/crypto/quic_random.h"
@@ -51,6 +50,12 @@
namespace test {
namespace {
+// Data to be sent on a request stream. In Google QUIC, this is interpreted as
+// DATA payload (there is no framing on request streams). In IETF QUIC, this is
+// interpreted as HEADERS frame (type 0x1) with payload length 122 ('z'). Since
+// no payload is included, QPACK decoder will not be invoked.
+const char* const kStreamData = "\1z";
+
class TestServerSession : public QuicServerSessionBase {
public:
TestServerSession(const QuicConfig& config,
@@ -243,10 +248,9 @@
::testing::PrintToStringParamName());
TEST_P(QuicServerSessionBaseTest, CloseStreamDueToReset) {
- // Open a stream, then reset it.
- // Send two bytes of payload to open it.
+ // Send some data open a stream, then reset it.
QuicStreamFrame data1(GetNthClientInitiatedBidirectionalId(0), false, 0,
- absl::string_view("HT"));
+ kStreamData);
session_->OnStreamFrame(data1);
EXPECT_EQ(1u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()));
@@ -299,9 +303,9 @@
InjectStopSendingFrame(GetNthClientInitiatedBidirectionalId(0));
EXPECT_EQ(0u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()));
- // Send two bytes of payload.
+
QuicStreamFrame data1(GetNthClientInitiatedBidirectionalId(0), false, 0,
- absl::string_view("HT"));
+ kStreamData);
session_->OnStreamFrame(data1);
// The stream should never be opened, now that the reset is received.
@@ -310,11 +314,11 @@
}
TEST_P(QuicServerSessionBaseTest, AcceptClosedStream) {
- // Send (empty) compressed headers followed by two bytes of data.
+ // Send some data to open two streams.
QuicStreamFrame frame1(GetNthClientInitiatedBidirectionalId(0), false, 0,
- absl::string_view("\1\0\0\0\0\0\0\0HT"));
+ kStreamData);
QuicStreamFrame frame2(GetNthClientInitiatedBidirectionalId(1), false, 0,
- absl::string_view("\3\0\0\0\0\0\0\0HT"));
+ kStreamData);
session_->OnStreamFrame(frame1);
session_->OnStreamFrame(frame2);
EXPECT_EQ(2u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()));
@@ -342,9 +346,9 @@
// past the reset point of stream 3. As it's a closed stream we just drop the
// data on the floor, but accept the packet because it has data for stream 5.
QuicStreamFrame frame3(GetNthClientInitiatedBidirectionalId(0), false, 2,
- absl::string_view("TP"));
+ kStreamData);
QuicStreamFrame frame4(GetNthClientInitiatedBidirectionalId(1), false, 2,
- absl::string_view("TP"));
+ kStreamData);
session_->OnStreamFrame(frame3);
session_->OnStreamFrame(frame4);
// The stream should never be opened, now that the reset is received.
diff --git a/quic/tools/quic_simple_server_session_test.cc b/quic/tools/quic_simple_server_session_test.cc
index 806cfd4..64c486f 100644
--- a/quic/tools/quic_simple_server_session_test.cc
+++ b/quic/tools/quic_simple_server_session_test.cc
@@ -9,7 +9,6 @@
#include <utility>
#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
#include "quic/core/crypto/null_encrypter.h"
#include "quic/core/crypto/quic_crypto_server_config.h"
#include "quic/core/crypto/quic_random.h"
@@ -56,6 +55,12 @@
const QuicByteCount kHeadersFrameHeaderLength = 2;
const QuicByteCount kHeadersFramePayloadLength = 9;
+// Data to be sent on a request stream. In Google QUIC, this is interpreted as
+// DATA payload (there is no framing on request streams). In IETF QUIC, this is
+// interpreted as HEADERS frame (type 0x1) with payload length 122 ('z'). Since
+// no payload is included, QPACK decoder will not be invoked.
+const char* const kStreamData = "\1z";
+
} // namespace
class QuicSimpleServerSessionPeer {
@@ -332,10 +337,9 @@
::testing::PrintToStringParamName());
TEST_P(QuicSimpleServerSessionTest, CloseStreamDueToReset) {
- // Open a stream, then reset it.
- // Send two bytes of payload to open it.
+ // Send some data open a stream, then reset it.
QuicStreamFrame data1(GetNthClientInitiatedBidirectionalId(0), false, 0,
- absl::string_view("HT"));
+ kStreamData);
session_->OnStreamFrame(data1);
EXPECT_EQ(1u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()));
@@ -390,9 +394,8 @@
EXPECT_EQ(0u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()));
- // Send two bytes of payload.
QuicStreamFrame data1(GetNthClientInitiatedBidirectionalId(0), false, 0,
- absl::string_view("HT"));
+ kStreamData);
session_->OnStreamFrame(data1);
// The stream should never be opened, now that the reset is received.
@@ -401,11 +404,11 @@
}
TEST_P(QuicSimpleServerSessionTest, AcceptClosedStream) {
- // Send (empty) compressed headers followed by two bytes of data.
+ // Send some data to open two streams.
QuicStreamFrame frame1(GetNthClientInitiatedBidirectionalId(0), false, 0,
- absl::string_view("\1\0\0\0\0\0\0\0HT"));
+ kStreamData);
QuicStreamFrame frame2(GetNthClientInitiatedBidirectionalId(1), false, 0,
- absl::string_view("\3\0\0\0\0\0\0\0HT"));
+ kStreamData);
session_->OnStreamFrame(frame1);
session_->OnStreamFrame(frame2);
EXPECT_EQ(2u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()));
@@ -433,9 +436,9 @@
// past the reset point of stream 3. As it's a closed stream we just drop the
// data on the floor, but accept the packet because it has data for stream 5.
QuicStreamFrame frame3(GetNthClientInitiatedBidirectionalId(0), false, 2,
- absl::string_view("TP"));
+ kStreamData);
QuicStreamFrame frame4(GetNthClientInitiatedBidirectionalId(1), false, 2,
- absl::string_view("TP"));
+ kStreamData);
session_->OnStreamFrame(frame3);
session_->OnStreamFrame(frame4);
// The stream should never be opened, now that the reset is received.
@@ -512,7 +515,7 @@
// Receive some data to initiate a incoming stream which should not effect
// creating outgoing streams.
QuicStreamFrame data1(GetNthClientInitiatedBidirectionalId(0), false, 0,
- absl::string_view("HT"));
+ kStreamData);
session_->OnStreamFrame(data1);
EXPECT_EQ(1u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()));
EXPECT_EQ(0u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()) -
@@ -561,7 +564,7 @@
// Create peer initiated stream should have no problem.
QuicStreamFrame data2(GetNthClientInitiatedBidirectionalId(1), false, 0,
- absl::string_view("HT"));
+ kStreamData);
session_->OnStreamFrame(data2);
EXPECT_EQ(2u, QuicSessionPeer::GetNumOpenDynamicStreams(session_.get()) -
/*outcoming=*/kMaxStreamsForTest);
@@ -569,7 +572,7 @@
TEST_P(QuicSimpleServerSessionTest, OnStreamFrameWithEvenStreamId) {
QuicStreamFrame frame(GetNthServerInitiatedUnidirectionalId(0), false, 0,
- absl::string_view());
+ kStreamData);
EXPECT_CALL(*connection_,
CloseConnection(QUIC_INVALID_STREAM_ID,
"Client sent data on server push stream", _));
