From d8b67f49d7f8ae291cd4fa901b2d3767137704e7 Mon Sep 17 00:00:00 2001 From: Amin Hassani Date: Wed, 6 Dec 2017 13:47:52 -0800 Subject: update_engine: Remove the duplicate BlocksInExtents This patch removes the duplicate BlocksInExtents from extent_utils.h and fixes the remainder of the code to reflect this change. BUG=none TEST=unittests pass; Change-Id: I76f5106f75072b20cd8f41f081b2f2b07aeac9a8 Reviewed-on: https://chromium-review.googlesource.com/812009 Commit-Ready: Amin Hassani Tested-by: Amin Hassani Reviewed-by: Ben Chan Reviewed-by: Alex Deymo Reviewed-by: Sen Jiang --- payload_generator/extent_utils_unittest.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'payload_generator/extent_utils_unittest.cc') diff --git a/payload_generator/extent_utils_unittest.cc b/payload_generator/extent_utils_unittest.cc index d470e7ba..eef4385e 100644 --- a/payload_generator/extent_utils_unittest.cc +++ b/payload_generator/extent_utils_unittest.cc @@ -54,23 +54,23 @@ TEST(ExtentUtilsTest, AppendSparseToExtentsTest) { TEST(ExtentUtilsTest, BlocksInExtentsTest) { { vector extents; - EXPECT_EQ(0U, BlocksInExtents(extents)); + EXPECT_EQ(0U, utils::BlocksInExtents(extents)); extents.push_back(ExtentForRange(0, 1)); - EXPECT_EQ(1U, BlocksInExtents(extents)); + EXPECT_EQ(1U, utils::BlocksInExtents(extents)); extents.push_back(ExtentForRange(23, 55)); - EXPECT_EQ(56U, BlocksInExtents(extents)); + EXPECT_EQ(56U, utils::BlocksInExtents(extents)); extents.push_back(ExtentForRange(1, 2)); - EXPECT_EQ(58U, BlocksInExtents(extents)); + EXPECT_EQ(58U, utils::BlocksInExtents(extents)); } { google::protobuf::RepeatedPtrField extents; - EXPECT_EQ(0U, BlocksInExtents(extents)); + EXPECT_EQ(0U, utils::BlocksInExtents(extents)); *extents.Add() = ExtentForRange(0, 1); - EXPECT_EQ(1U, BlocksInExtents(extents)); + EXPECT_EQ(1U, utils::BlocksInExtents(extents)); *extents.Add() = ExtentForRange(23, 55); - EXPECT_EQ(56U, BlocksInExtents(extents)); + EXPECT_EQ(56U, utils::BlocksInExtents(extents)); *extents.Add() = ExtentForRange(1, 2); - EXPECT_EQ(58U, BlocksInExtents(extents)); + EXPECT_EQ(58U, utils::BlocksInExtents(extents)); } } -- cgit v1.2.3