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

Side by Side Diff: webkit/media/buffered_resource_loader_unittest.cc

Issue 9854031: Replace size_t with int in a few media classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « webkit/media/buffered_data_source_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 last_position_ = last_position; 82 last_position_ = last_position;
83 83
84 url_loader_ = new NiceMock<MockWebURLLoader>(); 84 url_loader_ = new NiceMock<MockWebURLLoader>();
85 loader_.reset(new BufferedResourceLoader( 85 loader_.reset(new BufferedResourceLoader(
86 gurl_, first_position_, last_position_, 86 gurl_, first_position_, last_position_,
87 BufferedResourceLoader::kThresholdDefer, 0, 0, 87 BufferedResourceLoader::kThresholdDefer, 0, 0,
88 new media::MediaLog())); 88 new media::MediaLog()));
89 loader_->SetURLLoaderForTest(scoped_ptr<WebKit::WebURLLoader>(url_loader_)); 89 loader_->SetURLLoaderForTest(scoped_ptr<WebKit::WebURLLoader>(url_loader_));
90 } 90 }
91 91
92 void SetLoaderBuffer(size_t forward_capacity, size_t backward_capacity) { 92 void SetLoaderBuffer(int forward_capacity, int backward_capacity) {
93 loader_->buffer_.reset( 93 loader_->buffer_.reset(
94 new media::SeekableBuffer(backward_capacity, forward_capacity)); 94 new media::SeekableBuffer(backward_capacity, forward_capacity));
95 } 95 }
96 96
97 void Start() { 97 void Start() {
98 InSequence s; 98 InSequence s;
99 EXPECT_CALL(*url_loader_, loadAsynchronously(Truly(CorrectAcceptEncoding), 99 EXPECT_CALL(*url_loader_, loadAsynchronously(Truly(CorrectAcceptEncoding),
100 loader_.get())); 100 loader_.get()));
101 loader_->Start( 101 loader_->Start(
102 base::Bind(&BufferedResourceLoaderTest::StartCallback, 102 base::Bind(&BufferedResourceLoaderTest::StartCallback,
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 void WriteData(int size) { 207 void WriteData(int size) {
208 EXPECT_CALL(*this, NetworkCallback()) 208 EXPECT_CALL(*this, NetworkCallback())
209 .RetiresOnSaturation(); 209 .RetiresOnSaturation();
210 210
211 scoped_array<char> data(new char[size]); 211 scoped_array<char> data(new char[size]);
212 loader_->didReceiveData(url_loader_, data.get(), size, size); 212 loader_->didReceiveData(url_loader_, data.get(), size, size);
213 } 213 }
214 214
215 void WriteUntilThreshold() { 215 void WriteUntilThreshold() {
216 size_t buffered = loader_->buffer_->forward_bytes(); 216 int buffered = loader_->buffer_->forward_bytes();
217 size_t capacity = loader_->buffer_->forward_capacity(); 217 int capacity = loader_->buffer_->forward_capacity();
218 CHECK_LT(buffered, capacity); 218 CHECK_LT(buffered, capacity);
219 219
220 EXPECT_CALL(*this, NetworkCallback()); 220 EXPECT_CALL(*this, NetworkCallback());
221 WriteData(capacity - buffered); 221 WriteData(capacity - buffered);
222 ConfirmLoaderDeferredState(true); 222 ConfirmLoaderDeferredState(true);
223 } 223 }
224 224
225 // Helper method to read from |loader_|. 225 // Helper method to read from |loader_|.
226 void ReadLoader(int64 position, int size, uint8* buffer) { 226 void ReadLoader(int64 position, int size, uint8* buffer) {
227 loader_->Read(position, size, buffer, 227 loader_->Read(position, size, buffer,
228 base::Bind(&BufferedResourceLoaderTest::ReadCallback, 228 base::Bind(&BufferedResourceLoaderTest::ReadCallback,
229 base::Unretained(this))); 229 base::Unretained(this)));
230 } 230 }
231 231
232 // Verifies that data in buffer[0...size] is equal to data_[pos...pos+size]. 232 // Verifies that data in buffer[0...size] is equal to data_[pos...pos+size].
233 void VerifyBuffer(uint8* buffer, int pos, int size) { 233 void VerifyBuffer(uint8* buffer, int pos, int size) {
234 EXPECT_EQ(0, memcmp(buffer, data_ + pos, size)); 234 EXPECT_EQ(0, memcmp(buffer, data_ + pos, size));
235 } 235 }
236 236
237 void ConfirmLoaderOffsets(int64 expected_offset, 237 void ConfirmLoaderOffsets(int64 expected_offset,
238 int expected_first_offset, 238 int expected_first_offset,
239 int expected_last_offset) { 239 int expected_last_offset) {
240 EXPECT_EQ(loader_->offset_, expected_offset); 240 EXPECT_EQ(loader_->offset_, expected_offset);
241 EXPECT_EQ(loader_->first_offset_, expected_first_offset); 241 EXPECT_EQ(loader_->first_offset_, expected_first_offset);
242 EXPECT_EQ(loader_->last_offset_, expected_last_offset); 242 EXPECT_EQ(loader_->last_offset_, expected_last_offset);
243 } 243 }
244 244
245 void ConfirmBufferState(size_t backward_bytes, 245 void ConfirmBufferState(int backward_bytes,
246 size_t backward_capacity, 246 int backward_capacity,
247 size_t forward_bytes, 247 int forward_bytes,
248 size_t forward_capacity) { 248 int forward_capacity) {
249 EXPECT_EQ(backward_bytes, loader_->buffer_->backward_bytes()); 249 EXPECT_EQ(backward_bytes, loader_->buffer_->backward_bytes());
250 EXPECT_EQ(backward_capacity, loader_->buffer_->backward_capacity()); 250 EXPECT_EQ(backward_capacity, loader_->buffer_->backward_capacity());
251 EXPECT_EQ(forward_bytes, loader_->buffer_->forward_bytes()); 251 EXPECT_EQ(forward_bytes, loader_->buffer_->forward_bytes());
252 EXPECT_EQ(forward_capacity, loader_->buffer_->forward_capacity()); 252 EXPECT_EQ(forward_capacity, loader_->buffer_->forward_capacity());
253 } 253 }
254 254
255 void ConfirmLoaderBufferBackwardCapacity(size_t expected_backward_capacity) { 255 void ConfirmLoaderBufferBackwardCapacity(int expected_backward_capacity) {
256 EXPECT_EQ(loader_->buffer_->backward_capacity(), 256 EXPECT_EQ(loader_->buffer_->backward_capacity(),
257 expected_backward_capacity); 257 expected_backward_capacity);
258 } 258 }
259 259
260 void ConfirmLoaderBufferForwardCapacity(size_t expected_forward_capacity) { 260 void ConfirmLoaderBufferForwardCapacity(int expected_forward_capacity) {
261 EXPECT_EQ(loader_->buffer_->forward_capacity(), expected_forward_capacity); 261 EXPECT_EQ(loader_->buffer_->forward_capacity(), expected_forward_capacity);
262 } 262 }
263 263
264 void ConfirmLoaderDeferredState(bool expectedVal) { 264 void ConfirmLoaderDeferredState(bool expectedVal) {
265 EXPECT_EQ(loader_->active_loader_->deferred(), expectedVal); 265 EXPECT_EQ(loader_->active_loader_->deferred(), expectedVal);
266 } 266 }
267 267
268 // Makes sure the |loader_| buffer window is in a reasonable range. 268 // Makes sure the |loader_| buffer window is in a reasonable range.
269 void CheckBufferWindowBounds() { 269 void CheckBufferWindowBounds() {
270 // Corresponds to value defined in buffered_resource_loader.cc. 270 // Corresponds to value defined in buffered_resource_loader.cc.
271 static const size_t kMinBufferCapacity = 2 * 1024 * 1024; 271 static const int kMinBufferCapacity = 2 * 1024 * 1024;
272 EXPECT_GE(loader_->buffer_->forward_capacity(), kMinBufferCapacity); 272 EXPECT_GE(loader_->buffer_->forward_capacity(), kMinBufferCapacity);
273 EXPECT_GE(loader_->buffer_->backward_capacity(), kMinBufferCapacity); 273 EXPECT_GE(loader_->buffer_->backward_capacity(), kMinBufferCapacity);
274 274
275 // Corresponds to value defined in buffered_resource_loader.cc. 275 // Corresponds to value defined in buffered_resource_loader.cc.
276 static const size_t kMaxBufferCapacity = 20 * 1024 * 1024; 276 static const int kMaxBufferCapacity = 20 * 1024 * 1024;
277 EXPECT_LE(loader_->buffer_->forward_capacity(), kMaxBufferCapacity); 277 EXPECT_LE(loader_->buffer_->forward_capacity(), kMaxBufferCapacity);
278 EXPECT_LE(loader_->buffer_->backward_capacity(), kMaxBufferCapacity); 278 EXPECT_LE(loader_->buffer_->backward_capacity(), kMaxBufferCapacity);
279 } 279 }
280 280
281 MOCK_METHOD1(StartCallback, void(int error)); 281 MOCK_METHOD1(StartCallback, void(int error));
282 MOCK_METHOD1(ReadCallback, void(int error)); 282 MOCK_METHOD1(ReadCallback, void(int error));
283 MOCK_METHOD0(NetworkCallback, void()); 283 MOCK_METHOD0(NetworkCallback, void());
284 284
285 // Accessors for private variables on |loader_|. 285 // Accessors for private variables on |loader_|.
286 size_t forward_bytes() { return loader_->buffer_->forward_bytes(); } 286 int forward_bytes() { return loader_->buffer_->forward_bytes(); }
287 size_t forward_capacity() { return loader_->buffer_->forward_capacity(); } 287 int forward_capacity() { return loader_->buffer_->forward_capacity(); }
288 288
289 protected: 289 protected:
290 GURL gurl_; 290 GURL gurl_;
291 int64 first_position_; 291 int64 first_position_;
292 int64 last_position_; 292 int64 last_position_;
293 293
294 scoped_ptr<BufferedResourceLoader> loader_; 294 scoped_ptr<BufferedResourceLoader> loader_;
295 NiceMock<MockWebURLLoader>* url_loader_; 295 NiceMock<MockWebURLLoader>* url_loader_;
296 296
297 MockWebFrameClient client_; 297 MockWebFrameClient client_;
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 936
937 // POSTCONDITION 937 // POSTCONDITION
938 ConfirmBufferState(4, 10, 0, 10); 938 ConfirmBufferState(4, 10, 0, 10);
939 ConfirmLoaderOffsets(34, 0, 0); 939 ConfirmLoaderOffsets(34, 0, 0);
940 ConfirmLoaderDeferredState(false); 940 ConfirmLoaderDeferredState(false);
941 941
942 StopWhenLoad(); 942 StopWhenLoad();
943 } 943 }
944 944
945 TEST_F(BufferedResourceLoaderTest, Tricky_ReadPastThreshold) { 945 TEST_F(BufferedResourceLoaderTest, Tricky_ReadPastThreshold) {
946 const size_t kSize = 5 * 1024 * 1024; 946 const int kSize = 5 * 1024 * 1024;
947 const size_t kThreshold = 2 * 1024 * 1024; 947 const int kThreshold = 2 * 1024 * 1024;
948 948
949 Initialize(kHttpUrl, 10, kSize); 949 Initialize(kHttpUrl, 10, kSize);
950 SetLoaderBuffer(10, 10); 950 SetLoaderBuffer(10, 10);
951 Start(); 951 Start();
952 PartialResponse(10, kSize - 1, kSize); 952 PartialResponse(10, kSize - 1, kSize);
953 953
954 uint8 buffer[256]; 954 uint8 buffer[256];
955 InSequence s; 955 InSequence s;
956 956
957 // PRECONDITION 957 // PRECONDITION
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 ExpectContentRangeFailure("bytes 20-10/400"); 1147 ExpectContentRangeFailure("bytes 20-10/400");
1148 1148
1149 ExpectContentRangeSuccess("bytes 0-499/500", 0, 499, 500); 1149 ExpectContentRangeSuccess("bytes 0-499/500", 0, 499, 500);
1150 ExpectContentRangeSuccess("bytes 0-0/500", 0, 0, 500); 1150 ExpectContentRangeSuccess("bytes 0-0/500", 0, 0, 500);
1151 ExpectContentRangeSuccess("bytes 10-11/50", 10, 11, 50); 1151 ExpectContentRangeSuccess("bytes 10-11/50", 10, 11, 50);
1152 ExpectContentRangeSuccess("bytes 10-11/*", 10, 11, 1152 ExpectContentRangeSuccess("bytes 10-11/*", 10, 11,
1153 kPositionNotSpecified); 1153 kPositionNotSpecified);
1154 } 1154 }
1155 1155
1156 } // namespace webkit_media 1156 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/buffered_data_source_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698