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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/child/blob_storage/blob_consolidation_unittest.cc

Issue 1414123002: [BlobAsync] Renderer support for blob file writing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blob-hookup
Patch Set: and one more rebase error :/ Created 4 years, 7 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/child/blob_storage/blob_consolidation.cc ('k') | content/child/blob_storage/blob_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/blob_storage/blob_consolidation_unittest.cc
diff --git a/content/child/blob_storage/blob_consolidation_unittest.cc b/content/child/blob_storage/blob_consolidation_unittest.cc
index 64824e92e8a82737594aba2d76250c8e659e05e6..ee1bfb0691582429124e0be20f76fe38037494a5 100644
--- a/content/child/blob_storage/blob_consolidation_unittest.cc
+++ b/content/child/blob_storage/blob_consolidation_unittest.cc
@@ -21,37 +21,37 @@ static blink::WebThreadSafeData CreateData(const std::string& str) {
}
TEST(BlobConsolidationTest, TestSegmentation) {
- BlobConsolidation consolidation;
- consolidation.AddDataItem(CreateData("12345"));
- EXPECT_EQ(5lu, consolidation.total_memory());
+ scoped_refptr<BlobConsolidation> consolidation(new BlobConsolidation());
+ consolidation->AddDataItem(CreateData("12345"));
+ EXPECT_EQ(5lu, consolidation->total_memory());
- const auto& items = consolidation.consolidated_items();
+ const auto& items = consolidation->consolidated_items();
EXPECT_EQ(1u, items.size());
EXPECT_EQ(5lu, items[0].length);
EXPECT_EQ(DataElement::TYPE_BYTES, items[0].type);
EXPECT_EQ(0lu, items[0].offset);
char memory[] = {'E'};
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 0, 1, memory));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 0, 1, memory));
EXPECT_EQ('1', memory[0]);
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 1, 1, memory));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 1, 1, memory));
EXPECT_EQ('2', memory[0]);
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 2, 1, memory));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 2, 1, memory));
EXPECT_EQ('3', memory[0]);
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 3, 1, memory));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 3, 1, memory));
EXPECT_EQ('4', memory[0]);
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 4, 1, memory));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 4, 1, memory));
EXPECT_EQ('5', memory[0]);
}
TEST(BlobConsolidationTest, TestConsolidation) {
- BlobConsolidation consolidation;
- consolidation.AddDataItem(CreateData("1"));
- consolidation.AddDataItem(CreateData("23"));
- consolidation.AddDataItem(CreateData("4"));
- EXPECT_EQ(4u, consolidation.total_memory());
+ scoped_refptr<BlobConsolidation> consolidation(new BlobConsolidation());
+ consolidation->AddDataItem(CreateData("1"));
+ consolidation->AddDataItem(CreateData("23"));
+ consolidation->AddDataItem(CreateData("4"));
+ EXPECT_EQ(4u, consolidation->total_memory());
- const auto& items = consolidation.consolidated_items();
+ const auto& items = consolidation->consolidated_items();
EXPECT_EQ(1u, items.size());
EXPECT_EQ(4lu, items[0].length);
EXPECT_EQ(DataElement::TYPE_BYTES, items[0].type);
@@ -59,19 +59,19 @@ TEST(BlobConsolidationTest, TestConsolidation) {
char memory[4];
EXPECT_EQ(ReadStatus::ERROR_OUT_OF_BOUNDS,
- consolidation.ReadMemory(0, 0, 5, memory));
+ consolidation->ReadMemory(0, 0, 5, memory));
EXPECT_EQ(ReadStatus::ERROR_OUT_OF_BOUNDS,
- consolidation.ReadMemory(1, 0, 4, memory));
+ consolidation->ReadMemory(1, 0, 4, memory));
EXPECT_EQ(ReadStatus::ERROR_OUT_OF_BOUNDS,
- consolidation.ReadMemory(0, 1, 4, memory));
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 0, 4, memory));
+ consolidation->ReadMemory(0, 1, 4, memory));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 0, 4, memory));
char expected_memory[] = {'1', '2', '3', '4'};
EXPECT_THAT(memory, testing::ElementsAreArray(expected_memory));
}
TEST(BlobConsolidationTest, TestMassiveConsolidation) {
- BlobConsolidation consolidation;
+ scoped_refptr<BlobConsolidation> consolidation(new BlobConsolidation());
const size_t kNumParts = 300;
const size_t kPartSize = 5;
const size_t kTotalMemory = kNumParts * kPartSize;
@@ -85,11 +85,11 @@ TEST(BlobConsolidationTest, TestMassiveConsolidation) {
data[j] = current_value;
++current_value;
}
- consolidation.AddDataItem(blink::WebThreadSafeData(data, kPartSize));
+ consolidation->AddDataItem(blink::WebThreadSafeData(data, kPartSize));
}
- EXPECT_EQ(kTotalMemory, consolidation.total_memory());
+ EXPECT_EQ(kTotalMemory, consolidation->total_memory());
- const auto& items = consolidation.consolidated_items();
+ const auto& items = consolidation->consolidated_items();
EXPECT_EQ(1u, items.size());
EXPECT_EQ(kTotalMemory, items[0].length);
@@ -97,8 +97,8 @@ TEST(BlobConsolidationTest, TestMassiveConsolidation) {
char read_buffer[kReadSegmentSize];
for (size_t i = 0; i < kNumReadSegments; i++) {
EXPECT_EQ(ReadStatus::OK,
- consolidation.ReadMemory(0, i * kReadSegmentSize,
- kReadSegmentSize, read_buffer));
+ consolidation->ReadMemory(0, i * kReadSegmentSize,
+ kReadSegmentSize, read_buffer));
for (size_t j = 0; j < kReadSegmentSize; j++) {
EXPECT_EQ(expected_value, read_buffer[j]);
++expected_value;
@@ -107,45 +107,45 @@ TEST(BlobConsolidationTest, TestMassiveConsolidation) {
}
TEST(BlobConsolidationTest, TestPartialRead) {
- BlobConsolidation consolidation;
- consolidation.AddDataItem(CreateData("1"));
- consolidation.AddDataItem(CreateData("23"));
- consolidation.AddDataItem(CreateData("45"));
- EXPECT_EQ(5u, consolidation.total_memory());
+ scoped_refptr<BlobConsolidation> consolidation(new BlobConsolidation());
+ consolidation->AddDataItem(CreateData("1"));
+ consolidation->AddDataItem(CreateData("23"));
+ consolidation->AddDataItem(CreateData("45"));
+ EXPECT_EQ(5u, consolidation->total_memory());
- const auto& items = consolidation.consolidated_items();
+ const auto& items = consolidation->consolidated_items();
EXPECT_EQ(1u, items.size());
EXPECT_EQ(5lu, items[0].length);
EXPECT_EQ(0lu, items[0].offset);
char memory_part1[] = {'X', 'X'};
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 0, 2, memory_part1));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 0, 2, memory_part1));
char expected_memory_part1[] = {'1', '2'};
EXPECT_THAT(memory_part1, testing::ElementsAreArray(expected_memory_part1));
char memory_part2[] = {'X', 'X'};
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 2, 2, memory_part2));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 2, 2, memory_part2));
char expected_memory_part2[] = {'3', '4'};
EXPECT_THAT(memory_part2, testing::ElementsAreArray(expected_memory_part2));
char memory_part3[] = {'X'};
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 4, 1, memory_part3));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 4, 1, memory_part3));
char expected_memory_part3[] = {'5'};
EXPECT_THAT(memory_part3, testing::ElementsAreArray(expected_memory_part3));
}
TEST(BlobConsolidationTest, TestBoundaries) {
- BlobConsolidation consolidation;
- consolidation.AddDataItem(CreateData("1"));
- consolidation.AddFileItem(base::FilePath(FILE_PATH_LITERAL("testPath")), 1,
- 10, 5.0);
- consolidation.AddDataItem(CreateData("2"));
- consolidation.AddDataItem(CreateData("3"));
- consolidation.AddBlobItem("testUUID", 1, 2);
- consolidation.AddDataItem(CreateData("45"));
- EXPECT_EQ(5u, consolidation.total_memory());
-
- const auto& items = consolidation.consolidated_items();
+ scoped_refptr<BlobConsolidation> consolidation(new BlobConsolidation());
+ consolidation->AddDataItem(CreateData("1"));
+ consolidation->AddFileItem(base::FilePath(FILE_PATH_LITERAL("testPath")), 1,
+ 10, 5.0);
+ consolidation->AddDataItem(CreateData("2"));
+ consolidation->AddDataItem(CreateData("3"));
+ consolidation->AddBlobItem("testUUID", 1, 2);
+ consolidation->AddDataItem(CreateData("45"));
+ EXPECT_EQ(5u, consolidation->total_memory());
+
+ const auto& items = consolidation->consolidated_items();
EXPECT_EQ(5u, items.size());
EXPECT_EQ(1lu, items[0].length);
@@ -165,22 +165,22 @@ TEST(BlobConsolidationTest, TestBoundaries) {
char test_memory[5];
EXPECT_EQ(ReadStatus::ERROR_WRONG_TYPE,
- consolidation.ReadMemory(1, 0, 1, test_memory));
+ consolidation->ReadMemory(1, 0, 1, test_memory));
EXPECT_EQ(ReadStatus::ERROR_WRONG_TYPE,
- consolidation.ReadMemory(3, 0, 1, test_memory));
+ consolidation->ReadMemory(3, 0, 1, test_memory));
char memory_part1[1];
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(0, 0, 1, memory_part1));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(0, 0, 1, memory_part1));
char expected_memory_part1[] = {'1'};
EXPECT_THAT(memory_part1, testing::ElementsAreArray(expected_memory_part1));
char memory_part2[2];
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(2, 0, 2, memory_part2));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(2, 0, 2, memory_part2));
char expected_memory_part2[] = {'2', '3'};
EXPECT_THAT(memory_part2, testing::ElementsAreArray(expected_memory_part2));
char memory_part3[2];
- EXPECT_EQ(ReadStatus::OK, consolidation.ReadMemory(4, 0, 2, memory_part3));
+ EXPECT_EQ(ReadStatus::OK, consolidation->ReadMemory(4, 0, 2, memory_part3));
char expected_memory_part3[] = {'4', '5'};
EXPECT_THAT(memory_part3, testing::ElementsAreArray(expected_memory_part3));
}
« no previous file with comments | « content/child/blob_storage/blob_consolidation.cc ('k') | content/child/blob_storage/blob_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698