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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/wm/window_manager_unittest.cc

Issue 574113004: [Athena] Fix switching activities by swiping from the right bezel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_split
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/wm/window_manager_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_manager_unittest.cc
diff --git a/athena/wm/window_manager_unittest.cc b/athena/wm/window_manager_unittest.cc
index 44c44e2773c86538b7a14fc8a0771893aebd21e0..0f6693ae6b0ec6a8d463fb7475cd711dd096a0ce 100644
--- a/athena/wm/window_manager_unittest.cc
+++ b/athena/wm/window_manager_unittest.cc
@@ -26,9 +26,11 @@ class WindowManagerTest : public test::AthenaTestBase {
WindowManagerTest() {}
virtual ~WindowManagerTest() {}
- scoped_ptr<aura::Window> CreateAndShowWindow(aura::WindowDelegate* delegate) {
+ scoped_ptr<aura::Window> CreateAndActivateWindow(
+ aura::WindowDelegate* delegate) {
scoped_ptr<aura::Window> window(CreateTestWindow(delegate, gfx::Rect()));
window->Show();
+ wm::ActivateWindow(window.get());
return window.Pass();
}
@@ -38,8 +40,8 @@ class WindowManagerTest : public test::AthenaTestBase {
TEST_F(WindowManagerTest, OverviewModeBasics) {
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
test::WindowManagerImplTestApi wm_api;
wm::ActivateWindow(second.get());
@@ -79,9 +81,9 @@ TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
test::WindowManagerImplTestApi wm_api;
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> w1(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> w2(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> w3(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
wm::ActivateWindow(w3.get());
WindowManager::Get()->ToggleOverview();
@@ -99,8 +101,8 @@ TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
TEST_F(WindowManagerTest, NewWindowFromOverview) {
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> w1(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> w2(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
WindowManager::Get()->ToggleOverview();
EXPECT_TRUE(w1->IsVisible());
@@ -108,7 +110,7 @@ TEST_F(WindowManagerTest, NewWindowFromOverview) {
// Test that opening a new window exits overview mode. The new window could
// have been opened by JavaScript or by the home card.
- scoped_ptr<aura::Window> w3(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
ASSERT_FALSE(WindowManager::Get()->IsOverviewModeActive());
EXPECT_TRUE(w3->IsVisible());
@@ -119,9 +121,9 @@ TEST_F(WindowManagerTest, NewWindowFromOverview) {
TEST_F(WindowManagerTest, BezelGestureToSplitViewMode) {
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
test::WindowManagerImplTestApi wm_api;
@@ -144,9 +146,9 @@ TEST_F(WindowManagerTest, BezelGestureToSplitViewMode) {
TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
first->Hide();
second->Hide();
@@ -160,21 +162,32 @@ TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
const gfx::Point left_bezel_points[2] = {
gfx::Point(2, 10), gfx::Point(4, 20),
};
- const int kEventTimeSepration = 16;
+ const int kEventTimeSeparation = 16;
int width = root_window()->bounds().width();
generator.GestureMultiFingerScroll(
- 2, left_bezel_points, kEventTimeSepration, 1, width, 0);
+ 2, left_bezel_points, kEventTimeSeparation, 1, width, 0);
EXPECT_TRUE(wm::IsActiveWindow(second.get()));
EXPECT_EQ(second.get(),
wm_api.GetWindowListProvider()->GetWindowList().back());
+
+ // Do a two-finger swipe from the right bezel.
+ const gfx::Point right_bezel_points[2] = {
+ gfx::Point(width - 5, 10),
+ gfx::Point(width - 10, 20)
+ };
+ generator.GestureMultiFingerScroll(
+ 2, right_bezel_points, kEventTimeSeparation, 1, -width, 0);
+ EXPECT_TRUE(wm::IsActiveWindow(third.get()));
+ EXPECT_EQ(third.get(),
+ wm_api.GetWindowListProvider()->GetWindowList().back());
}
TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
aura::test::TestWindowDelegate delegate;
delegate.set_window_component(HTCAPTION);
- scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
test::WindowManagerImplTestApi wm_api;
@@ -219,10 +232,10 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
aura::test::TestWindowDelegate delegate;
delegate.set_window_component(HTCAPTION);
- scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> fourth(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> fourth(CreateAndActivateWindow(&delegate));
test::WindowManagerImplTestApi wm_api;
@@ -262,13 +275,13 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
EXPECT_EQ(third.get(), wm_api.GetSplitViewController()->right_window());
windows = wm_api.GetWindowListProvider()->GetWindowList();
ASSERT_EQ(4u, windows.size());
- EXPECT_EQ(second.get(), windows[3]);
- EXPECT_EQ(third.get(), windows[2]);
+ EXPECT_EQ(third.get(), windows[3]);
+ EXPECT_EQ(second.get(), windows[2]);
}
TEST_F(WindowManagerTest, NewWindowBounds) {
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
test::WindowManagerImplTestApi wm_api;
// The window should have the same size as the container.
@@ -279,18 +292,18 @@ TEST_F(WindowManagerTest, NewWindowBounds) {
EXPECT_TRUE(first->bounds().origin().IsOrigin());
// A second window should have the same bounds as the first one.
- scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
// Get into split view.
- wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL);
+ wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL, NULL);
const gfx::Rect left_bounds =
wm_api.GetSplitViewController()->left_window()->bounds();
EXPECT_NE(work_area.ToString(),
left_bounds.size().ToString());
// A new window should replace the left window when in split view.
- scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
EXPECT_EQ(wm_api.GetSplitViewController()->left_window(), third.get());
EXPECT_EQ(left_bounds.ToString(), third->bounds().ToString());
}
@@ -299,21 +312,16 @@ TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
test::WindowManagerImplTestApi wm_api;
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> w1(CreateTestWindow(&delegate, gfx::Rect()));
- w1->Show();
-
- ui::test::EventGenerator generator(root_window());
+ scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
// Splitview mode needs at least two windows.
- generator.PressKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
- generator.ReleaseKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
+ wm_api.wm()->ToggleSplitView();
EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
- scoped_ptr<aura::Window> w2(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
w2->Show();
- generator.PressKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
- generator.ReleaseKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
+ wm_api.wm()->ToggleSplitView();
EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
int width =
gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().width();
@@ -322,8 +330,7 @@ TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
EXPECT_GE(width / 2, w1->bounds().width());
// Toggle back to normal mode.
- generator.PressKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
- generator.ReleaseKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
+ wm_api.wm()->ToggleSplitView();
EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
EXPECT_EQ(width, w1->bounds().width());
@@ -334,12 +341,12 @@ TEST_F(WindowManagerTest, OverviewModeFromSplitMode) {
test::WindowManagerImplTestApi wm_api;
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> w1(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> w2(CreateAndShowWindow(&delegate));
- scoped_ptr<aura::Window> w3(CreateAndShowWindow(&delegate));
+ scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
+ scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
// Get into split-view mode, and then turn on overview mode.
- wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL);
+ wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL, NULL);
WindowManager::Get()->ToggleOverview();
EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
EXPECT_EQ(w3.get(), wm_api.GetSplitViewController()->left_window());
« no previous file with comments | « athena/wm/window_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698