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/test/athena_test_base.h" | 9 #include "athena/test/athena_test_base.h" |
10 #include "athena/wm/public/window_manager.h" | 10 #include "athena/wm/public/window_manager.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
50 TEST_F(HomeCardTest, AppSelection) { | 50 TEST_F(HomeCardTest, AppSelection) { |
51 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 51 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
52 | 52 |
53 WindowManager::GetInstance()->ToggleOverview(); | 53 WindowManager::GetInstance()->ToggleOverview(); |
54 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 54 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
55 | 55 |
56 athena::ActivityManager::Get()->AddActivity( | 56 athena::ActivityManager::Get()->AddActivity( |
57 athena::ActivityFactory::Get()->CreateWebActivity( | 57 athena::ActivityFactory::Get()->CreateWebActivity( |
58 NULL, GURL("http://www.google.com/"))); | 58 NULL, GURL("http://www.google.com/"))); |
59 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 59 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
60 | |
61 // Overview mode has to finish before ending test, otherwise it crashes. | |
62 // TODO(mukai): fix this. | |
63 WindowManager::GetInstance()->ToggleOverview(); | |
64 } | 60 } |
65 | 61 |
66 TEST_F(HomeCardTest, Accelerators) { | 62 TEST_F(HomeCardTest, Accelerators) { |
67 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 63 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
68 | 64 |
69 aura::test::EventGenerator generator(root_window()); | 65 aura::test::EventGenerator generator(root_window()); |
70 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); | 66 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); |
71 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); | 67 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); |
72 | 68 |
73 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); | 69 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); |
74 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 70 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
75 | 71 |
76 // Do nothing for BOTTOM. | 72 // Do nothing for BOTTOM. |
77 WindowManager::GetInstance()->ToggleOverview(); | 73 WindowManager::GetInstance()->ToggleOverview(); |
78 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 74 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
79 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); | 75 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); |
80 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 76 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
81 | 77 |
82 // Do nothing if the centered state is a temporary state. | 78 // Do nothing if the centered state is a temporary state. |
83 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect(0, 0, 100, 100)); | 79 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect(0, 0, 100, 100)); |
84 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); | 80 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); |
85 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); | 81 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); |
86 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); | 82 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); |
87 | 83 |
88 // Overview mode has to finish before ending test, otherwise it crashes. | 84 // Overview mode has to finish before ending test, otherwise it crashes. |
89 // TODO(mukai): fix this. | 85 // TODO(mukai): fix this. |
90 WindowManager::GetInstance()->ToggleOverview(); | 86 WindowManager::GetInstance()->ToggleOverview(); |
Jun Mukai
2014/07/24 17:03:25
also remove this
| |
91 } | 87 } |
92 | 88 |
93 } // namespace athena | 89 } // namespace athena |
OLD | NEW |