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

Side by Side Diff: content/browser/loader/upload_data_stream_builder_unittest.cc

Issue 942633004: IndexedDB: Fixed support for empty blobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added bug for test re: Android Created 5 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/browser/loader/upload_data_stream_builder.h" 5 #include "content/browser/loader/upload_data_stream_builder.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string>
8 9
9 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
11 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
12 #include "base/message_loop/message_loop_proxy.h" 13 #include "base/message_loop/message_loop_proxy.h"
13 #include "base/run_loop.h" 14 #include "base/run_loop.h"
14 #include "base/time/time.h" 15 #include "base/time/time.h"
15 #include "content/common/resource_request_body.h" 16 #include "content/common/resource_request_body.h"
17 #include "net/base/io_buffer.h"
18 #include "net/base/net_errors.h"
19 #include "net/base/test_completion_callback.h"
16 #include "net/base/upload_bytes_element_reader.h" 20 #include "net/base/upload_bytes_element_reader.h"
17 #include "net/base/upload_data_stream.h" 21 #include "net/base/upload_data_stream.h"
18 #include "net/base/upload_file_element_reader.h" 22 #include "net/base/upload_file_element_reader.h"
19 #include "storage/browser/blob/blob_data_builder.h" 23 #include "storage/browser/blob/blob_data_builder.h"
20 #include "storage/browser/blob/blob_storage_context.h" 24 #include "storage/browser/blob/blob_storage_context.h"
21 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
22 #include "url/gurl.h" 26 #include "url/gurl.h"
23 27
24 using storage::BlobDataBuilder; 28 using storage::BlobDataBuilder;
25 using storage::BlobDataHandle; 29 using storage::BlobDataHandle;
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 *(*upload->GetElementReaders())[5], blob_element1)); 307 *(*upload->GetElementReaders())[5], blob_element1));
304 EXPECT_TRUE(AreElementsEqual( 308 EXPECT_TRUE(AreElementsEqual(
305 *(*upload->GetElementReaders())[6], blob_element2)); 309 *(*upload->GetElementReaders())[6], blob_element2));
306 EXPECT_TRUE(AreElementsEqual( 310 EXPECT_TRUE(AreElementsEqual(
307 *(*upload->GetElementReaders())[7], upload_element2)); 311 *(*upload->GetElementReaders())[7], upload_element2));
308 } 312 }
309 // Clean up for ASAN. 313 // Clean up for ASAN.
310 base::RunLoop().RunUntilIdle(); 314 base::RunLoop().RunUntilIdle();
311 } 315 }
312 316
317 TEST(UploadDataStreamBuilderTest,
318 WriteUploadDataStreamWithEmptyFileBackedBlob) {
319 base::MessageLoopForIO message_loop;
320 {
321 base::FilePath test_blob_path;
322 ASSERT_TRUE(base::CreateTemporaryFile(&test_blob_path));
323
324 const uint64_t kZeroLength = 0;
325 base::Time blob_time;
326 base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &blob_time);
327 ASSERT_TRUE(base::TouchFile(test_blob_path, blob_time, blob_time));
328
329 BlobStorageContext blob_storage_context;
330
331 // A blob created from an empty file added several times.
332 const std::string blob_id("id-0");
333 scoped_ptr<BlobDataBuilder> blob_data_builder(new BlobDataBuilder(blob_id));
334 blob_data_builder->AppendFile(test_blob_path, 0, kZeroLength, blob_time);
335 scoped_ptr<BlobDataHandle> handle =
336 blob_storage_context.AddFinishedBlob(blob_data_builder.get());
337
338 ResourceRequestBody::Element blob_element;
339 blob_element.SetToFilePathRange(test_blob_path, 0, kZeroLength, blob_time);
340
341 scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
342 scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
343 request_body.get(), &blob_storage_context, NULL,
344 base::MessageLoopProxy::current().get()));
345
346 request_body = new ResourceRequestBody();
347 request_body->AppendBlob(blob_id);
348 request_body->AppendBlob(blob_id);
349 request_body->AppendBlob(blob_id);
350
351 upload = UploadDataStreamBuilder::Build(
352 request_body.get(), &blob_storage_context, NULL,
353 base::MessageLoopProxy::current().get());
354 ASSERT_TRUE(upload->GetElementReaders());
355 const auto& readers = *upload->GetElementReaders();
356 ASSERT_EQ(3U, readers.size());
357 EXPECT_TRUE(AreElementsEqual(*readers[0], blob_element));
358 EXPECT_TRUE(AreElementsEqual(*readers[1], blob_element));
359 EXPECT_TRUE(AreElementsEqual(*readers[2], blob_element));
360
361 net::TestCompletionCallback init_callback;
362 ASSERT_EQ(net::ERR_IO_PENDING, upload->Init(init_callback.callback()));
363 EXPECT_EQ(net::OK, init_callback.WaitForResult());
364
365 EXPECT_EQ(kZeroLength, upload->size());
366
367 // Purposely (try to) read more than what is in the stream. If we try to
368 // read zero bytes then UploadDataStream::Read will fail a DCHECK.
369 int kBufferLength = kZeroLength + 1;
370 scoped_ptr<char[]> buffer(new char[kBufferLength]);
371 scoped_refptr<net::IOBuffer> io_buffer =
372 new net::WrappedIOBuffer(buffer.get());
373 net::TestCompletionCallback read_callback;
374 int result =
375 upload->Read(io_buffer.get(), kBufferLength, read_callback.callback());
376 EXPECT_EQ(static_cast<int>(kZeroLength), read_callback.GetResult(result));
377
378 base::DeleteFile(test_blob_path, false);
379 }
380 // Clean up for ASAN.
381 base::RunLoop().RunUntilIdle();
382 }
313 } // namespace content 383 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/indexed_db/indexed_db_context_impl.cc ('k') | content/test/data/indexeddb/empty_blob.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698