diff options
| author | Sen Jiang <senj@chromium.org> | 2015-08-10 10:04:54 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-08-13 21:40:57 +0000 |
| commit | 8cc502dacbccdab96824d42287f230ce04004784 (patch) | |
| tree | 1e5cf087e09bb55ee76545414385d18c1f8478fc /payload_generator/ab_generator_unittest.cc | |
| parent | 535f3b738b0bcbca23a6e361c84bf84145d6a3e6 (diff) | |
update_engine: Change OperationsGenerator to use BlobFileWriter
BUG=chromium:517280
TEST=Unit test for BlobFileWriter
Change-Id: Ib49925676331acee97ff6b4cec38a81ca8b157a1
Reviewed-on: https://chromium-review.googlesource.com/291441
Tested-by: Sen Jiang <senj@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Sen Jiang <senj@chromium.org>
Diffstat (limited to 'payload_generator/ab_generator_unittest.cc')
| -rw-r--r-- | payload_generator/ab_generator_unittest.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/payload_generator/ab_generator_unittest.cc b/payload_generator/ab_generator_unittest.cc index 466b699b..c87324cd 100644 --- a/payload_generator/ab_generator_unittest.cc +++ b/payload_generator/ab_generator_unittest.cc @@ -105,11 +105,12 @@ void TestSplitReplaceOrReplaceBzOperation( EXPECT_TRUE(utils::WriteFile(data_path.c_str(), op_blob.data(), op_blob.size())); off_t data_file_size = op_blob.size(); + BlobFileWriter blob_file(data_fd, &data_file_size); // Split the operation. vector<AnnotatedOperation> result_ops; ASSERT_TRUE(ABGenerator::SplitReplaceOrReplaceBz( - aop, &result_ops, part_path, data_fd, &data_file_size)); + aop, &result_ops, part_path, &blob_file)); // Check the result. DeltaArchiveManifest_InstallOperation_Type expected_type = @@ -275,10 +276,11 @@ void TestMergeReplaceOrReplaceBzOperations( EXPECT_TRUE(utils::WriteFile(data_path.c_str(), blob_data.data(), blob_data.size())); off_t data_file_size = blob_data.size(); + BlobFileWriter blob_file(data_fd, &data_file_size); // Merge the operations. EXPECT_TRUE(ABGenerator::MergeOperations( - &aops, 5, part_path, data_fd, &data_file_size)); + &aops, 5, part_path, &blob_file)); // Check the result. DeltaArchiveManifest_InstallOperation_Type expected_op_type = @@ -471,7 +473,8 @@ TEST_F(ABGeneratorTest, MergeSourceCopyOperationsTest) { third_aop.name = "3"; aops.push_back(third_aop); - EXPECT_TRUE(ABGenerator::MergeOperations(&aops, 5, "", 0, nullptr)); + BlobFileWriter blob_file(0, nullptr); + EXPECT_TRUE(ABGenerator::MergeOperations(&aops, 5, "", &blob_file)); EXPECT_EQ(aops.size(), 1); DeltaArchiveManifest_InstallOperation first_result_op = aops[0].op; @@ -547,7 +550,8 @@ TEST_F(ABGeneratorTest, NoMergeOperationsTest) { fourth_aop.op = fourth_op; aops.push_back(fourth_aop); - EXPECT_TRUE(ABGenerator::MergeOperations(&aops, 4, "", 0, nullptr)); + BlobFileWriter blob_file(0, nullptr); + EXPECT_TRUE(ABGenerator::MergeOperations(&aops, 4, "", &blob_file)); // No operations were merged, the number of ops is the same. EXPECT_EQ(aops.size(), 4); |