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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_framer_test.cc

Issue 1160203003: net: Remove the remaining use of GG_(U)INTn_C macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stdint.h Created 5 years, 7 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/quic_framer.cc ('k') | net/quic/quic_packet_creator_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_framer_test.cc
diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc
index ab9729d3c878e8fb0a9ff595554548384678561e..4166801d2a4892a9172d0bca040e1bd7c91a98b8 100644
--- a/net/quic/quic_framer_test.cc
+++ b/net/quic/quic_framer_test.cc
@@ -4,6 +4,7 @@
#include "net/quic/quic_framer.h"
+#include <stdint.h>
#include <algorithm>
#include <map>
#include <string>
@@ -12,7 +13,6 @@
#include "base/containers/hash_tables.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/port.h"
#include "base/stl_util.h"
#include "net/quic/crypto/quic_decrypter.h"
#include "net/quic/crypto/quic_encrypter.h"
@@ -37,7 +37,7 @@ using testing::_;
namespace net {
namespace test {
-const QuicPacketSequenceNumber kEpoch = GG_UINT64_C(1) << 48;
+const QuicPacketSequenceNumber kEpoch = UINT64_C(1) << 48;
const QuicPacketSequenceNumber kMask = kEpoch - 1;
// Index into the connection_id offset in the header.
@@ -502,7 +502,7 @@ INSTANTIATE_TEST_CASE_P(QuicFramerTests,
TEST_P(QuicFramerTest, CalculatePacketSequenceNumberFromWireNearEpochStart) {
// A few quick manual sanity checks
- CheckCalculatePacketSequenceNumber(GG_UINT64_C(1), GG_UINT64_C(0));
+ CheckCalculatePacketSequenceNumber(UINT64_C(1), UINT64_C(0));
CheckCalculatePacketSequenceNumber(kEpoch + 1, kMask);
CheckCalculatePacketSequenceNumber(kEpoch, kMask);
@@ -644,7 +644,7 @@ TEST_P(QuicFramerTest, LargePacket) {
ASSERT_TRUE(visitor_.header_.get());
// Make sure we've parsed the packet header, so we can send an error.
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
// Make sure the correct error is propagated.
EXPECT_EQ(QUIC_PACKET_TOO_LARGE, framer_.error());
@@ -668,14 +668,14 @@ TEST_P(QuicFramerTest, PacketHeader) {
EXPECT_FALSE(framer_.ProcessPacket(encrypted));
EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
+ EXPECT_EQ(UINT64_C(0x123456789ABC),
visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
@@ -703,7 +703,7 @@ TEST_P(QuicFramerTest, PacketHeader) {
TEST_P(QuicFramerTest, PacketHeaderWith4ByteConnectionId) {
QuicFramerPeer::SetLastSerializedConnectionId(
- &framer_, GG_UINT64_C(0xFEDCBA9876543210));
+ &framer_, UINT64_C(0xFEDCBA9876543210));
unsigned char packet[] = {
// public flags (4 byte connection_id)
@@ -721,14 +721,14 @@ TEST_P(QuicFramerTest, PacketHeaderWith4ByteConnectionId) {
EXPECT_FALSE(framer_.ProcessPacket(encrypted));
EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
+ EXPECT_EQ(UINT64_C(0x123456789ABC),
visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
@@ -759,7 +759,7 @@ TEST_P(QuicFramerTest, PacketHeaderWith4ByteConnectionId) {
TEST_P(QuicFramerTest, PacketHeader1ByteConnectionId) {
QuicFramerPeer::SetLastSerializedConnectionId(
- &framer_, GG_UINT64_C(0xFEDCBA9876543210));
+ &framer_, UINT64_C(0xFEDCBA9876543210));
unsigned char packet[] = {
// public flags (1 byte connection_id)
@@ -777,14 +777,14 @@ TEST_P(QuicFramerTest, PacketHeader1ByteConnectionId) {
EXPECT_FALSE(framer_.ProcessPacket(encrypted));
EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
+ EXPECT_EQ(UINT64_C(0x123456789ABC),
visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
@@ -815,7 +815,7 @@ TEST_P(QuicFramerTest, PacketHeader1ByteConnectionId) {
TEST_P(QuicFramerTest, PacketHeaderWith0ByteConnectionId) {
QuicFramerPeer::SetLastSerializedConnectionId(
- &framer_, GG_UINT64_C(0xFEDCBA9876543210));
+ &framer_, UINT64_C(0xFEDCBA9876543210));
unsigned char packet[] = {
// public flags (0 byte connection_id)
@@ -832,14 +832,14 @@ TEST_P(QuicFramerTest, PacketHeaderWith0ByteConnectionId) {
EXPECT_FALSE(framer_.ProcessPacket(encrypted));
EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
+ EXPECT_EQ(UINT64_C(0x123456789ABC),
visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
@@ -888,7 +888,7 @@ TEST_P(QuicFramerTest, PacketHeaderWithVersionFlag) {
EXPECT_FALSE(framer_.ProcessPacket(encrypted));
EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_TRUE(visitor_.header_->public_header.version_flag);
@@ -896,7 +896,7 @@ TEST_P(QuicFramerTest, PacketHeaderWithVersionFlag) {
EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
+ EXPECT_EQ(UINT64_C(0x123456789ABC),
visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
@@ -925,8 +925,7 @@ TEST_P(QuicFramerTest, PacketHeaderWithVersionFlag) {
}
TEST_P(QuicFramerTest, PacketHeaderWith4ByteSequenceNumber) {
- QuicFramerPeer::SetLastSequenceNumber(&framer_,
- GG_UINT64_C(0x123456789ABA));
+ QuicFramerPeer::SetLastSequenceNumber(&framer_, UINT64_C(0x123456789ABA));
unsigned char packet[] = {
// public flags (8 byte connection_id and 4 byte sequence number)
@@ -944,15 +943,14 @@ TEST_P(QuicFramerTest, PacketHeaderWith4ByteSequenceNumber) {
EXPECT_FALSE(framer_.ProcessPacket(encrypted));
EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
- visitor_.header_->packet_sequence_number);
+ EXPECT_EQ(UINT64_C(0x123456789ABC), visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
@@ -980,8 +978,7 @@ TEST_P(QuicFramerTest, PacketHeaderWith4ByteSequenceNumber) {
}
TEST_P(QuicFramerTest, PacketHeaderWith2ByteSequenceNumber) {
- QuicFramerPeer::SetLastSequenceNumber(&framer_,
- GG_UINT64_C(0x123456789ABA));
+ QuicFramerPeer::SetLastSequenceNumber(&framer_, UINT64_C(0x123456789ABA));
unsigned char packet[] = {
// public flags (8 byte connection_id and 2 byte sequence number)
@@ -999,15 +996,14 @@ TEST_P(QuicFramerTest, PacketHeaderWith2ByteSequenceNumber) {
EXPECT_FALSE(framer_.ProcessPacket(encrypted));
EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
- visitor_.header_->packet_sequence_number);
+ EXPECT_EQ(UINT64_C(0x123456789ABC), visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
@@ -1035,8 +1031,7 @@ TEST_P(QuicFramerTest, PacketHeaderWith2ByteSequenceNumber) {
}
TEST_P(QuicFramerTest, PacketHeaderWith1ByteSequenceNumber) {
- QuicFramerPeer::SetLastSequenceNumber(&framer_,
- GG_UINT64_C(0x123456789ABA));
+ QuicFramerPeer::SetLastSequenceNumber(&framer_, UINT64_C(0x123456789ABA));
unsigned char packet[] = {
// public flags (8 byte connection_id and 1 byte sequence number)
@@ -1054,15 +1049,14 @@ TEST_P(QuicFramerTest, PacketHeaderWith1ByteSequenceNumber) {
EXPECT_FALSE(framer_.ProcessPacket(encrypted));
EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
- visitor_.header_->packet_sequence_number);
+ EXPECT_EQ(UINT64_C(0x123456789ABC), visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
@@ -1301,8 +1295,7 @@ TEST_P(QuicFramerTest, StreamFrame) {
EXPECT_EQ(static_cast<uint64>(0x01020304),
visitor_.stream_frames_[0]->stream_id);
EXPECT_TRUE(visitor_.stream_frames_[0]->fin);
- EXPECT_EQ(GG_UINT64_C(0xBA98FEDC32107654),
- visitor_.stream_frames_[0]->offset);
+ EXPECT_EQ(UINT64_C(0xBA98FEDC32107654), visitor_.stream_frames_[0]->offset);
CheckStreamFrameData("hello world!", visitor_.stream_frames_[0]);
// Now test framing boundaries.
@@ -1346,10 +1339,9 @@ TEST_P(QuicFramerTest, StreamFrame3ByteStreamId) {
ASSERT_EQ(1u, visitor_.stream_frames_.size());
EXPECT_EQ(0u, visitor_.ack_frames_.size());
- EXPECT_EQ(GG_UINT64_C(0x00020304), visitor_.stream_frames_[0]->stream_id);
+ EXPECT_EQ(UINT64_C(0x00020304), visitor_.stream_frames_[0]->stream_id);
EXPECT_TRUE(visitor_.stream_frames_[0]->fin);
- EXPECT_EQ(GG_UINT64_C(0xBA98FEDC32107654),
- visitor_.stream_frames_[0]->offset);
+ EXPECT_EQ(UINT64_C(0xBA98FEDC32107654), visitor_.stream_frames_[0]->offset);
CheckStreamFrameData("hello world!", visitor_.stream_frames_[0]);
// Now test framing boundaries.
@@ -1397,8 +1389,7 @@ TEST_P(QuicFramerTest, StreamFrame2ByteStreamId) {
EXPECT_EQ(static_cast<uint64>(0x00000304),
visitor_.stream_frames_[0]->stream_id);
EXPECT_TRUE(visitor_.stream_frames_[0]->fin);
- EXPECT_EQ(GG_UINT64_C(0xBA98FEDC32107654),
- visitor_.stream_frames_[0]->offset);
+ EXPECT_EQ(UINT64_C(0xBA98FEDC32107654), visitor_.stream_frames_[0]->offset);
CheckStreamFrameData("hello world!", visitor_.stream_frames_[0]);
// Now test framing boundaries.
@@ -1446,8 +1437,7 @@ TEST_P(QuicFramerTest, StreamFrame1ByteStreamId) {
EXPECT_EQ(static_cast<uint64>(0x00000004),
visitor_.stream_frames_[0]->stream_id);
EXPECT_TRUE(visitor_.stream_frames_[0]->fin);
- EXPECT_EQ(GG_UINT64_C(0xBA98FEDC32107654),
- visitor_.stream_frames_[0]->offset);
+ EXPECT_EQ(UINT64_C(0xBA98FEDC32107654), visitor_.stream_frames_[0]->offset);
CheckStreamFrameData("hello world!", visitor_.stream_frames_[0]);
// Now test framing boundaries.
@@ -1499,8 +1489,7 @@ TEST_P(QuicFramerTest, StreamFrameWithVersion) {
EXPECT_EQ(static_cast<uint64>(0x01020304),
visitor_.stream_frames_[0]->stream_id);
EXPECT_TRUE(visitor_.stream_frames_[0]->fin);
- EXPECT_EQ(GG_UINT64_C(0xBA98FEDC32107654),
- visitor_.stream_frames_[0]->offset);
+ EXPECT_EQ(UINT64_C(0xBA98FEDC32107654), visitor_.stream_frames_[0]->offset);
CheckStreamFrameData("hello world!", visitor_.stream_frames_[0]);
// Now test framing boundaries.
@@ -1585,12 +1574,12 @@ TEST_P(QuicFramerTest, RevivedStreamFrame) {
};
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = true;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
// Do not encrypt the payload because the revived payload is post-encryption.
@@ -1601,7 +1590,7 @@ TEST_P(QuicFramerTest, RevivedStreamFrame) {
EXPECT_EQ(QUIC_NO_ERROR, framer_.error());
ASSERT_EQ(1, visitor_.revived_packets_);
ASSERT_TRUE(visitor_.header_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.header_->public_header.connection_id);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
@@ -1609,17 +1598,15 @@ TEST_P(QuicFramerTest, RevivedStreamFrame) {
EXPECT_TRUE(visitor_.header_->entropy_flag);
EXPECT_EQ(1 << (header.packet_sequence_number % 8),
visitor_.header_->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
- visitor_.header_->packet_sequence_number);
+ EXPECT_EQ(UINT64_C(0x123456789ABC), visitor_.header_->packet_sequence_number);
EXPECT_EQ(NOT_IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
EXPECT_EQ(0x00u, visitor_.header_->fec_group);
ASSERT_EQ(1u, visitor_.stream_frames_.size());
EXPECT_EQ(0u, visitor_.ack_frames_.size());
- EXPECT_EQ(GG_UINT64_C(0x01020304), visitor_.stream_frames_[0]->stream_id);
+ EXPECT_EQ(UINT64_C(0x01020304), visitor_.stream_frames_[0]->stream_id);
EXPECT_TRUE(visitor_.stream_frames_[0]->fin);
- EXPECT_EQ(GG_UINT64_C(0xBA98FEDC32107654),
- visitor_.stream_frames_[0]->offset);
+ EXPECT_EQ(UINT64_C(0xBA98FEDC32107654), visitor_.stream_frames_[0]->offset);
CheckStreamFrameData("hello world!", visitor_.stream_frames_[0]);
}
@@ -1660,8 +1647,7 @@ TEST_P(QuicFramerTest, StreamFrameInFecGroup) {
ASSERT_TRUE(visitor_.header_.get());
EXPECT_TRUE(CheckDecryption(encrypted, !kIncludeVersion));
EXPECT_EQ(IN_FEC_GROUP, visitor_.header_->is_in_fec_group);
- EXPECT_EQ(GG_UINT64_C(0x341256789ABA),
- visitor_.header_->fec_group);
+ EXPECT_EQ(UINT64_C(0x341256789ABA), visitor_.header_->fec_group);
const size_t fec_offset =
GetStartOfFecProtectedData(PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion,
@@ -1672,10 +1658,9 @@ TEST_P(QuicFramerTest, StreamFrameInFecGroup) {
ASSERT_EQ(1u, visitor_.stream_frames_.size());
EXPECT_EQ(0u, visitor_.ack_frames_.size());
- EXPECT_EQ(GG_UINT64_C(0x01020304), visitor_.stream_frames_[0]->stream_id);
+ EXPECT_EQ(UINT64_C(0x01020304), visitor_.stream_frames_[0]->stream_id);
EXPECT_TRUE(visitor_.stream_frames_[0]->fin);
- EXPECT_EQ(GG_UINT64_C(0xBA98FEDC32107654),
- visitor_.stream_frames_[0]->offset);
+ EXPECT_EQ(UINT64_C(0xBA98FEDC32107654), visitor_.stream_frames_[0]->offset);
CheckStreamFrameData("hello world!", visitor_.stream_frames_[0]);
}
@@ -1730,12 +1715,12 @@ TEST_P(QuicFramerTest, AckFrameTwoTimestamp) {
ASSERT_EQ(1u, visitor_.ack_frames_.size());
const QuicAckFrame& frame = *visitor_.ack_frames_[0];
EXPECT_EQ(0xBA, frame.entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABF), frame.largest_observed);
+ EXPECT_EQ(UINT64_C(0x0123456789ABF), frame.largest_observed);
ASSERT_EQ(1u, frame.missing_packets.size());
ASSERT_EQ(2u, frame.received_packet_times.size());
SequenceNumberSet::const_iterator missing_iter =
frame.missing_packets.begin();
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABE), *missing_iter);
+ EXPECT_EQ(UINT64_C(0x0123456789ABE), *missing_iter);
const size_t kReceivedEntropyOffset = kQuicFrameTypeSize;
const size_t kLargestObservedOffset = kReceivedEntropyOffset +
@@ -1847,12 +1832,12 @@ TEST_P(QuicFramerTest, AckFrameOneTimestamp) {
ASSERT_EQ(1u, visitor_.ack_frames_.size());
const QuicAckFrame& frame = *visitor_.ack_frames_[0];
EXPECT_EQ(0xBA, frame.entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABF), frame.largest_observed);
+ EXPECT_EQ(UINT64_C(0x0123456789ABF), frame.largest_observed);
ASSERT_EQ(1u, frame.missing_packets.size());
ASSERT_EQ(1u, frame.received_packet_times.size());
SequenceNumberSet::const_iterator missing_iter =
frame.missing_packets.begin();
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABE), *missing_iter);
+ EXPECT_EQ(UINT64_C(0x0123456789ABE), *missing_iter);
const size_t kReceivedEntropyOffset = kQuicFrameTypeSize;
const size_t kLargestObservedOffset = kReceivedEntropyOffset +
@@ -1950,11 +1935,11 @@ TEST_P(QuicFramerTest, AckFrame) {
ASSERT_EQ(1u, visitor_.ack_frames_.size());
const QuicAckFrame& frame = *visitor_.ack_frames_[0];
EXPECT_EQ(0xBA, frame.entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABF), frame.largest_observed);
+ EXPECT_EQ(UINT64_C(0x0123456789ABF), frame.largest_observed);
ASSERT_EQ(1u, frame.missing_packets.size());
SequenceNumberSet::const_iterator missing_iter =
frame.missing_packets.begin();
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABE), *missing_iter);
+ EXPECT_EQ(UINT64_C(0x0123456789ABE), *missing_iter);
const size_t kReceivedEntropyOffset = kQuicFrameTypeSize;
const size_t kLargestObservedOffset = kReceivedEntropyOffset +
@@ -2048,11 +2033,11 @@ TEST_P(QuicFramerTest, AckFrameRevivedPackets) {
ASSERT_EQ(1u, visitor_.ack_frames_.size());
const QuicAckFrame& frame = *visitor_.ack_frames_[0];
EXPECT_EQ(0xBA, frame.entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABF), frame.largest_observed);
+ EXPECT_EQ(UINT64_C(0x0123456789ABF), frame.largest_observed);
ASSERT_EQ(1u, frame.missing_packets.size());
SequenceNumberSet::const_iterator missing_iter =
frame.missing_packets.begin();
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABE), *missing_iter);
+ EXPECT_EQ(UINT64_C(0x0123456789ABE), *missing_iter);
const size_t kReceivedEntropyOffset = kQuicFrameTypeSize;
const size_t kLargestObservedOffset = kReceivedEntropyOffset +
@@ -2140,7 +2125,7 @@ TEST_P(QuicFramerTest, AckFrameNoNacks) {
ASSERT_EQ(1u, visitor_.ack_frames_.size());
QuicAckFrame* frame = visitor_.ack_frames_[0];
EXPECT_EQ(0xBA, frame->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABF), frame->largest_observed);
+ EXPECT_EQ(UINT64_C(0x0123456789ABF), frame->largest_observed);
ASSERT_EQ(0u, frame->missing_packets.size());
// Verify that the packet re-serializes identically.
@@ -2203,15 +2188,15 @@ TEST_P(QuicFramerTest, AckFrame500Nacks) {
ASSERT_EQ(1u, visitor_.ack_frames_.size());
QuicAckFrame* frame = visitor_.ack_frames_[0];
EXPECT_EQ(0xBA, frame->entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABF), frame->largest_observed);
+ EXPECT_EQ(UINT64_C(0x0123456789ABF), frame->largest_observed);
EXPECT_EQ(0u, frame->revived_packets.size());
ASSERT_EQ(500u, frame->missing_packets.size());
SequenceNumberSet::const_iterator first_missing_iter =
frame->missing_packets.begin();
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABE) - 499, *first_missing_iter);
+ EXPECT_EQ(UINT64_C(0x0123456789ABE) - 499, *first_missing_iter);
SequenceNumberSet::const_reverse_iterator last_missing_iter =
frame->missing_packets.rbegin();
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABE), *last_missing_iter);
+ EXPECT_EQ(UINT64_C(0x0123456789ABE), *last_missing_iter);
// Verify that the packet re-serializes identically.
QuicFrames frames;
@@ -2258,7 +2243,7 @@ TEST_P(QuicFramerTest, StopWaitingFrame) {
ASSERT_EQ(1u, visitor_.stop_waiting_frames_.size());
const QuicStopWaitingFrame& frame = *visitor_.stop_waiting_frames_[0];
EXPECT_EQ(0xAB, frame.entropy_hash);
- EXPECT_EQ(GG_UINT64_C(0x0123456789AA0), frame.least_unacked);
+ EXPECT_EQ(UINT64_C(0x0123456789AA0), frame.least_unacked);
const size_t kSentEntropyOffset = kQuicFrameTypeSize;
const size_t kLeastUnackedOffset = kSentEntropyOffset + kQuicEntropyHashSize;
@@ -2324,10 +2309,10 @@ TEST_P(QuicFramerTest, RstStreamFrameQuicVersion24) {
ASSERT_TRUE(visitor_.header_.get());
EXPECT_TRUE(CheckDecryption(encrypted, !kIncludeVersion));
- EXPECT_EQ(GG_UINT64_C(0x01020304), visitor_.rst_stream_frame_.stream_id);
+ EXPECT_EQ(UINT64_C(0x01020304), visitor_.rst_stream_frame_.stream_id);
EXPECT_EQ(0x01, visitor_.rst_stream_frame_.error_code);
EXPECT_EQ("because I can", visitor_.rst_stream_frame_.error_details);
- EXPECT_EQ(GG_UINT64_C(0x0807060504030201),
+ EXPECT_EQ(UINT64_C(0x0807060504030201),
visitor_.rst_stream_frame_.byte_offset);
// Now test framing boundaries.
@@ -2393,9 +2378,9 @@ TEST_P(QuicFramerTest, RstStreamFrameQuic) {
ASSERT_TRUE(visitor_.header_.get());
EXPECT_TRUE(CheckDecryption(encrypted, !kIncludeVersion));
- EXPECT_EQ(GG_UINT64_C(0x01020304), visitor_.rst_stream_frame_.stream_id);
+ EXPECT_EQ(UINT64_C(0x01020304), visitor_.rst_stream_frame_.stream_id);
EXPECT_EQ(0x01, visitor_.rst_stream_frame_.error_code);
- EXPECT_EQ(GG_UINT64_C(0x0807060504030201),
+ EXPECT_EQ(UINT64_C(0x0807060504030201),
visitor_.rst_stream_frame_.byte_offset);
// Now test framing boundaries.
@@ -2512,8 +2497,7 @@ TEST_P(QuicFramerTest, GoAwayFrame) {
ASSERT_TRUE(visitor_.header_.get());
EXPECT_TRUE(CheckDecryption(encrypted, !kIncludeVersion));
- EXPECT_EQ(GG_UINT64_C(0x01020304),
- visitor_.goaway_frame_.last_good_stream_id);
+ EXPECT_EQ(UINT64_C(0x01020304), visitor_.goaway_frame_.last_good_stream_id);
EXPECT_EQ(0x9, visitor_.goaway_frame_.error_code);
EXPECT_EQ("because I can", visitor_.goaway_frame_.reason_phrase);
@@ -2568,9 +2552,8 @@ TEST_P(QuicFramerTest, WindowUpdateFrame) {
ASSERT_TRUE(visitor_.header_.get());
EXPECT_TRUE(CheckDecryption(encrypted, !kIncludeVersion));
- EXPECT_EQ(GG_UINT64_C(0x01020304),
- visitor_.window_update_frame_.stream_id);
- EXPECT_EQ(GG_UINT64_C(0x0c0b0a0908070605),
+ EXPECT_EQ(UINT64_C(0x01020304), visitor_.window_update_frame_.stream_id);
+ EXPECT_EQ(UINT64_C(0x0c0b0a0908070605),
visitor_.window_update_frame_.byte_offset);
// Now test framing boundaries.
@@ -2617,8 +2600,7 @@ TEST_P(QuicFramerTest, BlockedFrame) {
ASSERT_TRUE(visitor_.header_.get());
EXPECT_TRUE(CheckDecryption(encrypted, !kIncludeVersion));
- EXPECT_EQ(GG_UINT64_C(0x01020304),
- visitor_.blocked_frame_.stream_id);
+ EXPECT_EQ(UINT64_C(0x01020304), visitor_.blocked_frame_.stream_id);
// Now test framing boundaries.
for (size_t i = kQuicFrameTypeSize; i < QuicFramer::GetBlockedFrameSize();
@@ -2692,13 +2674,13 @@ TEST_P(QuicFramerTest, PublicResetPacket) {
EXPECT_TRUE(framer_.ProcessPacket(encrypted));
ASSERT_EQ(QUIC_NO_ERROR, framer_.error());
ASSERT_TRUE(visitor_.public_reset_packet_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.public_reset_packet_->public_header.connection_id);
EXPECT_TRUE(visitor_.public_reset_packet_->public_header.reset_flag);
EXPECT_FALSE(visitor_.public_reset_packet_->public_header.version_flag);
- EXPECT_EQ(GG_UINT64_C(0xABCDEF0123456789),
+ EXPECT_EQ(UINT64_C(0xABCDEF0123456789),
visitor_.public_reset_packet_->nonce_proof);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
+ EXPECT_EQ(UINT64_C(0x123456789ABC),
visitor_.public_reset_packet_->rejected_sequence_number);
EXPECT_TRUE(
visitor_.public_reset_packet_->client_address.address().empty());
@@ -2796,13 +2778,13 @@ TEST_P(QuicFramerTest, PublicResetPacketWithClientAddress) {
EXPECT_TRUE(framer_.ProcessPacket(encrypted));
ASSERT_EQ(QUIC_NO_ERROR, framer_.error());
ASSERT_TRUE(visitor_.public_reset_packet_.get());
- EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210),
+ EXPECT_EQ(UINT64_C(0xFEDCBA9876543210),
visitor_.public_reset_packet_->public_header.connection_id);
EXPECT_TRUE(visitor_.public_reset_packet_->public_header.reset_flag);
EXPECT_FALSE(visitor_.public_reset_packet_->public_header.version_flag);
- EXPECT_EQ(GG_UINT64_C(0xABCDEF0123456789),
+ EXPECT_EQ(UINT64_C(0xABCDEF0123456789),
visitor_.public_reset_packet_->nonce_proof);
- EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
+ EXPECT_EQ(UINT64_C(0x123456789ABC),
visitor_.public_reset_packet_->rejected_sequence_number);
EXPECT_EQ("4.31.198.44",
IPAddressToString(visitor_.public_reset_packet_->
@@ -2898,18 +2880,18 @@ TEST_P(QuicFramerTest, FecPacket) {
EXPECT_EQ(0u, visitor_.ack_frames_.size());
ASSERT_EQ(1, visitor_.fec_count_);
const QuicFecData& fec_data = *visitor_.fec_data_[0];
- EXPECT_EQ(GG_UINT64_C(0x0123456789ABB), fec_data.fec_group);
+ EXPECT_EQ(UINT64_C(0x0123456789ABB), fec_data.fec_group);
EXPECT_EQ("abcdefghijklmnop", fec_data.redundancy);
}
TEST_P(QuicFramerTest, BuildPaddingFramePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = false;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicPaddingFrame padding_frame;
@@ -2950,13 +2932,13 @@ TEST_P(QuicFramerTest, BuildPaddingFramePacket) {
TEST_P(QuicFramerTest, Build4ByteSequenceNumberPaddingFramePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = false;
header.public_header.sequence_number_length = PACKET_4BYTE_SEQUENCE_NUMBER;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicPaddingFrame padding_frame;
@@ -2996,13 +2978,13 @@ TEST_P(QuicFramerTest, Build4ByteSequenceNumberPaddingFramePacket) {
TEST_P(QuicFramerTest, Build2ByteSequenceNumberPaddingFramePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = false;
header.public_header.sequence_number_length = PACKET_2BYTE_SEQUENCE_NUMBER;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicPaddingFrame padding_frame;
@@ -3042,13 +3024,13 @@ TEST_P(QuicFramerTest, Build2ByteSequenceNumberPaddingFramePacket) {
TEST_P(QuicFramerTest, Build1ByteSequenceNumberPaddingFramePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = false;
header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicPaddingFrame padding_frame;
@@ -3088,18 +3070,18 @@ TEST_P(QuicFramerTest, Build1ByteSequenceNumberPaddingFramePacket) {
TEST_P(QuicFramerTest, BuildStreamFramePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x77123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x77123456789ABC);
header.fec_group = 0;
QuicStreamFrame stream_frame;
stream_frame.stream_id = 0x01020304;
stream_frame.fin = true;
- stream_frame.offset = GG_UINT64_C(0xBA98FEDC32107654);
+ stream_frame.offset = UINT64_C(0xBA98FEDC32107654);
stream_frame.data = MakeIOVector("hello world!");
QuicFrames frames;
@@ -3140,19 +3122,19 @@ TEST_P(QuicFramerTest, BuildStreamFramePacket) {
TEST_P(QuicFramerTest, BuildStreamFramePacketInFecGroup) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x77123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x77123456789ABC);
header.is_in_fec_group = IN_FEC_GROUP;
- header.fec_group = GG_UINT64_C(0x77123456789ABC);
+ header.fec_group = UINT64_C(0x77123456789ABC);
QuicStreamFrame stream_frame;
stream_frame.stream_id = 0x01020304;
stream_frame.fin = true;
- stream_frame.offset = GG_UINT64_C(0xBA98FEDC32107654);
+ stream_frame.offset = UINT64_C(0xBA98FEDC32107654);
stream_frame.data = MakeIOVector("hello world!");
QuicFrames frames;
@@ -3190,18 +3172,18 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketInFecGroup) {
TEST_P(QuicFramerTest, BuildStreamFramePacketWithVersionFlag) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = true;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x77123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x77123456789ABC);
header.fec_group = 0;
QuicStreamFrame stream_frame;
stream_frame.stream_id = 0x01020304;
stream_frame.fin = true;
- stream_frame.offset = GG_UINT64_C(0xBA98FEDC32107654);
+ stream_frame.offset = UINT64_C(0xBA98FEDC32107654);
stream_frame.data = MakeIOVector("hello world!");
QuicFrames frames;
@@ -3276,7 +3258,7 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithVersionFlag) {
TEST_P(QuicFramerTest, BuildVersionNegotiationPacket) {
QuicPacketPublicHeader header;
- header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.reset_flag = false;
header.version_flag = true;
@@ -3311,19 +3293,19 @@ TEST_P(QuicFramerTest, BuildVersionNegotiationPacket) {
TEST_P(QuicFramerTest, BuildAckFramePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x770123456789AA8);
+ header.packet_sequence_number = UINT64_C(0x770123456789AA8);
header.fec_group = 0;
QuicAckFrame ack_frame;
ack_frame.entropy_hash = 0x43;
- ack_frame.largest_observed = GG_UINT64_C(0x770123456789ABF);
+ ack_frame.largest_observed = UINT64_C(0x770123456789ABF);
ack_frame.delta_time_largest_observed = QuicTime::Delta::Zero();
- ack_frame.missing_packets.insert(GG_UINT64_C(0x770123456789ABE));
+ ack_frame.missing_packets.insert(UINT64_C(0x770123456789ABE));
QuicFrames frames;
frames.push_back(QuicFrame(&ack_frame));
@@ -3372,12 +3354,12 @@ TEST_P(QuicFramerTest, BuildAckFramePacket) {
TEST_P(QuicFramerTest, BuildTruncatedAckFrameLargePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x770123456789AA8);
+ header.packet_sequence_number = UINT64_C(0x770123456789AA8);
header.fec_group = 0;
QuicAckFrame ack_frame;
@@ -3481,12 +3463,12 @@ TEST_P(QuicFramerTest, BuildTruncatedAckFrameLargePacket) {
TEST_P(QuicFramerTest, BuildTruncatedAckFrameSmallPacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x770123456789AA8);
+ header.packet_sequence_number = UINT64_C(0x770123456789AA8);
header.fec_group = 0;
QuicAckFrame ack_frame;
@@ -3544,17 +3526,17 @@ TEST_P(QuicFramerTest, BuildTruncatedAckFrameSmallPacket) {
TEST_P(QuicFramerTest, BuildStopWaitingPacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x770123456789AA8);
+ header.packet_sequence_number = UINT64_C(0x770123456789AA8);
header.fec_group = 0;
QuicStopWaitingFrame stop_waiting_frame;
stop_waiting_frame.entropy_hash = 0x14;
- stop_waiting_frame.least_unacked = GG_UINT64_C(0x770123456789AA0);
+ stop_waiting_frame.least_unacked = UINT64_C(0x770123456789AA0);
QuicFrames frames;
frames.push_back(QuicFrame(&stop_waiting_frame));
@@ -3595,12 +3577,12 @@ TEST_P(QuicFramerTest, BuildRstFramePacketQuicVersion24) {
}
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = false;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicRstStreamFrame rst_frame;
@@ -3657,12 +3639,12 @@ TEST_P(QuicFramerTest, BuildRstFramePacketQuic) {
}
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = false;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicRstStreamFrame rst_frame;
@@ -3708,12 +3690,12 @@ TEST_P(QuicFramerTest, BuildRstFramePacketQuic) {
TEST_P(QuicFramerTest, BuildCloseFramePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicConnectionCloseFrame close_frame;
@@ -3758,12 +3740,12 @@ TEST_P(QuicFramerTest, BuildCloseFramePacket) {
TEST_P(QuicFramerTest, BuildGoAwayPacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicGoAwayFrame goaway_frame;
@@ -3811,12 +3793,12 @@ TEST_P(QuicFramerTest, BuildGoAwayPacket) {
TEST_P(QuicFramerTest, BuildWindowUpdatePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicWindowUpdateFrame window_update_frame;
@@ -3857,12 +3839,12 @@ TEST_P(QuicFramerTest, BuildWindowUpdatePacket) {
TEST_P(QuicFramerTest, BuildBlockedPacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicBlockedFrame blocked_frame;
@@ -3899,12 +3881,12 @@ TEST_P(QuicFramerTest, BuildBlockedPacket) {
TEST_P(QuicFramerTest, BuildPingPacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicPingFrame ping_frame;
@@ -3938,11 +3920,11 @@ TEST_P(QuicFramerTest, BuildPingPacket) {
TEST_P(QuicFramerTest, BuildPublicResetPacket) {
QuicPublicResetPacket reset_packet;
- reset_packet.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ reset_packet.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
reset_packet.public_header.reset_flag = true;
reset_packet.public_header.version_flag = false;
- reset_packet.rejected_sequence_number = GG_UINT64_C(0x123456789ABC);
- reset_packet.nonce_proof = GG_UINT64_C(0xABCDEF0123456789);
+ reset_packet.rejected_sequence_number = UINT64_C(0x123456789ABC);
+ reset_packet.nonce_proof = UINT64_C(0xABCDEF0123456789);
unsigned char packet[] = {
// public flags (public reset, 8 byte ConnectionId)
@@ -3981,11 +3963,11 @@ TEST_P(QuicFramerTest, BuildPublicResetPacket) {
TEST_P(QuicFramerTest, BuildPublicResetPacketWithClientAddress) {
QuicPublicResetPacket reset_packet;
- reset_packet.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ reset_packet.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
reset_packet.public_header.reset_flag = true;
reset_packet.public_header.version_flag = false;
- reset_packet.rejected_sequence_number = GG_UINT64_C(0x123456789ABC);
- reset_packet.nonce_proof = GG_UINT64_C(0xABCDEF0123456789);
+ reset_packet.rejected_sequence_number = UINT64_C(0x123456789ABC);
+ reset_packet.nonce_proof = UINT64_C(0xABCDEF0123456789);
reset_packet.client_address = IPEndPoint(Loopback4(), 0x1234);
unsigned char packet[] = {
@@ -4033,14 +4015,15 @@ TEST_P(QuicFramerTest, BuildPublicResetPacketWithClientAddress) {
TEST_P(QuicFramerTest, BuildFecPacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = true;
header.entropy_flag = true;
- header.packet_sequence_number = (GG_UINT64_C(0x123456789ABC));
+ header.packet_sequence_number = (UINT64_C(0x123456789ABC));
header.is_in_fec_group = IN_FEC_GROUP;
- header.fec_group = GG_UINT64_C(0x123456789ABB);;
+ header.fec_group = UINT64_C(0x123456789ABB);
+ ;
QuicFecData fec_data;
fec_data.fec_group = 1;
@@ -4076,7 +4059,7 @@ TEST_P(QuicFramerTest, BuildFecPacket) {
}
TEST_P(QuicFramerTest, EncryptPacket) {
- QuicPacketSequenceNumber sequence_number = GG_UINT64_C(0x123456789ABC);
+ QuicPacketSequenceNumber sequence_number = UINT64_C(0x123456789ABC);
unsigned char packet[] = {
// public flags (8 byte connection_id)
0x3C,
@@ -4110,7 +4093,7 @@ TEST_P(QuicFramerTest, EncryptPacket) {
}
TEST_P(QuicFramerTest, EncryptPacketWithVersionFlag) {
- QuicPacketSequenceNumber sequence_number = GG_UINT64_C(0x123456789ABC);
+ QuicPacketSequenceNumber sequence_number = UINT64_C(0x123456789ABC);
unsigned char packet[] = {
// public flags (version, 8 byte connection_id)
0x3D,
@@ -4147,12 +4130,12 @@ TEST_P(QuicFramerTest, EncryptPacketWithVersionFlag) {
TEST_P(QuicFramerTest, AckTruncationLargePacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = false;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
// Create a packet with just the ack.
@@ -4187,12 +4170,12 @@ TEST_P(QuicFramerTest, AckTruncationLargePacket) {
TEST_P(QuicFramerTest, AckTruncationSmallPacket) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = false;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
// Create a packet with just the ack.
@@ -4227,12 +4210,12 @@ TEST_P(QuicFramerTest, AckTruncationSmallPacket) {
TEST_P(QuicFramerTest, CleanTruncation) {
QuicPacketHeader header;
- header.public_header.connection_id = GG_UINT64_C(0xFEDCBA9876543210);
+ header.public_header.connection_id = UINT64_C(0xFEDCBA9876543210);
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
header.fec_flag = false;
header.entropy_flag = true;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
+ header.packet_sequence_number = UINT64_C(0x123456789ABC);
header.fec_group = 0;
QuicAckFrame ack_frame;
« no previous file with comments | « net/quic/quic_framer.cc ('k') | net/quic/quic_packet_creator_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698