diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/spdy/spdy_framer_test.cc | 32 | ||||
| -rw-r--r-- | net/spdy/spdy_protocol_test.cc | 8 |
2 files changed, 16 insertions, 24 deletions
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc index 680c59f..394586e 100644 --- a/net/spdy/spdy_framer_test.cc +++ b/net/spdy/spdy_framer_test.cc @@ -2049,8 +2049,8 @@ TEST_P(SpdyFramerTest, CreateSettings) { const char kDescription[] = "Network byte order SETTINGS frame"; uint32 kValue = 0x0a0b0c0d; - SpdySettingsFlags kFlags = static_cast<SpdySettingsFlags>(0x04); - SpdySettingsIds kId = static_cast<SpdySettingsIds>(0x030201); + SpdySettingsFlags kFlags = static_cast<SpdySettingsFlags>(0x01); + SpdySettingsIds kId = static_cast<SpdySettingsIds>(0x020304); SettingsMap settings; settings[kId] = SettingsFlagsAndValue(kFlags, kValue); @@ -2062,7 +2062,7 @@ TEST_P(SpdyFramerTest, CreateSettings) { 0x80, spdy_version_, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x01, - 0x01, 0x02, 0x03, 0x04, + 0x04, 0x03, 0x02, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, }; @@ -2070,7 +2070,7 @@ TEST_P(SpdyFramerTest, CreateSettings) { 0x80, spdy_version_, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x01, - 0x04, 0x03, 0x02, 0x01, + 0x01, 0x02, 0x03, 0x04, 0x0a, 0x0b, 0x0c, 0x0d, }; @@ -2097,32 +2097,24 @@ TEST_P(SpdyFramerTest, CreateSettings) { AddSpdySettingFromWireFormat( &settings, 0x00000000, 0x00000001); // 1st Setting AddSpdySettingFromWireFormat( - &settings, 0x01000002, 0x00000002); // 2nd Setting - AddSpdySettingFromWireFormat( - &settings, 0x02000003, 0x00000003); // 3rd Setting - AddSpdySettingFromWireFormat( - &settings, 0x03000004, 0xff000004); // 4th Setting + &settings, 0x01000001, 0x00000002); // 2nd Setting AddSpdySettingFromWireFormat( - &settings, 0xff000005, 0x00000005); // 5th Setting + &settings, 0x02000002, 0x00000003); // 3rd Setting AddSpdySettingFromWireFormat( - &settings, 0xffffffff, 0x00000006); // 6th Setting + &settings, 0x03000003, 0xff000004); // 4th Setting const unsigned char kFrameData[] = { 0x80, spdy_version_, 0x00, 0x04, - 0x00, 0x00, 0x00, 0x34, - 0x00, 0x00, 0x00, 0x06, + 0x00, 0x00, 0x00, 0x24, + 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, // 1st Setting 0x00, 0x00, 0x00, 0x01, - 0x02, 0x00, 0x00, 0x01, // 2nd Setting + 0x01, 0x00, 0x00, 0x01, // 2nd Setting 0x00, 0x00, 0x00, 0x02, - 0x03, 0x00, 0x00, 0x02, // 3rd Setting + 0x02, 0x00, 0x00, 0x02, // 3rd Setting 0x00, 0x00, 0x00, 0x03, - 0x04, 0x00, 0x00, 0x03, // 4th Setting + 0x03, 0x00, 0x00, 0x03, // 4th Setting 0xff, 0x00, 0x00, 0x04, - 0x05, 0x00, 0x00, 0xff, // 5th Setting - 0x00, 0x00, 0x00, 0x05, - 0xff, 0xff, 0xff, 0xff, // 6th Setting - 0x00, 0x00, 0x00, 0x06, }; scoped_ptr<SpdySettingsControlFrame> frame(framer.CreateSettings(settings)); CompareFrame(kDescription, diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc index 5230659..7fb9d2a 100644 --- a/net/spdy/spdy_protocol_test.cc +++ b/net/spdy/spdy_protocol_test.cc @@ -224,10 +224,10 @@ TEST_P(SpdyProtocolTest, TestSpdySettingsFrame) { // that they encode and decode properly. SettingsFlagsAndId ids[] = { SettingsFlagsAndId::FromWireFormat(spdy_version_, 0x00000000), - SettingsFlagsAndId::FromWireFormat(spdy_version_, 0xffffffff), - SettingsFlagsAndId::FromWireFormat(spdy_version_, 0xff000001), - SettingsFlagsAndId::FromWireFormat(spdy_version_, 0x01000002), - SettingsFlagsAndId(6, 9) + SettingsFlagsAndId::FromWireFormat(spdy_version_, 0x00010203), + SettingsFlagsAndId::FromWireFormat(spdy_version_, 0x01030402), + SettingsFlagsAndId::FromWireFormat(spdy_version_, 0x02030401), + SettingsFlagsAndId(3, 9) }; for (uint32 index = 0; index < arraysize(ids); ++index) { |