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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/loader/upload_data_stream_builder_unittest.cc

Issue 261993004: Allow BlobDataHandles to be copied, and have their UUIDs read, on any thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/fileapi/blob_storage_context_unittest.cc ('k') | webkit/browser/blob/blob_data_handle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/upload_data_stream_builder_unittest.cc
diff --git a/content/browser/loader/upload_data_stream_builder_unittest.cc b/content/browser/loader/upload_data_stream_builder_unittest.cc
index dba3dff4f0f234c4c6af59bfd984f3b075d614b5..67a57e3d9abf2845bf3c0383f9f24f903537e9d1 100644
--- a/content/browser/loader/upload_data_stream_builder_unittest.cc
+++ b/content/browser/loader/upload_data_stream_builder_unittest.cc
@@ -10,6 +10,7 @@
#include "base/files/file_path.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
+#include "base/run_loop.h"
#include "base/time/time.h"
#include "content/common/resource_request_body.h"
#include "net/base/upload_bytes_element_reader.h"
@@ -93,170 +94,214 @@ TEST(UploadDataStreamBuilderTest, CreateUploadDataStreamWithoutBlob) {
TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
base::MessageLoop message_loop;
- // Setup blob data for testing.
- base::Time time1, time2;
- base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1);
- base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2);
-
- BlobStorageContext blob_storage_context;
-
- const std::string blob_id0("id-0");
- scoped_refptr<BlobData> blob_data(new BlobData(blob_id0));
- scoped_ptr<BlobDataHandle> handle1 =
- blob_storage_context.AddFinishedBlob(blob_data);
-
- const std::string blob_id1("id-1");
- blob_data = new BlobData(blob_id1);
- blob_data->AppendData("BlobData");
- blob_data->AppendFile(
- base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1);
- scoped_ptr<BlobDataHandle> handle2 =
- blob_storage_context.AddFinishedBlob(blob_data);
-
- // Setup upload data elements for comparison.
- ResourceRequestBody::Element blob_element1, blob_element2;
- blob_element1.SetToBytes(
- blob_data->items().at(0).bytes() +
- static_cast<int>(blob_data->items().at(0).offset()),
- static_cast<int>(blob_data->items().at(0).length()));
- blob_element2.SetToFilePathRange(
- blob_data->items().at(1).path(),
- blob_data->items().at(1).offset(),
- blob_data->items().at(1).length(),
- blob_data->items().at(1).expected_modification_time());
-
- ResourceRequestBody::Element upload_element1, upload_element2;
- upload_element1.SetToBytes("Hello", 5);
- upload_element2.SetToFilePathRange(
- base::FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2);
-
- // Test no blob reference.
- scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
- request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
- request_body->AppendFileRange(upload_element2.path(),
- upload_element2.offset(),
- upload_element2.length(),
- upload_element2.expected_modification_time());
-
- scoped_ptr<net::UploadDataStream> upload(
- UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get()));
-
- ASSERT_EQ(2U, upload->element_readers().size());
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], upload_element2));
-
- // Test having only one blob reference that refers to empty blob data.
- request_body = new ResourceRequestBody();
- request_body->AppendBlob(blob_id0);
-
- upload =
- UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
- ASSERT_EQ(0U, upload->element_readers().size());
-
- // Test having only one blob reference.
- request_body = new ResourceRequestBody();
- request_body->AppendBlob(blob_id1);
-
- upload =
- UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
- ASSERT_EQ(2U, upload->element_readers().size());
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
-
- // Test having one blob reference at the beginning.
- request_body = new ResourceRequestBody();
- request_body->AppendBlob(blob_id1);
- request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
- request_body->AppendFileRange(upload_element2.path(),
- upload_element2.offset(),
- upload_element2.length(),
- upload_element2.expected_modification_time());
-
- upload =
- UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
- ASSERT_EQ(4U, upload->element_readers().size());
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], upload_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], upload_element2));
-
- // Test having one blob reference at the end.
- request_body = new ResourceRequestBody();
- request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
- request_body->AppendFileRange(upload_element2.path(),
- upload_element2.offset(),
- upload_element2.length(),
- upload_element2.expected_modification_time());
- request_body->AppendBlob(blob_id1);
-
- upload =
- UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
- ASSERT_EQ(4U, upload->element_readers().size());
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], upload_element2));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], blob_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], blob_element2));
-
- // Test having one blob reference in the middle.
- request_body = new ResourceRequestBody();
- request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
- request_body->AppendBlob(blob_id1);
- request_body->AppendFileRange(upload_element2.path(),
- upload_element2.offset(),
- upload_element2.length(),
- upload_element2.expected_modification_time());
-
- upload =
- UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
- ASSERT_EQ(4U, upload->element_readers().size());
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], blob_element2));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], upload_element2));
-
- // Test having multiple blob references.
- request_body = new ResourceRequestBody();
- request_body->AppendBlob(blob_id1);
- request_body->AppendBytes(upload_element1.bytes(), upload_element1.length());
- request_body->AppendBlob(blob_id1);
- request_body->AppendBlob(blob_id1);
- request_body->AppendFileRange(upload_element2.path(),
- upload_element2.offset(),
- upload_element2.length(),
- upload_element2.expected_modification_time());
-
- upload =
- UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
- ASSERT_EQ(8U, upload->element_readers().size());
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], upload_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], blob_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[4], blob_element2));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[5], blob_element1));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[6], blob_element2));
- EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[7], upload_element2));
+ {
+ // Setup blob data for testing.
+ base::Time time1, time2;
+ base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1);
+ base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2);
+
+ BlobStorageContext blob_storage_context;
+
+ const std::string blob_id0("id-0");
+ scoped_refptr<BlobData> blob_data(new BlobData(blob_id0));
+ scoped_ptr<BlobDataHandle> handle1 =
+ blob_storage_context.AddFinishedBlob(blob_data);
+
+ const std::string blob_id1("id-1");
+ blob_data = new BlobData(blob_id1);
+ blob_data->AppendData("BlobData");
+ blob_data->AppendFile(
+ base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1);
+ scoped_ptr<BlobDataHandle> handle2 =
+ blob_storage_context.AddFinishedBlob(blob_data);
+
+ // Setup upload data elements for comparison.
+ ResourceRequestBody::Element blob_element1, blob_element2;
+ blob_element1.SetToBytes(
+ blob_data->items().at(0).bytes() +
+ static_cast<int>(blob_data->items().at(0).offset()),
+ static_cast<int>(blob_data->items().at(0).length()));
+ blob_element2.SetToFilePathRange(
+ blob_data->items().at(1).path(),
+ blob_data->items().at(1).offset(),
+ blob_data->items().at(1).length(),
+ blob_data->items().at(1).expected_modification_time());
+
+ ResourceRequestBody::Element upload_element1, upload_element2;
+ upload_element1.SetToBytes("Hello", 5);
+ upload_element2.SetToFilePathRange(
+ base::FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2);
+
+ // Test no blob reference.
+ scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.length());
+ request_body->AppendFileRange(
+ upload_element2.path(),
+ upload_element2.offset(),
+ upload_element2.length(),
+ upload_element2.expected_modification_time());
+
+ scoped_ptr<net::UploadDataStream> upload(
+ UploadDataStreamBuilder::Build(
+ request_body.get(),
+ &blob_storage_context,
+ NULL,
+ base::MessageLoopProxy::current().get()));
+
+ ASSERT_EQ(2U, upload->element_readers().size());
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[0], upload_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[1], upload_element2));
+
+ // Test having only one blob reference that refers to empty blob data.
+ request_body = new ResourceRequestBody();
+ request_body->AppendBlob(blob_id0);
+
+ upload = UploadDataStreamBuilder::Build(
+ request_body.get(),
+ &blob_storage_context,
+ NULL,
+ base::MessageLoopProxy::current().get());
+ ASSERT_EQ(0U, upload->element_readers().size());
+
+ // Test having only one blob reference.
+ request_body = new ResourceRequestBody();
+ request_body->AppendBlob(blob_id1);
+
+ upload = UploadDataStreamBuilder::Build(
+ request_body.get(),
+ &blob_storage_context,
+ NULL,
+ base::MessageLoopProxy::current().get());
+ ASSERT_EQ(2U, upload->element_readers().size());
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[0], blob_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[1], blob_element2));
+
+ // Test having one blob reference at the beginning.
+ request_body = new ResourceRequestBody();
+ request_body->AppendBlob(blob_id1);
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.length());
+ request_body->AppendFileRange(
+ upload_element2.path(),
+ upload_element2.offset(),
+ upload_element2.length(),
+ upload_element2.expected_modification_time());
+
+ upload = UploadDataStreamBuilder::Build(
+ request_body.get(),
+ &blob_storage_context,
+ NULL,
+ base::MessageLoopProxy::current().get());
+ ASSERT_EQ(4U, upload->element_readers().size());
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[0], blob_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[1], blob_element2));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[2], upload_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[3], upload_element2));
+
+ // Test having one blob reference at the end.
+ request_body = new ResourceRequestBody();
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.length());
+ request_body->AppendFileRange(
+ upload_element2.path(),
+ upload_element2.offset(),
+ upload_element2.length(),
+ upload_element2.expected_modification_time());
+ request_body->AppendBlob(blob_id1);
+
+ upload =
+ UploadDataStreamBuilder::Build(request_body.get(),
+ &blob_storage_context,
+ NULL,
+ base::MessageLoopProxy::current().get());
+ ASSERT_EQ(4U, upload->element_readers().size());
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[0], upload_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[1], upload_element2));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[2], blob_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[3], blob_element2));
+
+ // Test having one blob reference in the middle.
+ request_body = new ResourceRequestBody();
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.length());
+ request_body->AppendBlob(blob_id1);
+ request_body->AppendFileRange(
+ upload_element2.path(),
+ upload_element2.offset(),
+ upload_element2.length(),
+ upload_element2.expected_modification_time());
+
+ upload = UploadDataStreamBuilder::Build(
+ request_body.get(),
+ &blob_storage_context,
+ NULL,
+ base::MessageLoopProxy::current().get());
+ ASSERT_EQ(4U, upload->element_readers().size());
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[0], upload_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[1], blob_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[2], blob_element2));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[3], upload_element2));
+
+ // Test having multiple blob references.
+ request_body = new ResourceRequestBody();
+ request_body->AppendBlob(blob_id1);
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.length());
+ request_body->AppendBlob(blob_id1);
+ request_body->AppendBlob(blob_id1);
+ request_body->AppendFileRange(
+ upload_element2.path(),
+ upload_element2.offset(),
+ upload_element2.length(),
+ upload_element2.expected_modification_time());
+
+ upload = UploadDataStreamBuilder::Build(
+ request_body.get(),
+ &blob_storage_context,
+ NULL,
+ base::MessageLoopProxy::current().get());
+ ASSERT_EQ(8U, upload->element_readers().size());
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[0], blob_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[1], blob_element2));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[2], upload_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[3], blob_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[4], blob_element2));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[5], blob_element1));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[6], blob_element2));
+ EXPECT_TRUE(AreElementsEqual(
+ *upload->element_readers()[7], upload_element2));
+ }
+ // Clean up for ASAN.
+ base::RunLoop().RunUntilIdle();
}
} // namespace content
« no previous file with comments | « content/browser/fileapi/blob_storage_context_unittest.cc ('k') | webkit/browser/blob/blob_data_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698