From 8f9a9e7376eac67e03f3f2aea2c020132f9f2fe9 Mon Sep 17 00:00:00 2001 From: Etienne Pierre-doray Date: Mon, 13 Aug 2018 18:49:00 +0000 Subject: [Zucchini]: Remove IndirectReference. IndirectReference brings complexity conceptually. The purpose of IndirectReference was to speed-up look-ups. Turns out that there is no significant impact on patching time when using direct references. Furthermore, this reduces coupling between TargetPool and ReferenceSet. Change-Id: Ic50dbf59e483a7fa1480c8eb37f4b1d01a53401a Reviewed-on: https://chromium-review.googlesource.com/1136578 Commit-Queue: Etienne Pierre-Doray Reviewed-by: Samuel Huang Cr-Commit-Position: refs/heads/master@{#582653} NOKEYCHECK=True GitOrigin-RevId: 0434f5b4a564c6295e62a3996826f8627b8aa617 --- reference_set_unittest.cc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'reference_set_unittest.cc') diff --git a/reference_set_unittest.cc b/reference_set_unittest.cc index b4ccceb..0bf869e 100644 --- a/reference_set_unittest.cc +++ b/reference_set_unittest.cc @@ -28,24 +28,22 @@ class ReferenceSetTest : public testing::Test { }; TEST_F(ReferenceSetTest, InitReferencesFromReader) { - EXPECT_EQ(std::vector(), reference_set_.references()); + EXPECT_EQ(std::vector(), reference_set_.references()); EXPECT_EQ(0U, reference_set_.size()); std::vector references = {{10, 0}, {12, 2}, {14, 5}}; reference_set_.InitReferences(TestReferenceReader(references)); - EXPECT_EQ(std::vector({{10, 0}, {12, 1}, {14, 3}}), - reference_set_.references()); - EXPECT_EQ(3U, reference_set_.size()); + EXPECT_EQ(references, reference_set_.references()); } TEST_F(ReferenceSetTest, At) { reference_set_.InitReferences({{10, 0}, {12, 2}, {15, 5}}); // Each references has kWidth = 2, so check all bytes covered. - EXPECT_EQ(IndirectReference({10, 0}), reference_set_.at(10)); - EXPECT_EQ(IndirectReference({10, 0}), reference_set_.at(11)); - EXPECT_EQ(IndirectReference({12, 1}), reference_set_.at(12)); - EXPECT_EQ(IndirectReference({12, 1}), reference_set_.at(13)); - EXPECT_EQ(IndirectReference({15, 3}), reference_set_.at(15)); - EXPECT_EQ(IndirectReference({15, 3}), reference_set_.at(16)); + EXPECT_EQ(Reference({10, 0}), reference_set_.at(10)); + EXPECT_EQ(Reference({10, 0}), reference_set_.at(11)); + EXPECT_EQ(Reference({12, 2}), reference_set_.at(12)); + EXPECT_EQ(Reference({12, 2}), reference_set_.at(13)); + EXPECT_EQ(Reference({15, 5}), reference_set_.at(15)); + EXPECT_EQ(Reference({15, 5}), reference_set_.at(16)); } } // namespace zucchini -- cgit v1.2.3