Commit 56acf5b1 authored by Bence Béky's avatar Bence Béky Committed by Commit Bot

Use ::testing::Eq in QPACK tests.

Chromium requires some special annotation for using a C-style string
literal as a GMock expected argument on a mocked method that takes a
QuicStringPiece.  This CL replaces QuicStringPiece constructors with the
more idiomatic ::testing::Eq matcher.

This CL lands server change 230912128 by bnc.

BUG=488484

Change-Id: Icb43cc2ad771dc8e0e4194e03617b31319021763
Reviewed-on: https://chromium-review.googlesource.com/c/1441497Reviewed-by: default avatarZhongyi Shi <zhongyi@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626965}
parent 90052198
......@@ -73,8 +73,7 @@ TEST_F(QpackEncoderStreamReceiverTest, InsertWithNameReferenceIndexTooLarge) {
}
TEST_F(QpackEncoderStreamReceiverTest, InsertWithNameReferenceValueTooLong) {
EXPECT_CALL(*delegate(),
OnErrorDetected(QuicStringPiece("Encoded integer too large.")));
EXPECT_CALL(*delegate(), OnErrorDetected(Eq("Encoded integer too large.")));
Decode(QuicTextUtils::HexDecode("c57fffffffffffffffffffff"));
}
......@@ -114,8 +113,7 @@ TEST_F(QpackEncoderStreamReceiverTest,
// Name Length value can be decoded by varint decoder but exceeds 1 MB limit.
TEST_F(QpackEncoderStreamReceiverTest,
InsertWithoutNameReferenceNameExceedsLimit) {
EXPECT_CALL(*delegate(),
OnErrorDetected(QuicStringPiece("String literal too long.")));
EXPECT_CALL(*delegate(), OnErrorDetected(Eq("String literal too long.")));
Decode(QuicTextUtils::HexDecode("5fffff7f"));
}
......
......@@ -11,6 +11,7 @@
#include "net/third_party/quic/platform/api/quic_text_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::Eq;
using ::testing::StrictMock;
using ::testing::Values;
......@@ -153,7 +154,7 @@ TEST_P(QpackEncoderTest, SimpleIndexed) {
TEST_P(QpackEncoderTest, DecoderStreamError) {
EXPECT_CALL(decoder_stream_error_delegate_,
OnError(QuicStringPiece("Encoded integer too large.")));
OnError(Eq("Encoded integer too large.")));
QpackEncoder encoder(&decoder_stream_error_delegate_,
&encoder_stream_sender_delegate_);
......
......@@ -13,6 +13,7 @@
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::_;
using ::testing::Eq;
using ::testing::Expectation;
using ::testing::Return;
using ::testing::StrictMock;
......@@ -140,14 +141,12 @@ TEST_P(QpackInstructionDecoderTest, NameAndValue) {
}
TEST_P(QpackInstructionDecoderTest, InvalidHuffmanEncoding) {
EXPECT_CALL(delegate_,
OnError(QuicStringPiece("Error in Huffman-encoded string.")));
EXPECT_CALL(delegate_, OnError(Eq("Error in Huffman-encoded string.")));
decoder_.Decode(QuicTextUtils::HexDecode("c1ff"));
}
TEST_P(QpackInstructionDecoderTest, InvalidVarintEncoding) {
EXPECT_CALL(delegate_,
OnError(QuicStringPiece("Encoded integer too large.")));
EXPECT_CALL(delegate_, OnError(Eq("Encoded integer too large.")));
decoder_.Decode(QuicTextUtils::HexDecode("ffffffffffffffffffffff"));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment