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

Side by Side 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: fix Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « athena/home/home_card_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
10 #include "athena/home/home_card_impl.h"
9 #include "athena/test/athena_test_base.h" 11 #include "athena/test/athena_test_base.h"
10 #include "athena/wm/public/window_manager.h" 12 #include "athena/wm/public/window_manager.h"
11 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
12 #include "ui/events/test/event_generator.h" 14 #include "ui/events/test/event_generator.h"
15 #include "ui/gfx/display.h"
16 #include "ui/gfx/screen.h"
13 17
14 namespace athena { 18 namespace athena {
15 19
20 aura::Window* GetHomeCardWindow() {
21 return static_cast<HomeCardImpl*>(HomeCard::Get())->
22 GetHomeCardWindowForTest();
23 }
24
16 typedef test::AthenaTestBase HomeCardTest; 25 typedef test::AthenaTestBase HomeCardTest;
17 26
18 TEST_F(HomeCardTest, BasicTransition) { 27 TEST_F(HomeCardTest, BasicTransition) {
19 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); 28 ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
29 aura::Window* home_card = GetHomeCardWindow();
30 const int screen_height = root_window()->bounds().height();
31 const int work_area_height = gfx::Screen::GetScreenFor(root_window())->
32 GetDisplayNearestWindow(root_window()).work_area().height();
33 ASSERT_TRUE(home_card);
34
35 // In the minimized state, home card should be outside (below) the work area.
36 EXPECT_EQ(screen_height - kHomeCardMinimizedHeight,
37 home_card->GetTargetBounds().y());
38 EXPECT_EQ(work_area_height, home_card->GetTargetBounds().y());
20 39
21 WindowManager::GetInstance()->ToggleOverview(); 40 WindowManager::GetInstance()->ToggleOverview();
22 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); 41 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
42 EXPECT_EQ(screen_height - kHomeCardHeight, home_card->GetTargetBounds().y());
23 43
24 WindowManager::GetInstance()->ToggleOverview(); 44 WindowManager::GetInstance()->ToggleOverview();
25 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); 45 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
46 EXPECT_EQ(work_area_height, home_card->GetTargetBounds().y());
26 } 47 }
27 48
28 TEST_F(HomeCardTest, VirtualKeyboardTransition) { 49 TEST_F(HomeCardTest, VirtualKeyboardTransition) {
29 // Minimized -> Hidden for virtual keyboard. 50 // Minimized -> Hidden for virtual keyboard.
30 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); 51 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
31 const gfx::Rect vk_bounds(0, 0, 100, 100); 52 const gfx::Rect vk_bounds(0, 0, 100, 100);
32 HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds); 53 HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds);
33 EXPECT_EQ(HomeCard::HIDDEN, HomeCard::Get()->GetState()); 54 EXPECT_EQ(HomeCard::HIDDEN, HomeCard::Get()->GetState());
34 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect()); 55 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect());
35 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); 56 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
36 57
37 // bottom -> centered for virtual keyboard. 58 // bottom -> centered for virtual keyboard.
38 WindowManager::GetInstance()->ToggleOverview(); 59 WindowManager::GetInstance()->ToggleOverview();
39 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); 60 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
40 HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds); 61 HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds);
41 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); 62 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
63 EXPECT_EQ(0, GetHomeCardWindow()->GetTargetBounds().y());
42 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect()); 64 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect());
43 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); 65 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
44 66
45 // Overview mode has to finish before ending test, otherwise it crashes. 67 // Overview mode has to finish before ending test, otherwise it crashes.
46 // TODO(mukai): fix this. 68 // TODO(mukai): fix this.
47 WindowManager::GetInstance()->ToggleOverview(); 69 WindowManager::GetInstance()->ToggleOverview();
48 } 70 }
49 71
50 // Verify if the home card is correctly minimized after app launch. 72 // Verify if the home card is correctly minimized after app launch.
51 TEST_F(HomeCardTest, AppSelection) { 73 TEST_F(HomeCardTest, AppSelection) {
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 214
193 generator.GestureScrollSequence(gfx::Point(x, bottom - 1), 215 generator.GestureScrollSequence(gfx::Point(x, bottom - 1),
194 gfx::Point(x, 20), 216 gfx::Point(x, 20),
195 base::TimeDelta::FromSeconds(1), 217 base::TimeDelta::FromSeconds(1),
196 10); 218 10);
197 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); 219 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
198 EXPECT_TRUE(WindowManager::GetInstance()->IsOverviewModeActive()); 220 EXPECT_TRUE(WindowManager::GetInstance()->IsOverviewModeActive());
199 } 221 }
200 222
201 } // namespace athena 223 } // namespace athena
OLDNEW
« no previous file with comments | « athena/home/home_card_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698