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 29 matching lines...) Expand all Loading... |
40 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); | 40 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); |
41 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect()); | 41 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect()); |
42 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 42 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
43 | 43 |
44 // Overview mode has to finish before ending test, otherwise it crashes. | 44 // Overview mode has to finish before ending test, otherwise it crashes. |
45 // TODO(mukai): fix this. | 45 // TODO(mukai): fix this. |
46 WindowManager::GetInstance()->ToggleOverview(); | 46 WindowManager::GetInstance()->ToggleOverview(); |
47 } | 47 } |
48 | 48 |
49 // Verify if the home card is correctly minimized after app launch. | 49 // Verify if the home card is correctly minimized after app launch. |
50 TEST_F(HomeCardTest, AppSelection) { | 50 // TODO(flackr): Fix memory leak and re-enable - http://crbug.com/399241 |
| 51 TEST_F(HomeCardTest, DISABLED_AppSelection) { |
51 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 52 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
52 | 53 |
53 WindowManager::GetInstance()->ToggleOverview(); | 54 WindowManager::GetInstance()->ToggleOverview(); |
54 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 55 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
55 | 56 |
56 athena::ActivityManager::Get()->AddActivity( | 57 athena::ActivityManager::Get()->AddActivity( |
57 athena::ActivityFactory::Get()->CreateWebActivity( | 58 athena::ActivityFactory::Get()->CreateWebActivity( |
58 NULL, GURL("http://www.google.com/"))); | 59 NULL, GURL("http://www.google.com/"))); |
59 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); | 60 EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState()); |
60 } | 61 } |
(...skipping 15 matching lines...) Expand all Loading... |
76 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); | 77 EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState()); |
77 | 78 |
78 // Do nothing if the centered state is a temporary state. | 79 // Do nothing if the centered state is a temporary state. |
79 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect(0, 0, 100, 100)); | 80 HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect(0, 0, 100, 100)); |
80 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); | 81 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); |
81 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); | 82 generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN); |
82 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); | 83 EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState()); |
83 } | 84 } |
84 | 85 |
85 } // namespace athena | 86 } // namespace athena |
OLD | NEW |