Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "athena/home/public/home_card.h" | 5 #include "athena/home/public/home_card.h" |
| 6 | 6 |
| 7 #include "athena/activity/public/activity_factory.h" | 7 #include "athena/activity/public/activity_factory.h" |
| 8 #include "athena/activity/public/activity_manager.h" | 8 #include "athena/activity/public/activity_manager.h" |
| 9 #include "athena/home/home_card_constants.h" | |
| 9 #include "athena/test/athena_test_base.h" | 10 #include "athena/test/athena_test_base.h" |
| 10 #include "athena/wm/public/window_manager.h" | 11 #include "athena/wm/public/window_manager.h" |
| 11 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 12 #include "ui/events/test/event_generator.h" | 13 #include "ui/events/test/event_generator.h" |
| 13 | 14 |
| 14 namespace athena { | 15 namespace athena { |
| 15 | 16 |
| 16 typedef test::AthenaTestBase HomeCardTest; | 17 typedef test::AthenaTestBase HomeCardTest; |
| 17 | 18 |
| 18 TEST_F(HomeCardTest, BasicTransition) { | 19 TEST_F(HomeCardTest, BasicTransition) { |
| 19 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 20 ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
| 21 aura::Window* home_card = HomeCard::Get()->GetHomeCardWindowForTest(); | |
| 22 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.
| |
| 23 ASSERT_TRUE(home_card); | |
| 24 | |
| 25 EXPECT_EQ(screen_height - kHomeCardMinimizedHeight, | |
| 26 home_card->GetTargetBounds().y()); | |
| 20 | 27 |
| 21 WindowManager::GetInstance()->ToggleOverview(); | 28 WindowManager::GetInstance()->ToggleOverview(); |
| 22 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 29 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
| 30 EXPECT_EQ(screen_height - kHomeCardHeight, home_card->GetTargetBounds().y()); | |
| 23 | 31 |
| 24 WindowManager::GetInstance()->ToggleOverview(); | 32 WindowManager::GetInstance()->ToggleOverview(); |
| 25 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 33 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
| 34 EXPECT_EQ(screen_height - kHomeCardMinimizedHeight, | |
| 35 home_card->GetTargetBounds().y()); | |
| 26 } | 36 } |
| 27 | 37 |
| 28 TEST_F(HomeCardTest, VirtualKeyboardTransition) { | 38 TEST_F(HomeCardTest, VirtualKeyboardTransition) { |
| 29 // Minimized -> Hidden for virtual keyboard. | 39 // Minimized -> Hidden for virtual keyboard. |
| 30 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 40 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
| 31 const gfx::Rect vk_bounds(0, 0, 100, 100); | 41 const gfx::Rect vk_bounds(0, 0, 100, 100); |
| 32 HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds); | 42 HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds); |
| 33 EXPECT_EQ(HomeCard::HIDDEN, HomeCard::Get()->GetState()); | 43 EXPECT_EQ(HomeCard::HIDDEN, HomeCard::Get()->GetState()); |
| 34 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect()); | 44 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect()); |
| 35 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 45 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
| 36 | 46 |
| 37 // bottom -> centered for virtual keyboard. | 47 // bottom -> centered for virtual keyboard. |
| 38 WindowManager::GetInstance()->ToggleOverview(); | 48 WindowManager::GetInstance()->ToggleOverview(); |
| 39 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 49 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
| 40 HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds); | 50 HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds); |
| 41 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); | 51 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); |
| 52 EXPECT_EQ( | |
| 53 0, HomeCard::Get()->GetHomeCardWindowForTest()->GetTargetBounds().y()); | |
| 42 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect()); | 54 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect()); |
| 43 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 55 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
| 44 | 56 |
| 45 // Overview mode has to finish before ending test, otherwise it crashes. | 57 // Overview mode has to finish before ending test, otherwise it crashes. |
| 46 // TODO(mukai): fix this. | 58 // TODO(mukai): fix this. |
| 47 WindowManager::GetInstance()->ToggleOverview(); | 59 WindowManager::GetInstance()->ToggleOverview(); |
| 48 } | 60 } |
| 49 | 61 |
| 50 // Verify if the home card is correctly minimized after app launch. | 62 // Verify if the home card is correctly minimized after app launch. |
| 51 TEST_F(HomeCardTest, AppSelection) { | 63 TEST_F(HomeCardTest, AppSelection) { |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 | 204 |
| 193 generator.GestureScrollSequence(gfx::Point(x, bottom - 1), | 205 generator.GestureScrollSequence(gfx::Point(x, bottom - 1), |
| 194 gfx::Point(x, 20), | 206 gfx::Point(x, 20), |
| 195 base::TimeDelta::FromSeconds(1), | 207 base::TimeDelta::FromSeconds(1), |
| 196 10); | 208 10); |
| 197 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); | 209 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); |
| 198 EXPECT_TRUE(WindowManager::GetInstance()->IsOverviewModeActive()); | 210 EXPECT_TRUE(WindowManager::GetInstance()->IsOverviewModeActive()); |
| 199 } | 211 } |
| 200 | 212 |
| 201 } // namespace athena | 213 } // namespace athena |
| OLD | NEW |