diff options
author | Sen Jiang <senj@google.com> | 2015-09-21 15:06:13 -0700 |
---|---|---|
committer | Sen Jiang <senj@google.com> | 2015-09-21 17:04:15 -0700 |
commit | b9ef491e87c17d809368ede0196569d8a106b963 (patch) | |
tree | 7d60755919c056f24485f0344f71c3935240dade /payload_generator/payload_file_unittest.cc | |
parent | 60d1cfa646fd6084100ad3cf5dc128ad27a96fba (diff) |
Move partition info to PartitionUpdate in payload verison 2.
old_kernel_info, old_rootfs_info is now old_partition_info.
new_kernel_info, new_rootfs_info is now new_partition_info.
AddPartitionOperations is renamed to AddPartition because it now adds
partition info too.
Bug: 23694580
TEST=cros_workon_make update_engine --test
Generated a version 2 payload with delta_generator.
Change-Id: I07c7fc21198307e935679e62861cdac4b406c84f
Diffstat (limited to 'payload_generator/payload_file_unittest.cc')
-rw-r--r-- | payload_generator/payload_file_unittest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/payload_generator/payload_file_unittest.cc b/payload_generator/payload_file_unittest.cc index ff8c8a44..244d22bf 100644 --- a/payload_generator/payload_file_unittest.cc +++ b/payload_generator/payload_file_unittest.cc @@ -54,6 +54,8 @@ TEST_F(PayloadFileTest, ReorderBlobsTest) { utils::MakeTempFile("ReorderBlobsTest.new.XXXXXX", &new_blobs, nullptr)); ScopedPathUnlinker new_blobs_unlinker(new_blobs); + payload_.part_vec_.resize(2); + vector<AnnotatedOperation> aops; AnnotatedOperation aop; aop.op.set_data_offset(8); @@ -63,17 +65,16 @@ TEST_F(PayloadFileTest, ReorderBlobsTest) { aop.op.set_data_offset(7); aop.op.set_data_length(1); aops.push_back(aop); - payload_.AddPartitionOperations("part0", aops); + payload_.part_vec_[0].aops = aops; aop.op.set_data_offset(0); aop.op.set_data_length(6); - aops = {aop}; - payload_.AddPartitionOperations("part1", aops); + payload_.part_vec_[1].aops = {aop}; EXPECT_TRUE(payload_.ReorderDataBlobs(orig_blobs, new_blobs)); - const vector<AnnotatedOperation>& part0_aops = payload_.aops_vec_[0].second; - const vector<AnnotatedOperation>& part1_aops = payload_.aops_vec_[1].second; + const vector<AnnotatedOperation>& part0_aops = payload_.part_vec_[0].aops; + const vector<AnnotatedOperation>& part1_aops = payload_.part_vec_[1].aops; string new_data; EXPECT_TRUE(utils::ReadFile(new_blobs, &new_data)); // Kernel blobs should appear at the end. |