tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38

Browse source 
am: b730743b40

Change-Id: I0a8ba6bf7836bde00e93f2ce9a011ace9acbac5d
This commit is contained in:
Tao Bao 2018-05-15 21:16:22 -07:00 committed by android-build-merger
commit 6171da90c5
2 changed files with 53 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
tests/unit/screen_ui_test.cpp
View file

@ -15,6 +15,7 @@
*/ */
#include <stddef.h> #include <stddef.h>
#include <stdio.h>
#include <functional> #include <functional>
#include <map> #include <map>
@ -23,6 +24,8 @@
#include <vector> #include <vector>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include <android-base/test_utils.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "common/test_constants.h" #include "common/test_constants.h"
@ -224,6 +227,19 @@ class TestableScreenRecoveryUI : public ScreenRecoveryUI {
int KeyHandler(int key, bool visible) const; int KeyHandler(int key, bool visible) const;
// The following functions expose the protected members for test purpose.
void RunLoadAnimation() {
LoadAnimation();
}
size_t GetLoopFrames() const {
return loop_frames;
}
size_t GetIntroFrames() const {
return intro_frames;
}
bool GetRtlLocale() const { bool GetRtlLocale() const {
return rtl_locale_; return rtl_locale_;
} }
@ -260,14 +276,15 @@ class ScreenRecoveryUITest : public ::testing::Test {
void SetUp() override { void SetUp() override {
ui_ = std::make_unique<TestableScreenRecoveryUI>(); ui_ = std::make_unique<TestableScreenRecoveryUI>();
std::string testdata_dir = from_testdata_base(""); testdata_dir_ = from_testdata_base("");
Paths::Get().set_resource_dir(testdata_dir); Paths::Get().set_resource_dir(testdata_dir_);
res_set_resource_dir(testdata_dir); res_set_resource_dir(testdata_dir_);
ASSERT_TRUE(ui_->Init(kTestLocale)); ASSERT_TRUE(ui_->Init(kTestLocale));
} }
std::unique_ptr<TestableScreenRecoveryUI> ui_; std::unique_ptr<TestableScreenRecoveryUI> ui_;
std::string testdata_dir_;
}; };
TEST_F(ScreenRecoveryUITest, Init) { TEST_F(ScreenRecoveryUITest, Init) {
@ -352,3 +369,36 @@ TEST_F(ScreenRecoveryUITest, ShowMenu_TimedOut_TextWasEverVisible) {
std::bind(&TestableScreenRecoveryUI::KeyHandler, ui_.get(), std::bind(&TestableScreenRecoveryUI::KeyHandler, ui_.get(),
std::placeholders::_1, std::placeholders::_2))); std::placeholders::_1, std::placeholders::_2)));
} }
TEST_F(ScreenRecoveryUITest, LoadAnimation) {
// Make a few copies of loop00000.png from testdata.
std::string image_data;
ASSERT_TRUE(android::base::ReadFileToString(testdata_dir_ + "/loop00000.png", &image_data));
std::vector<std::string> tempfiles;
TemporaryDir resource_dir;
for (const auto& name : { "00002", "00100", "00050" }) {
tempfiles.push_back(android::base::StringPrintf("%s/loop%s.png", resource_dir.path, name));
ASSERT_TRUE(android::base::WriteStringToFile(image_data, tempfiles.back()));
}
for (const auto& name : { "00", "01" }) {
tempfiles.push_back(android::base::StringPrintf("%s/intro%s.png", resource_dir.path, name));
ASSERT_TRUE(android::base::WriteStringToFile(image_data, tempfiles.back()));
}
Paths::Get().set_resource_dir(resource_dir.path);
ui_->RunLoadAnimation();
ASSERT_EQ(2u, ui_->GetIntroFrames());
ASSERT_EQ(3u, ui_->GetLoopFrames());
for (const auto& name : tempfiles) {
ASSERT_EQ(0, unlink(name.c_str()));
}
}
TEST_F(ScreenRecoveryUITest, LoadAnimation_MissingAnimation) {
TemporaryDir resource_dir;
Paths::Get().set_resource_dir(resource_dir.path);
ASSERT_EXIT(ui_->RunLoadAnimation(), ::testing::KilledBySignal(SIGABRT), "");
}

5
wear_ui.cpp
View file

@ -32,11 +32,6 @@ WearRecoveryUI::WearRecoveryUI()
kMenuUnusableRows(RECOVERY_UI_MENU_UNUSABLE_ROWS) { kMenuUnusableRows(RECOVERY_UI_MENU_UNUSABLE_ROWS) {
// TODO: kMenuUnusableRows should be computed based on the lines in draw_screen_locked(). // TODO: kMenuUnusableRows should be computed based on the lines in draw_screen_locked().
// TODO: The following three variables are likely not needed. The first two are detected
// automatically in ScreenRecoveryUI::LoadAnimation(), based on the actual files seen on device.
intro_frames = 22;
loop_frames = 60;
touch_screen_allowed_ = true; touch_screen_allowed_ = true;
} }