diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-08 11:36:01 +0200 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-08 11:36:01 +0200 |
commit | 5bcbbdcbf914637b6d044c652b818b0e2c07f5c5 (patch) | |
tree | 8224a5d489c8dc889e4e648cacbac206d6933790 /tests/unit | |
parent | Snap for 4821358 from 31b994e8e93e04e29f59ac98e845b42750668178 to qt-release (diff) | |
parent | Merge "updater_sample: update README.md" am: 1cb7222784 am: fc824cb998 (diff) | |
download | android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.gz android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.bz2 android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.lz android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.xz android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.zst android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.zip |
Diffstat (limited to 'tests/unit')
-rw-r--r-- | tests/unit/rangeset_test.cpp | 3 | ||||
-rw-r--r-- | tests/unit/screen_ui_test.cpp | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/unit/rangeset_test.cpp b/tests/unit/rangeset_test.cpp index 7ae193e18..fc72f2f6d 100644 --- a/tests/unit/rangeset_test.cpp +++ b/tests/unit/rangeset_test.cpp @@ -209,6 +209,7 @@ TEST(RangeSetTest, GetBlockNumber) { ASSERT_EQ(static_cast<size_t>(6), rs.GetBlockNumber(5)); ASSERT_EQ(static_cast<size_t>(9), rs.GetBlockNumber(8)); + ::testing::FLAGS_gtest_death_test_style = "threadsafe"; // Out of bound. ASSERT_EXIT(rs.GetBlockNumber(9), ::testing::KilledBySignal(SIGABRT), ""); } @@ -284,6 +285,8 @@ TEST(SortedRangeSetTest, file_range) { ASSERT_EQ(static_cast<size_t>(10), rs.GetOffsetInRangeSet(4106)); ASSERT_EQ(static_cast<size_t>(40970), rs.GetOffsetInRangeSet(4096 * 16 + 10)); + + ::testing::FLAGS_gtest_death_test_style = "threadsafe"; // block#10 not in range. ASSERT_EXIT(rs.GetOffsetInRangeSet(40970), ::testing::KilledBySignal(SIGABRT), ""); } diff --git a/tests/unit/screen_ui_test.cpp b/tests/unit/screen_ui_test.cpp index 25623074c..a3dd2add9 100644 --- a/tests/unit/screen_ui_test.cpp +++ b/tests/unit/screen_ui_test.cpp @@ -293,6 +293,11 @@ TEST_F(ScreenRecoveryUITest, Init) { ASSERT_FALSE(ui_->WasTextEverVisible()); } +TEST_F(ScreenRecoveryUITest, dtor_NotCallingInit) { + ui_.reset(); + ASSERT_FALSE(ui_); +} + TEST_F(ScreenRecoveryUITest, ShowText) { ASSERT_TRUE(ui_->Init(kTestLocale)); ASSERT_FALSE(ui_->IsTextVisible()); @@ -408,5 +413,7 @@ TEST_F(ScreenRecoveryUITest, LoadAnimation_MissingAnimation) { ASSERT_TRUE(ui_->Init(kTestLocale)); TemporaryDir resource_dir; Paths::Get().set_resource_dir(resource_dir.path); + + ::testing::FLAGS_gtest_death_test_style = "threadsafe"; ASSERT_EXIT(ui_->RunLoadAnimation(), ::testing::KilledBySignal(SIGABRT), ""); } |