diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-01 19:27:26 -0700 |
---|---|---|
committer | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 02:38:22 +0000 |
commit | a90c04389f86ed4363674e20b0d5f171dea7ebeb (patch) | |
tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /target_pool_unittest.cc | |
parent | f2da819cb37cb2376c917506fb1eb154ec61586a (diff) | |
parent | 8bb965d29e918d0559589a215ff7f4bd0874bc08 (diff) | |
download | zucchini-a90c04389f86ed4363674e20b0d5f171dea7ebeb.tar.gz |
Merge remote-tracking branch 'aosp/upstream-main' into dev
This performs a merge on upstream zucchini.
Change-Id: I8a4844407558d6f1e439939ee634fe17ed7a4e55
Diffstat (limited to 'target_pool_unittest.cc')
-rw-r--r-- | target_pool_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target_pool_unittest.cc b/target_pool_unittest.cc index 4c3efec..9a779b0 100644 --- a/target_pool_unittest.cc +++ b/target_pool_unittest.cc @@ -5,9 +5,9 @@ #include "components/zucchini/target_pool.h" #include <cmath> +#include <deque> #include <string> #include <utility> -#include <vector> #include "components/zucchini/image_utils.h" #include "testing/gtest/include/gtest/gtest.h" @@ -16,29 +16,29 @@ namespace zucchini { namespace { -using OffsetVector = std::vector<offset_t>; +using OffsetDeque = std::deque<offset_t>; } // namespace TEST(TargetPoolTest, InsertTargetsFromReferences) { - auto test_insert = [](std::vector<Reference>&& references) -> OffsetVector { + auto test_insert = [](std::vector<Reference>&& references) -> OffsetDeque { TargetPool target_pool; target_pool.InsertTargets(references); // Return copy since |target_pool| goes out of scope. return target_pool.targets(); }; - EXPECT_EQ(OffsetVector(), test_insert({})); - EXPECT_EQ(OffsetVector({0, 1}), test_insert({{0, 0}, {10, 1}})); - EXPECT_EQ(OffsetVector({0, 1}), test_insert({{0, 1}, {10, 0}})); - EXPECT_EQ(OffsetVector({0, 1, 2}), test_insert({{0, 1}, {10, 0}, {20, 2}})); - EXPECT_EQ(OffsetVector({0}), test_insert({{0, 0}, {10, 0}})); - EXPECT_EQ(OffsetVector({0, 1}), test_insert({{0, 0}, {10, 0}, {20, 1}})); + EXPECT_EQ(OffsetDeque(), test_insert({})); + EXPECT_EQ(OffsetDeque({0, 1}), test_insert({{0, 0}, {10, 1}})); + EXPECT_EQ(OffsetDeque({0, 1}), test_insert({{0, 1}, {10, 0}})); + EXPECT_EQ(OffsetDeque({0, 1, 2}), test_insert({{0, 1}, {10, 0}, {20, 2}})); + EXPECT_EQ(OffsetDeque({0}), test_insert({{0, 0}, {10, 0}})); + EXPECT_EQ(OffsetDeque({0, 1}), test_insert({{0, 0}, {10, 0}, {20, 1}})); } TEST(TargetPoolTest, KeyOffset) { auto test_key_offset = [](const std::string& nearest_offsets_key, - OffsetVector&& targets) { + OffsetDeque&& targets) { TargetPool target_pool(std::move(targets)); for (offset_t offset : target_pool.targets()) { offset_t key = target_pool.KeyForOffset(offset); |