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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_framer_test.cc

Issue 11377096: Change from re-transmitting an packet with a retransmit number to sending a new packet with a new s… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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.h » ('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 158ec61db8dcd6e622bc00ad2697c4e3f36ab7ef..dc546595881fbfccee142eb2277615ba696ce325 100644
--- a/net/quic/quic_framer_test.cc
+++ b/net/quic/quic_framer_test.cc
@@ -230,8 +230,6 @@ TEST_F(QuicFramerTest, LargePacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -263,8 +261,6 @@ TEST_F(QuicFramerTest, PacketHeader) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -280,7 +276,6 @@ TEST_F(QuicFramerTest, PacketHeader) {
EXPECT_EQ(QUIC_INVALID_FRAME_DATA, framer_.error());
ASSERT_TRUE(visitor_.header_.get());
EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210), visitor_.header_->guid);
- EXPECT_EQ(0x1, visitor_.header_->retransmission_count);
EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
visitor_.header_->packet_sequence_number);
EXPECT_EQ(GG_UINT64_C(0xF0E1D2C3B4A59687),
@@ -289,19 +284,17 @@ TEST_F(QuicFramerTest, PacketHeader) {
EXPECT_EQ(0x00, visitor_.header_->fec_group);
// Now test framing boundaries
- for (int i = 0; i < 25; ++i) {
+ for (int i = 0; i < 24; ++i) {
string expected_error;
if (i < 8) {
expected_error = "Unable to read GUID.";
} else if (i < 14) {
expected_error = "Unable to read sequence number.";
- } else if (i < 15) {
- expected_error = "Unable to read retransmission count.";
- } else if (i < 23) {
+ } else if (i < 22) {
expected_error = "Unable to read transmission time.";
- } else if (i < 24) {
+ } else if (i < 23) {
expected_error = "Unable to read flags.";
- } else if (i < 25) {
+ } else if (i < 24) {
expected_error = "Unable to read fec group.";
}
@@ -321,8 +314,6 @@ TEST_F(QuicFramerTest, StreamFrame) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -403,8 +394,6 @@ TEST_F(QuicFramerTest, RejectPacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -467,7 +456,6 @@ TEST_F(QuicFramerTest, RevivedStreamFrame) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -482,7 +470,6 @@ TEST_F(QuicFramerTest, RevivedStreamFrame) {
ASSERT_EQ(1, visitor_.revived_packets_);
ASSERT_TRUE(visitor_.header_.get());
EXPECT_EQ(GG_UINT64_C(0xFEDCBA9876543210), visitor_.header_->guid);
- EXPECT_EQ(0x1, visitor_.header_->retransmission_count);
EXPECT_EQ(GG_UINT64_C(0x123456789ABC),
visitor_.header_->packet_sequence_number);
EXPECT_EQ(GG_UINT64_C(0xF0E1D2C3B4A59687),
@@ -508,8 +495,6 @@ TEST_F(QuicFramerTest, StreamFrameInFecGroup) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x12, 0x34,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -566,8 +551,6 @@ TEST_F(QuicFramerTest, AckFrame) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -682,8 +665,6 @@ TEST_F(QuicFramerTest, AckFrameTCP) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -791,8 +772,6 @@ TEST_F(QuicFramerTest, AckFrameInterArrival) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -904,8 +883,6 @@ TEST_F(QuicFramerTest, AckFrameFixRate) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1008,8 +985,6 @@ TEST_F(QuicFramerTest, AckFrameInvalidFeedback) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1068,8 +1043,6 @@ TEST_F(QuicFramerTest, RstStreamFrame) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1141,8 +1114,6 @@ TEST_F(QuicFramerTest, ConnectionCloseFrame) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1271,8 +1242,6 @@ TEST_F(QuicFramerTest, FecPacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1310,7 +1279,6 @@ TEST_F(QuicFramerTest, FecPacket) {
TEST_F(QuicFramerTest, ConstructStreamFramePacket) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -1336,8 +1304,6 @@ TEST_F(QuicFramerTest, ConstructStreamFramePacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1366,7 +1332,7 @@ TEST_F(QuicFramerTest, ConstructStreamFramePacket) {
};
QuicPacket* data;
- ASSERT_TRUE(framer_.ConstructFragementDataPacket(header, frames, &data));
+ ASSERT_TRUE(framer_.ConstructFrameDataPacket(header, frames, &data));
test::CompareCharArraysWithHexError("constructed packet",
data->data(), data->length(),
@@ -1378,7 +1344,6 @@ TEST_F(QuicFramerTest, ConstructStreamFramePacket) {
TEST_F(QuicFramerTest, ConstructAckFramePacket) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -1414,8 +1379,6 @@ TEST_F(QuicFramerTest, ConstructAckFramePacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1482,7 +1445,7 @@ TEST_F(QuicFramerTest, ConstructAckFramePacket) {
};
QuicPacket* data;
- EXPECT_TRUE(framer_.ConstructFragementDataPacket(header, frames, &data));
+ EXPECT_TRUE(framer_.ConstructFrameDataPacket(header, frames, &data));
test::CompareCharArraysWithHexError("constructed packet",
data->data(), data->length(),
@@ -1494,7 +1457,6 @@ TEST_F(QuicFramerTest, ConstructAckFramePacket) {
TEST_F(QuicFramerTest, ConstructAckFramePacketTCP) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -1532,8 +1494,6 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketTCP) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1604,7 +1564,7 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketTCP) {
};
QuicPacket* data;
- EXPECT_TRUE(framer_.ConstructFragementDataPacket(header, frames, &data));
+ EXPECT_TRUE(framer_.ConstructFrameDataPacket(header, frames, &data));
test::CompareCharArraysWithHexError("constructed packet",
data->data(), data->length(),
@@ -1616,7 +1576,6 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketTCP) {
TEST_F(QuicFramerTest, ConstructAckFramePacketInterArrival) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -1656,8 +1615,6 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketInterArrival) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1730,7 +1687,7 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketInterArrival) {
};
QuicPacket* data;
- EXPECT_TRUE(framer_.ConstructFragementDataPacket(header, frames, &data));
+ EXPECT_TRUE(framer_.ConstructFrameDataPacket(header, frames, &data));
test::CompareCharArraysWithHexError("constructed packet",
data->data(), data->length(),
@@ -1742,7 +1699,6 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketInterArrival) {
TEST_F(QuicFramerTest, ConstructAckFramePacketFixRate) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -1780,8 +1736,6 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketFixRate) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1850,7 +1804,7 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketFixRate) {
};
QuicPacket* data;
- EXPECT_TRUE(framer_.ConstructFragementDataPacket(header, frames, &data));
+ EXPECT_TRUE(framer_.ConstructFrameDataPacket(header, frames, &data));
test::CompareCharArraysWithHexError("constructed packet",
data->data(), data->length(),
@@ -1862,7 +1816,6 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketFixRate) {
TEST_F(QuicFramerTest, ConstructAckFramePacketInvalidFeedback) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -1893,13 +1846,12 @@ TEST_F(QuicFramerTest, ConstructAckFramePacketInvalidFeedback) {
frames.push_back(frame);
QuicPacket* data;
- EXPECT_FALSE(framer_.ConstructFragementDataPacket(header, frames, &data));
+ EXPECT_FALSE(framer_.ConstructFrameDataPacket(header, frames, &data));
}
TEST_F(QuicFramerTest, ConstructRstFramePacket) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -1918,8 +1870,6 @@ TEST_F(QuicFramerTest, ConstructRstFramePacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -1954,7 +1904,7 @@ TEST_F(QuicFramerTest, ConstructRstFramePacket) {
frames.push_back(frame);
QuicPacket* data;
- EXPECT_TRUE(framer_.ConstructFragementDataPacket(header, frames, &data));
+ EXPECT_TRUE(framer_.ConstructFrameDataPacket(header, frames, &data));
test::CompareCharArraysWithHexError("constructed packet",
data->data(), data->length(),
@@ -1966,7 +1916,6 @@ TEST_F(QuicFramerTest, ConstructRstFramePacket) {
TEST_F(QuicFramerTest, ConstructCloseFramePacket) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_NONE;
@@ -2008,8 +1957,6 @@ TEST_F(QuicFramerTest, ConstructCloseFramePacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -2094,7 +2041,7 @@ TEST_F(QuicFramerTest, ConstructCloseFramePacket) {
};
QuicPacket* data;
- EXPECT_TRUE(framer_.ConstructFragementDataPacket(header, frames, &data));
+ EXPECT_TRUE(framer_.ConstructFrameDataPacket(header, frames, &data));
test::CompareCharArraysWithHexError("constructed packet",
data->data(), data->length(),
@@ -2106,7 +2053,6 @@ TEST_F(QuicFramerTest, ConstructCloseFramePacket) {
TEST_F(QuicFramerTest, ConstructFecPacket) {
QuicPacketHeader header;
header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 0x01;
header.packet_sequence_number = (GG_UINT64_C(0x123456789ABC));
header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
header.flags = PACKET_FLAGS_FEC;
@@ -2125,8 +2071,6 @@ TEST_F(QuicFramerTest, ConstructFecPacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -2154,48 +2098,6 @@ TEST_F(QuicFramerTest, ConstructFecPacket) {
delete data;
}
-TEST_F(QuicFramerTest, IncrementRetransmitCount) {
- QuicPacketHeader header;
- header.guid = GG_UINT64_C(0xFEDCBA9876543210);
- header.retransmission_count = 1;
- header.packet_sequence_number = GG_UINT64_C(0x123456789ABC);
- header.transmission_time = GG_UINT64_C(0xF0E1D2C3B4A59687);
- header.flags = PACKET_FLAGS_NONE;
- 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.data = "hello world!";
-
- QuicFrame frame;
- frame.type = STREAM_FRAME;
- frame.stream_frame = &stream_frame;
-
- QuicFrames frames;
- frames.push_back(frame);
-
- QuicPacket *original;
- ASSERT_TRUE(framer_.ConstructFragementDataPacket(
- header, frames, &original));
- EXPECT_EQ(header.retransmission_count, framer_.GetRetransmitCount(original));
-
- header.retransmission_count = 2;
- QuicPacket *retransmitted;
- ASSERT_TRUE(framer_.ConstructFragementDataPacket(
- header, frames, &retransmitted));
-
- framer_.IncrementRetransmitCount(original);
- EXPECT_EQ(header.retransmission_count, framer_.GetRetransmitCount(original));
-
- test::CompareCharArraysWithHexError(
- "constructed packet", original->data(), original->length(),
- retransmitted->data(), retransmitted->length());
- delete original;
- delete retransmitted;
-}
-
TEST_F(QuicFramerTest, EncryptPacket) {
unsigned char packet[] = {
// guid
@@ -2204,8 +2106,6 @@ TEST_F(QuicFramerTest, EncryptPacket) {
// packet id
0xBC, 0x9A, 0x78, 0x56,
0x34, 0x12,
- // retransmission count
- 0x01,
// transmission time
0x87, 0x96, 0xA5, 0xB4,
0xC3, 0xD2, 0xE1, 0xF0,
@@ -2223,7 +2123,7 @@ TEST_F(QuicFramerTest, EncryptPacket) {
'm', 'n', 'o', 'p',
};
- QuicPacket raw(AsChars(packet), arraysize(packet), false);
+ QuicPacket raw(AsChars(packet), arraysize(packet), false, PACKET_FLAGS_NONE);
scoped_ptr<QuicEncryptedPacket> encrypted(framer_.EncryptPacket(raw));
ASSERT_TRUE(encrypted.get() != NULL);
« no previous file with comments | « net/quic/quic_framer.cc ('k') | net/quic/quic_packet_creator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698