Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Unified Diff: athena/home/home_card_unittest.cc

Issue 516643005: Adds the test expectations of home card bounds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: athena/home/home_card_unittest.cc
diff --git a/athena/home/home_card_unittest.cc b/athena/home/home_card_unittest.cc
index 6952cbae73a0b73f9215c01c10aea4b2be5c6267..0988dfd3a6dc1b9b466b3094bbb65f0d362910a9 100644
--- a/athena/home/home_card_unittest.cc
+++ b/athena/home/home_card_unittest.cc
@@ -6,6 +6,7 @@
#include "athena/activity/public/activity_factory.h"
#include "athena/activity/public/activity_manager.h"
+#include "athena/home/home_card_constants.h"
#include "athena/test/athena_test_base.h"
#include "athena/wm/public/window_manager.h"
#include "ui/aura/window.h"
@@ -16,13 +17,22 @@ namespace athena {
typedef test::AthenaTestBase HomeCardTest;
TEST_F(HomeCardTest, BasicTransition) {
- EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
+ ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
+ aura::Window* home_card = HomeCard::Get()->GetHomeCardWindowForTest();
+ const int screen_height = root_window()->bounds().height();
oshima 2014/08/28 00:03:12 can you also test against work area?
Jun Mukai 2014/08/28 00:43:33 Done.
+ ASSERT_TRUE(home_card);
+
+ EXPECT_EQ(screen_height - kHomeCardMinimizedHeight,
+ home_card->GetTargetBounds().y());
WindowManager::GetInstance()->ToggleOverview();
EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
+ EXPECT_EQ(screen_height - kHomeCardHeight, home_card->GetTargetBounds().y());
WindowManager::GetInstance()->ToggleOverview();
EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
+ EXPECT_EQ(screen_height - kHomeCardMinimizedHeight,
+ home_card->GetTargetBounds().y());
}
TEST_F(HomeCardTest, VirtualKeyboardTransition) {
@@ -39,6 +49,8 @@ TEST_F(HomeCardTest, VirtualKeyboardTransition) {
EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds);
EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
+ EXPECT_EQ(
+ 0, HomeCard::Get()->GetHomeCardWindowForTest()->GetTargetBounds().y());
HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect());
EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());

Powered by Google App Engine
This is Rietveld 408576698