diff options
Diffstat (limited to 'payload_generator/delta_diff_utils_unittest.cc')
| -rw-r--r-- | payload_generator/delta_diff_utils_unittest.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/payload_generator/delta_diff_utils_unittest.cc b/payload_generator/delta_diff_utils_unittest.cc index 46e68c52..a83cea29 100644 --- a/payload_generator/delta_diff_utils_unittest.cc +++ b/payload_generator/delta_diff_utils_unittest.cc @@ -194,9 +194,9 @@ TEST_F(DeltaDiffUtilsTest, MoveSmallTest) { EXPECT_EQ(kBlockSize, op.src_length()); EXPECT_EQ(1, op.dst_extents_size()); EXPECT_EQ(kBlockSize, op.dst_length()); - EXPECT_EQ(BlocksInExtents(op.src_extents()), - BlocksInExtents(op.dst_extents())); - EXPECT_EQ(1U, BlocksInExtents(op.dst_extents())); + EXPECT_EQ(utils::BlocksInExtents(op.src_extents()), + utils::BlocksInExtents(op.dst_extents())); + EXPECT_EQ(1U, utils::BlocksInExtents(op.dst_extents())); } TEST_F(DeltaDiffUtilsTest, MoveWithSameBlock) { @@ -220,8 +220,8 @@ TEST_F(DeltaDiffUtilsTest, MoveWithSameBlock) { ExtentForRange(24, 3), ExtentForRange(29, 1) }; - uint64_t num_blocks = BlocksInExtents(old_extents); - EXPECT_EQ(num_blocks, BlocksInExtents(new_extents)); + uint64_t num_blocks = utils::BlocksInExtents(old_extents); + EXPECT_EQ(num_blocks, utils::BlocksInExtents(new_extents)); // The size of the data should match the total number of blocks. Each block // has a different content. @@ -262,7 +262,7 @@ TEST_F(DeltaDiffUtilsTest, MoveWithSameBlock) { ExtentForRange(18, 1), ExtentForRange(20, 1), ExtentForRange(26, 1) }; - num_blocks = BlocksInExtents(old_extents); + num_blocks = utils::BlocksInExtents(old_extents); EXPECT_EQ(num_blocks * kBlockSize, op.src_length()); EXPECT_EQ(num_blocks * kBlockSize, op.dst_length()); @@ -321,9 +321,9 @@ TEST_F(DeltaDiffUtilsTest, BsdiffSmallTest) { EXPECT_EQ(kBlockSize, op.src_length()); EXPECT_EQ(1, op.dst_extents_size()); EXPECT_EQ(kBlockSize, op.dst_length()); - EXPECT_EQ(BlocksInExtents(op.src_extents()), - BlocksInExtents(op.dst_extents())); - EXPECT_EQ(1U, BlocksInExtents(op.dst_extents())); + EXPECT_EQ(utils::BlocksInExtents(op.src_extents()), + utils::BlocksInExtents(op.dst_extents())); + EXPECT_EQ(1U, utils::BlocksInExtents(op.dst_extents())); } TEST_F(DeltaDiffUtilsTest, ReplaceSmallTest) { @@ -373,7 +373,7 @@ TEST_F(DeltaDiffUtilsTest, ReplaceSmallTest) { EXPECT_FALSE(op.has_src_length()); EXPECT_EQ(1, op.dst_extents_size()); EXPECT_FALSE(op.has_dst_length()); - EXPECT_EQ(1U, BlocksInExtents(op.dst_extents())); + EXPECT_EQ(1U, utils::BlocksInExtents(op.dst_extents())); } } @@ -634,7 +634,8 @@ TEST_F(DeltaDiffUtilsTest, ZeroBlocksUseReplaceBz) { // The last range is split since the old image has zeros in part of it. ExtentForRange(30, 20), }; - brillo::Blob zeros_data(BlocksInExtents(new_zeros) * block_size_, '\0'); + brillo::Blob zeros_data(utils::BlocksInExtents(new_zeros) * block_size_, + '\0'); EXPECT_TRUE(WriteExtents(new_part_.path, new_zeros, block_size_, zeros_data)); vector<Extent> old_zeros = vector<Extent>{ExtentForRange(43, 7)}; |