From da409fb8d615c3e1aac6505827026843aee25324 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Sun, 21 Oct 2018 23:36:26 -0700 Subject: ui: Manage loaded resources with smart pointers. Test: Run recovery_unit_test on marlin. Test: `Run graphics test` on marlin. Change-Id: I8239c3d9fb288f80ee11f615402768ff8ef8ecd0 --- tests/unit/screen_ui_test.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/unit/screen_ui_test.cpp b/tests/unit/screen_ui_test.cpp index 3246e6a6e..b780af430 100644 --- a/tests/unit/screen_ui_test.cpp +++ b/tests/unit/screen_ui_test.cpp @@ -231,12 +231,12 @@ TEST_F(ScreenUITest, WearMenuSelectItemsOverflow) { } TEST_F(ScreenUITest, GraphicMenuSelection) { - auto header = GRSurface::Create(50, 50, 50, 1, 50 * 50); - auto item = GRSurface::Create(50, 50, 50, 1, 50 * 50); - std::vector items = { - item.get(), - item.get(), - item.get(), + auto image = GRSurface::Create(50, 50, 50, 1, 50 * 50); + auto header = image->Clone(); + std::vector items = { + image.get(), + image.get(), + image.get(), }; GraphicMenu menu(header.get(), items, 0, draw_funcs_); @@ -258,12 +258,12 @@ TEST_F(ScreenUITest, GraphicMenuSelection) { } TEST_F(ScreenUITest, GraphicMenuValidate) { - auto header = GRSurface::Create(50, 50, 50, 1, 50 * 50); - auto item = GRSurface::Create(50, 50, 50, 1, 50 * 50); - std::vector items = { - item.get(), - item.get(), - item.get(), + auto image = GRSurface::Create(50, 50, 50, 1, 50 * 50); + auto header = image->Clone(); + std::vector items = { + image.get(), + image.get(), + image.get(), }; ASSERT_TRUE(GraphicMenu::Validate(200, 200, header.get(), items)); @@ -273,7 +273,7 @@ TEST_F(ScreenUITest, GraphicMenuValidate) { ASSERT_FALSE(GraphicMenu::Validate(299, 200, wide_surface.get(), items)); // Menu exceeds the vertical boundary. - items.push_back(item.get()); + items.emplace_back(image.get()); ASSERT_FALSE(GraphicMenu::Validate(200, 249, header.get(), items)); } @@ -539,8 +539,8 @@ TEST_F(ScreenRecoveryUITest, LoadAnimation) { ui_->LoadAnimation(); - ASSERT_EQ(2u, ui_->intro_frames); - ASSERT_EQ(3u, ui_->loop_frames); + ASSERT_EQ(2u, ui_->intro_frames_.size()); + ASSERT_EQ(3u, ui_->loop_frames_.size()); for (const auto& name : tempfiles) { ASSERT_EQ(0, unlink(name.c_str())); -- cgit v1.2.3