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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/blob/blob_storage_controller_unittest.cc

Issue 10834289: Split net::UploadData into two: for IPC and for upload handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years, 4 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
« webkit/blob/blob_storage_controller.cc ('K') | « webkit/blob/blob_storage_controller.cc ('k') | webkit/glue/resource_loader_bridge.h » ('j') | webkit/glue/resource_request_body.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/blob/blob_storage_controller_unittest.cc
diff --git a/webkit/blob/blob_storage_controller_unittest.cc b/webkit/blob/blob_storage_controller_unittest.cc
index f98f449a205d530281074fce246c855a40851174..bfcaab70b9775873e946ef0c9eac5981eddf57a2 100644
--- a/webkit/blob/blob_storage_controller_unittest.cc
+++ b/webkit/blob/blob_storage_controller_unittest.cc
@@ -10,8 +10,9 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/blob/blob_data.h"
#include "webkit/blob/blob_storage_controller.h"
+#include "webkit/glue/resource_request_body.h"
-using net::UploadData;
+using webkit_glue::ResourceRequestBody;
namespace webkit_blob {
@@ -76,7 +77,7 @@ TEST(BlobStorageControllerTest, RegisterBlobUrl) {
EXPECT_TRUE(!blob_data_found);
}
-TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
+TEST(BlobStorageControllerTest, ResolveBlobReferencesInResourceRequestBody) {
// Setup blob data for testing.
base::Time time1, time2;
base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1);
@@ -102,7 +103,7 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
blob_storage_controller.CloneBlob(blob_url3, blob_url2);
// Setup upload data elements for comparison.
- UploadData::Element blob_element1, blob_element2;
+ ResourceRequestBody::Element blob_element1, blob_element2;
blob_element1.SetToBytes(
blob_data->items().at(0).data.c_str() +
static_cast<int>(blob_data->items().at(0).offset),
@@ -113,124 +114,131 @@ TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) {
blob_data->items().at(1).length,
blob_data->items().at(1).expected_modification_time);
- UploadData::Element upload_element1, upload_element2;
+ ResourceRequestBody::Element upload_element1, upload_element2;
upload_element1.SetToBytes("Hello", 5);
upload_element2.SetToFilePathRange(
FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2);
// Test no blob reference.
- scoped_refptr<UploadData> upload_data(new UploadData());
- upload_data->AppendBytes(
- &upload_element1.bytes().at(0),
- upload_element1.bytes().size());
- upload_data->AppendFileRange(
+ scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.bytes_length());
+ request_body->AppendFileRange(
upload_element2.file_path(),
upload_element2.file_range_offset(),
upload_element2.file_range_length(),
upload_element2.expected_file_modification_time());
- blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
- ASSERT_EQ(upload_data->elements()->size(), 2U);
- EXPECT_TRUE(upload_data->elements()->at(0) == upload_element1);
- EXPECT_TRUE(upload_data->elements()->at(1) == upload_element2);
+ blob_storage_controller.ResolveBlobReferencesInResourceRequestBody(
+ request_body.get());
+ ASSERT_EQ(request_body->elements()->size(), 2U);
+ EXPECT_TRUE(request_body->elements()->at(0) == upload_element1);
+ EXPECT_TRUE(request_body->elements()->at(1) == upload_element2);
// Test having only one blob reference that refers to empty blob data.
- upload_data = new UploadData();
- upload_data->AppendBlob(blob_url0);
+ request_body = new ResourceRequestBody();
+ request_body->AppendBlob(blob_url0);
- blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
- ASSERT_EQ(upload_data->elements()->size(), 0U);
+ blob_storage_controller.ResolveBlobReferencesInResourceRequestBody(
+ request_body.get());
+ ASSERT_EQ(request_body->elements()->size(), 0U);
// Test having only one blob reference.
- upload_data = new UploadData();
- upload_data->AppendBlob(blob_url1);
+ request_body = new ResourceRequestBody();
+ request_body->AppendBlob(blob_url1);
- blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
- ASSERT_EQ(upload_data->elements()->size(), 2U);
- EXPECT_TRUE(upload_data->elements()->at(0) == blob_element1);
- EXPECT_TRUE(upload_data->elements()->at(1) == blob_element2);
+ blob_storage_controller.ResolveBlobReferencesInResourceRequestBody(
+ request_body.get());
+ ASSERT_EQ(request_body->elements()->size(), 2U);
+ EXPECT_TRUE(request_body->elements()->at(0) == blob_element1);
+ EXPECT_TRUE(request_body->elements()->at(1) == blob_element2);
// Test having one blob reference at the beginning.
- upload_data = new UploadData();
- upload_data->AppendBlob(blob_url1);
- upload_data->AppendBytes(
- &upload_element1.bytes().at(0),
- upload_element1.bytes().size());
- upload_data->AppendFileRange(
+ request_body = new ResourceRequestBody();
+ request_body->AppendBlob(blob_url1);
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.bytes_length());
+ request_body->AppendFileRange(
upload_element2.file_path(),
upload_element2.file_range_offset(),
upload_element2.file_range_length(),
upload_element2.expected_file_modification_time());
- blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
- ASSERT_EQ(upload_data->elements()->size(), 4U);
- EXPECT_TRUE(upload_data->elements()->at(0) == blob_element1);
- EXPECT_TRUE(upload_data->elements()->at(1) == blob_element2);
- EXPECT_TRUE(upload_data->elements()->at(2) == upload_element1);
- EXPECT_TRUE(upload_data->elements()->at(3) == upload_element2);
+ blob_storage_controller.ResolveBlobReferencesInResourceRequestBody(
+ request_body.get());
+ ASSERT_EQ(request_body->elements()->size(), 4U);
+ EXPECT_TRUE(request_body->elements()->at(0) == blob_element1);
+ EXPECT_TRUE(request_body->elements()->at(1) == blob_element2);
+ EXPECT_TRUE(request_body->elements()->at(2) == upload_element1);
+ EXPECT_TRUE(request_body->elements()->at(3) == upload_element2);
// Test having one blob reference at the end.
- upload_data = new UploadData();
- upload_data->AppendBytes(
- &upload_element1.bytes().at(0),
- upload_element1.bytes().size());
- upload_data->AppendFileRange(
+ request_body = new ResourceRequestBody();
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.bytes_length());
+ request_body->AppendFileRange(
upload_element2.file_path(),
upload_element2.file_range_offset(),
upload_element2.file_range_length(),
upload_element2.expected_file_modification_time());
- upload_data->AppendBlob(blob_url1);
+ request_body->AppendBlob(blob_url1);
- blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
- ASSERT_EQ(upload_data->elements()->size(), 4U);
- EXPECT_TRUE(upload_data->elements()->at(0) == upload_element1);
- EXPECT_TRUE(upload_data->elements()->at(1) == upload_element2);
- EXPECT_TRUE(upload_data->elements()->at(2) == blob_element1);
- EXPECT_TRUE(upload_data->elements()->at(3) == blob_element2);
+ blob_storage_controller.ResolveBlobReferencesInResourceRequestBody(
+ request_body.get());
+ ASSERT_EQ(request_body->elements()->size(), 4U);
+ EXPECT_TRUE(request_body->elements()->at(0) == upload_element1);
+ EXPECT_TRUE(request_body->elements()->at(1) == upload_element2);
+ EXPECT_TRUE(request_body->elements()->at(2) == blob_element1);
+ EXPECT_TRUE(request_body->elements()->at(3) == blob_element2);
// Test having one blob reference in the middle.
- upload_data = new UploadData();
- upload_data->AppendBytes(
- &upload_element1.bytes().at(0),
- upload_element1.bytes().size());
- upload_data->AppendBlob(blob_url1);
- upload_data->AppendFileRange(
+ request_body = new ResourceRequestBody();
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.bytes_length());
+ request_body->AppendBlob(blob_url1);
+ request_body->AppendFileRange(
upload_element2.file_path(),
upload_element2.file_range_offset(),
upload_element2.file_range_length(),
upload_element2.expected_file_modification_time());
- blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
- ASSERT_EQ(upload_data->elements()->size(), 4U);
- EXPECT_TRUE(upload_data->elements()->at(0) == upload_element1);
- EXPECT_TRUE(upload_data->elements()->at(1) == blob_element1);
- EXPECT_TRUE(upload_data->elements()->at(2) == blob_element2);
- EXPECT_TRUE(upload_data->elements()->at(3) == upload_element2);
+ blob_storage_controller.ResolveBlobReferencesInResourceRequestBody(
+ request_body.get());
+ ASSERT_EQ(request_body->elements()->size(), 4U);
+ EXPECT_TRUE(request_body->elements()->at(0) == upload_element1);
+ EXPECT_TRUE(request_body->elements()->at(1) == blob_element1);
+ EXPECT_TRUE(request_body->elements()->at(2) == blob_element2);
+ EXPECT_TRUE(request_body->elements()->at(3) == upload_element2);
// Test having multiple blob references.
- upload_data = new UploadData();
- upload_data->AppendBlob(blob_url1);
- upload_data->AppendBytes(
- &upload_element1.bytes().at(0),
- upload_element1.bytes().size());
- upload_data->AppendBlob(blob_url2);
- upload_data->AppendBlob(blob_url3);
- upload_data->AppendFileRange(
+ request_body = new ResourceRequestBody();
+ request_body->AppendBlob(blob_url1);
+ request_body->AppendBytes(
+ upload_element1.bytes(),
+ upload_element1.bytes_length());
+ request_body->AppendBlob(blob_url2);
+ request_body->AppendBlob(blob_url3);
+ request_body->AppendFileRange(
upload_element2.file_path(),
upload_element2.file_range_offset(),
upload_element2.file_range_length(),
upload_element2.expected_file_modification_time());
- blob_storage_controller.ResolveBlobReferencesInUploadData(upload_data.get());
- ASSERT_EQ(upload_data->elements()->size(), 8U);
- EXPECT_TRUE(upload_data->elements()->at(0) == blob_element1);
- EXPECT_TRUE(upload_data->elements()->at(1) == blob_element2);
- EXPECT_TRUE(upload_data->elements()->at(2) == upload_element1);
- EXPECT_TRUE(upload_data->elements()->at(3) == blob_element1);
- EXPECT_TRUE(upload_data->elements()->at(4) == blob_element2);
- EXPECT_TRUE(upload_data->elements()->at(5) == blob_element1);
- EXPECT_TRUE(upload_data->elements()->at(6) == blob_element2);
- EXPECT_TRUE(upload_data->elements()->at(7) == upload_element2);
+ blob_storage_controller.ResolveBlobReferencesInResourceRequestBody(
+ request_body.get());
+ ASSERT_EQ(request_body->elements()->size(), 8U);
+ EXPECT_TRUE(request_body->elements()->at(0) == blob_element1);
+ EXPECT_TRUE(request_body->elements()->at(1) == blob_element2);
+ EXPECT_TRUE(request_body->elements()->at(2) == upload_element1);
+ EXPECT_TRUE(request_body->elements()->at(3) == blob_element1);
+ EXPECT_TRUE(request_body->elements()->at(4) == blob_element2);
+ EXPECT_TRUE(request_body->elements()->at(5) == blob_element1);
+ EXPECT_TRUE(request_body->elements()->at(6) == blob_element2);
+ EXPECT_TRUE(request_body->elements()->at(7) == upload_element2);
}
} // namespace webkit_blob
« webkit/blob/blob_storage_controller.cc ('K') | « webkit/blob/blob_storage_controller.cc ('k') | webkit/glue/resource_loader_bridge.h » ('j') | webkit/glue/resource_request_body.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698