| OLD | NEW |
| 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 "webkit/glue/resource_request_body.h" | 5 #include "webkit/glue/resource_request_body.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 return false; | 52 return false; |
| 53 } | 53 } |
| 54 | 54 |
| 55 } // namespace | 55 } // namespace |
| 56 | 56 |
| 57 TEST(ResourceRequestBodyTest, CreateUploadDataStreamWithoutBlob) { | 57 TEST(ResourceRequestBodyTest, CreateUploadDataStreamWithoutBlob) { |
| 58 MessageLoop message_loop; | 58 MessageLoop message_loop; |
| 59 scoped_refptr<ResourceRequestBody> request_body = new ResourceRequestBody; | 59 scoped_refptr<ResourceRequestBody> request_body = new ResourceRequestBody; |
| 60 | 60 |
| 61 const char kData[] = "123"; | 61 const char kData[] = "123"; |
| 62 const FilePath::StringType kFilePath = FILE_PATH_LITERAL("abc"); | 62 const base::FilePath::StringType kFilePath = FILE_PATH_LITERAL("abc"); |
| 63 const uint64 kFileOffset = 10U; | 63 const uint64 kFileOffset = 10U; |
| 64 const uint64 kFileLength = 100U; | 64 const uint64 kFileLength = 100U; |
| 65 const base::Time kFileTime = base::Time::FromDoubleT(999); | 65 const base::Time kFileTime = base::Time::FromDoubleT(999); |
| 66 const int64 kIdentifier = 12345; | 66 const int64 kIdentifier = 12345; |
| 67 | 67 |
| 68 request_body->AppendBytes(kData, arraysize(kData) - 1); | 68 request_body->AppendBytes(kData, arraysize(kData) - 1); |
| 69 request_body->AppendFileRange(FilePath(kFilePath), | 69 request_body->AppendFileRange(base::FilePath(kFilePath), |
| 70 kFileOffset, kFileLength, kFileTime); | 70 kFileOffset, kFileLength, kFileTime); |
| 71 request_body->set_identifier(kIdentifier); | 71 request_body->set_identifier(kIdentifier); |
| 72 | 72 |
| 73 scoped_ptr<net::UploadDataStream> upload( | 73 scoped_ptr<net::UploadDataStream> upload( |
| 74 request_body->ResolveElementsAndCreateUploadDataStream( | 74 request_body->ResolveElementsAndCreateUploadDataStream( |
| 75 NULL, NULL, base::MessageLoopProxy::current())); | 75 NULL, NULL, base::MessageLoopProxy::current())); |
| 76 | 76 |
| 77 EXPECT_EQ(kIdentifier, upload->identifier()); | 77 EXPECT_EQ(kIdentifier, upload->identifier()); |
| 78 ASSERT_EQ(request_body->elements()->size(), upload->element_readers().size()); | 78 ASSERT_EQ(request_body->elements()->size(), upload->element_readers().size()); |
| 79 | 79 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 99 base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2); | 99 base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2); |
| 100 | 100 |
| 101 BlobStorageController blob_storage_controller; | 101 BlobStorageController blob_storage_controller; |
| 102 scoped_refptr<BlobData> blob_data(new BlobData()); | 102 scoped_refptr<BlobData> blob_data(new BlobData()); |
| 103 | 103 |
| 104 GURL blob_url0("blob://url_0"); | 104 GURL blob_url0("blob://url_0"); |
| 105 blob_storage_controller.AddFinishedBlob(blob_url0, blob_data); | 105 blob_storage_controller.AddFinishedBlob(blob_url0, blob_data); |
| 106 | 106 |
| 107 blob_data->AppendData("BlobData"); | 107 blob_data->AppendData("BlobData"); |
| 108 blob_data->AppendFile( | 108 blob_data->AppendFile( |
| 109 FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1); | 109 base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1); |
| 110 | 110 |
| 111 GURL blob_url1("blob://url_1"); | 111 GURL blob_url1("blob://url_1"); |
| 112 blob_storage_controller.AddFinishedBlob(blob_url1, blob_data); | 112 blob_storage_controller.AddFinishedBlob(blob_url1, blob_data); |
| 113 | 113 |
| 114 GURL blob_url2("blob://url_2"); | 114 GURL blob_url2("blob://url_2"); |
| 115 blob_storage_controller.CloneBlob(blob_url2, blob_url1); | 115 blob_storage_controller.CloneBlob(blob_url2, blob_url1); |
| 116 | 116 |
| 117 GURL blob_url3("blob://url_3"); | 117 GURL blob_url3("blob://url_3"); |
| 118 blob_storage_controller.CloneBlob(blob_url3, blob_url2); | 118 blob_storage_controller.CloneBlob(blob_url3, blob_url2); |
| 119 | 119 |
| 120 // Setup upload data elements for comparison. | 120 // Setup upload data elements for comparison. |
| 121 ResourceRequestBody::Element blob_element1, blob_element2; | 121 ResourceRequestBody::Element blob_element1, blob_element2; |
| 122 blob_element1.SetToBytes( | 122 blob_element1.SetToBytes( |
| 123 blob_data->items().at(0).bytes() + | 123 blob_data->items().at(0).bytes() + |
| 124 static_cast<int>(blob_data->items().at(0).offset()), | 124 static_cast<int>(blob_data->items().at(0).offset()), |
| 125 static_cast<int>(blob_data->items().at(0).length())); | 125 static_cast<int>(blob_data->items().at(0).length())); |
| 126 blob_element2.SetToFilePathRange( | 126 blob_element2.SetToFilePathRange( |
| 127 blob_data->items().at(1).path(), | 127 blob_data->items().at(1).path(), |
| 128 blob_data->items().at(1).offset(), | 128 blob_data->items().at(1).offset(), |
| 129 blob_data->items().at(1).length(), | 129 blob_data->items().at(1).length(), |
| 130 blob_data->items().at(1).expected_modification_time()); | 130 blob_data->items().at(1).expected_modification_time()); |
| 131 | 131 |
| 132 ResourceRequestBody::Element upload_element1, upload_element2; | 132 ResourceRequestBody::Element upload_element1, upload_element2; |
| 133 upload_element1.SetToBytes("Hello", 5); | 133 upload_element1.SetToBytes("Hello", 5); |
| 134 upload_element2.SetToFilePathRange( | 134 upload_element2.SetToFilePathRange( |
| 135 FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2); | 135 base::FilePath(FILE_PATH_LITERAL("foo1.txt")), 0, 20, time2); |
| 136 | 136 |
| 137 // Test no blob reference. | 137 // Test no blob reference. |
| 138 scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody()); | 138 scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody()); |
| 139 request_body->AppendBytes(upload_element1.bytes(), upload_element1.length()); | 139 request_body->AppendBytes(upload_element1.bytes(), upload_element1.length()); |
| 140 request_body->AppendFileRange(upload_element2.path(), | 140 request_body->AppendFileRange(upload_element2.path(), |
| 141 upload_element2.offset(), | 141 upload_element2.offset(), |
| 142 upload_element2.length(), | 142 upload_element2.length(), |
| 143 upload_element2.expected_modification_time()); | 143 upload_element2.expected_modification_time()); |
| 144 | 144 |
| 145 scoped_ptr<net::UploadDataStream> upload( | 145 scoped_ptr<net::UploadDataStream> upload( |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2)); | 237 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2)); |
| 238 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], upload_element1)); | 238 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[2], upload_element1)); |
| 239 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], blob_element1)); | 239 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[3], blob_element1)); |
| 240 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[4], blob_element2)); | 240 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[4], blob_element2)); |
| 241 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[5], blob_element1)); | 241 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[5], blob_element1)); |
| 242 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[6], blob_element2)); | 242 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[6], blob_element2)); |
| 243 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[7], upload_element2)); | 243 EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[7], upload_element2)); |
| 244 } | 244 } |
| 245 | 245 |
| 246 } // namespace webkit_glue | 246 } // namespace webkit_glue |
| OLD | NEW |