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

Side by Side Diff: net/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc

Issue 2572343002: Use std::function instead of base::Callback in net/http2/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http2/decoder/payload_decoders/window_update_payload_decoder.h" 5 #include "net/http2/decoder/payload_decoders/window_update_payload_decoder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h"
10 #include "base/logging.h" 9 #include "base/logging.h"
11 #include "net/http2/decoder/frame_parts.h" 10 #include "net/http2/decoder/frame_parts.h"
12 #include "net/http2/decoder/frame_parts_collector.h" 11 #include "net/http2/decoder/frame_parts_collector.h"
13 #include "net/http2/decoder/http2_frame_decoder_listener.h" 12 #include "net/http2/decoder/http2_frame_decoder_listener.h"
14 #include "net/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" 13 #include "net/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
15 #include "net/http2/http2_constants.h" 14 #include "net/http2/http2_constants.h"
16 #include "net/http2/http2_structures_test_util.h" 15 #include "net/http2/http2_structures_test_util.h"
17 #include "net/http2/tools/http2_frame_builder.h" 16 #include "net/http2/tools/http2_frame_builder.h"
18 #include "net/http2/tools/http2_random.h" 17 #include "net/http2/tools/http2_random.h"
19 #include "net/http2/tools/random_decoder_test.h" 18 #include "net/http2/tools/random_decoder_test.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 void OnFrameSizeError(const Http2FrameHeader& header) override { 52 void OnFrameSizeError(const Http2FrameHeader& header) override {
54 VLOG(1) << "OnFrameSizeError: " << header; 53 VLOG(1) << "OnFrameSizeError: " << header;
55 FrameError(header)->OnFrameSizeError(header); 54 FrameError(header)->OnFrameSizeError(header);
56 } 55 }
57 }; 56 };
58 57
59 class WindowUpdatePayloadDecoderTest 58 class WindowUpdatePayloadDecoderTest
60 : public AbstractPayloadDecoderTest<WindowUpdatePayloadDecoder, 59 : public AbstractPayloadDecoderTest<WindowUpdatePayloadDecoder,
61 WindowUpdatePayloadDecoderPeer, 60 WindowUpdatePayloadDecoderPeer,
62 Listener> { 61 Listener> {
63 public:
64 static bool ApproveSizeForWrongSize(size_t size) {
65 return size != Http2WindowUpdateFields::EncodedSize();
66 }
67 62
68 protected: 63 protected:
69 Http2WindowUpdateFields RandWindowUpdateFields() { 64 Http2WindowUpdateFields RandWindowUpdateFields() {
70 Http2WindowUpdateFields fields; 65 Http2WindowUpdateFields fields;
71 test::Randomize(&fields, RandomPtr()); 66 test::Randomize(&fields, RandomPtr());
72 VLOG(3) << "RandWindowUpdateFields: " << fields; 67 VLOG(3) << "RandWindowUpdateFields: " << fields;
73 return fields; 68 return fields;
74 } 69 }
75 }; 70 };
76 71
77 // Confirm we get an error if the payload is not the correct size to hold 72 // Confirm we get an error if the payload is not the correct size to hold
78 // exactly one Http2WindowUpdateFields. 73 // exactly one Http2WindowUpdateFields.
79 TEST_F(WindowUpdatePayloadDecoderTest, WrongSize) { 74 TEST_F(WindowUpdatePayloadDecoderTest, WrongSize) {
75 auto approve_size = [](size_t size) {
76 return size != Http2WindowUpdateFields::EncodedSize();
77 };
80 Http2FrameBuilder fb; 78 Http2FrameBuilder fb;
81 fb.Append(RandWindowUpdateFields()); 79 fb.Append(RandWindowUpdateFields());
82 fb.Append(RandWindowUpdateFields()); 80 fb.Append(RandWindowUpdateFields());
83 fb.Append(RandWindowUpdateFields()); 81 fb.Append(RandWindowUpdateFields());
84 EXPECT_TRUE(VerifyDetectsFrameSizeError( 82 EXPECT_TRUE(VerifyDetectsFrameSizeError(0, fb.buffer(), approve_size));
85 0, fb.buffer(),
86 base::Bind(&WindowUpdatePayloadDecoderTest::ApproveSizeForWrongSize)));
87 } 83 }
88 84
89 TEST_F(WindowUpdatePayloadDecoderTest, VariousPayloads) { 85 TEST_F(WindowUpdatePayloadDecoderTest, VariousPayloads) {
90 for (int n = 0; n < 100; ++n) { 86 for (int n = 0; n < 100; ++n) {
91 uint32_t stream_id = n == 0 ? 0 : RandStreamId(); 87 uint32_t stream_id = n == 0 ? 0 : RandStreamId();
92 Http2WindowUpdateFields fields = RandWindowUpdateFields(); 88 Http2WindowUpdateFields fields = RandWindowUpdateFields();
93 Http2FrameBuilder fb; 89 Http2FrameBuilder fb;
94 fb.Append(fields); 90 fb.Append(fields);
95 Http2FrameHeader header(fb.size(), Http2FrameType::WINDOW_UPDATE, 91 Http2FrameHeader header(fb.size(), Http2FrameType::WINDOW_UPDATE,
96 RandFlags(), stream_id); 92 RandFlags(), stream_id);
97 set_frame_header(header); 93 set_frame_header(header);
98 FrameParts expected(header); 94 FrameParts expected(header);
99 expected.opt_window_update_increment = fields.window_size_increment; 95 expected.opt_window_update_increment = fields.window_size_increment;
100 EXPECT_TRUE(DecodePayloadAndValidateSeveralWays(fb.buffer(), expected)); 96 EXPECT_TRUE(DecodePayloadAndValidateSeveralWays(fb.buffer(), expected));
101 } 97 }
102 } 98 }
103 99
104 } // namespace 100 } // namespace
105 } // namespace test 101 } // namespace test
106 } // namespace net 102 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698