Keep the split view activities topmost in z-order in Athena

athena/wm/window_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/wm/public/window_manager.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/athena_test_base.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/split_view_controller.h"
 #include "athena/wm/test/window_manager_impl_test_api.h"
 #include "athena/wm/window_manager_impl.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/window_util.h"
 
-namespace {
-
-scoped_ptr<aura::Window> CreateWindow(aura::WindowDelegate* delegate) {
-  scoped_ptr<aura::Window> window(new aura::Window(delegate));
-  window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window->Init(aura::WINDOW_LAYER_SOLID_COLOR);
-  window->Show();
-  return window.Pass();
-}
-
-}  // namespace
-
 namespace athena {
 
-typedef test::AthenaTestBase WindowManagerTest;
+class WindowManagerTest : public test::AthenaTestBase {
+ public:
+  WindowManagerTest() {}
+  virtual ~WindowManagerTest() {}
+
+  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();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
+};
 
 TEST_F(WindowManagerTest, Empty) {
 }
 
 TEST_F(WindowManagerTest, OverviewModeBasics) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> first(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateWindow(&delegate));
+  scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
-  aura::client::ParentWindowWithContext(
-      first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  wm::ActivateWindow(second.get());
 
   ASSERT_FALSE(WindowManager::GetInstance()->IsOverviewModeActive());
   EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
   EXPECT_EQ(gfx::Screen::GetNativeScreen()
                 ->GetPrimaryDisplay()
                 .work_area()
                 .size()
                 .ToString(),
             first->bounds().size().ToString());
   EXPECT_FALSE(WindowManager::GetInstance()->IsOverviewModeActive());
@@ skipping 16 matching lines @@
   WindowManager::GetInstance()->ToggleOverview();
   ASSERT_FALSE(WindowManager::GetInstance()->IsOverviewModeActive());
   EXPECT_FALSE(first->IsVisible());
   EXPECT_TRUE(second->IsVisible());
 }
 
 TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> w1(CreateTestWindow(&delegate, gfx::Rect()));
-  scoped_ptr<aura::Window> w2(CreateTestWindow(&delegate, gfx::Rect()));
-  scoped_ptr<aura::Window> w3(CreateTestWindow(&delegate, gfx::Rect()));
-  wm::ActivateWindow(w3.get());
+  scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
 
   WindowManager::GetInstance()->ToggleOverview();
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
 
   // Go into split-view mode.
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
-  overview_delegate->OnSplitViewMode(NULL, w2.get());
+  overview_delegate->OnSplitViewMode(w3.get(), NULL);
   EXPECT_TRUE(w3->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_FALSE(w1->IsVisible());
 }
 
 TEST_F(WindowManagerTest, BezelGestureToSplitViewMode) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> first(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> third(CreateWindow(&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;
-  aura::client::ParentWindowWithContext(
-      first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
 
   // Test that going into split-view mode with two-finger gesture selects the
   // correct windows on left and right splits.
   ui::test::EventGenerator generator(root_window());
   const gfx::Point start_points[2] = {
       gfx::Point(2, 10), gfx::Point(4, 20),
   };
   const int kEventTimeSepration = 16;
   int x_middle = root_window()->bounds().width() / 2;
   generator.GestureMultiFingerScroll(
       2, start_points, kEventTimeSepration, 1, x_middle, 0);
   ASSERT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_EQ(second.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(third.get(), wm_api.GetSplitViewController()->right_window());
   EXPECT_EQ(second->bounds().size().ToString(),
             third->bounds().size().ToString());
 }
 
 TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> first(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> third(CreateWindow(&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();
 
   test::WindowManagerImplTestApi wm_api;
-  aura::client::ParentWindowWithContext(
-      first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-
   EXPECT_EQ(third.get(),
             wm_api.GetWindowListProvider()->GetWindowList().back());
 
   // Do a two-finger swipe from the left bezel.
   ui::test::EventGenerator generator(root_window());
   const gfx::Point left_bezel_points[2] = {
       gfx::Point(2, 10), gfx::Point(4, 20),
   };
   const int kEventTimeSepration = 16;
   int width = root_window()->bounds().width();
   generator.GestureMultiFingerScroll(
       2, left_bezel_points, kEventTimeSepration, 1, width, 0);
   EXPECT_TRUE(wm::IsActiveWindow(second.get()));
   EXPECT_EQ(second.get(),
             wm_api.GetWindowListProvider()->GetWindowList().back());
   EXPECT_FALSE(first->IsVisible());
   EXPECT_TRUE(second->IsVisible());
   EXPECT_FALSE(third->IsVisible());
 }
 
 TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
-  scoped_ptr<aura::Window> first(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> third(CreateWindow(&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;
-  aura::client::ParentWindowWithContext(
-      first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-
   EXPECT_EQ(third.get(),
             wm_api.GetWindowListProvider()->GetWindowList().back());
 
   // Do a title-swipe from the top to switch to the previous window.
   ui::test::EventGenerator generator(root_window());
   generator.GestureScrollSequence(gfx::Point(20, 10),
                                   gfx::Point(20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_TRUE(wm::IsActiveWindow(second.get()));
@@ skipping 21 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(third.get()));
   EXPECT_EQ(third.get(),
             wm_api.GetWindowListProvider()->GetWindowList().back());
   EXPECT_FALSE(second->IsVisible());
   EXPECT_TRUE(third->IsVisible());
 }
 
 TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
-  scoped_ptr<aura::Window> first(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> third(CreateWindow(&delegate));
-  scoped_ptr<aura::Window> fourth(CreateWindow(&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;
-  aura::client::ParentWindowWithContext(
-      first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  aura::client::ParentWindowWithContext(
-      fourth.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
 
   // Test that going into split-view mode with two-finger gesture selects the
   // correct windows on left and right splits.
   ui::test::EventGenerator generator(root_window());
   const gfx::Point start_points[2] = {
       gfx::Point(2, 10), gfx::Point(4, 20),
   };
   const int kEventTimeSepration = 16;
   int x_middle = root_window()->bounds().width() / 2;
   generator.GestureMultiFingerScroll(
       2, start_points, kEventTimeSepration, 1, x_middle, 0);
   ASSERT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_EQ(third.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(fourth.get(), wm_api.GetSplitViewController()->right_window());
 
   // Swipe the title of the left window. It should switch to |second|.
   generator.GestureScrollSequence(gfx::Point(20, 10),
                                   gfx::Point(20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_EQ(second.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(fourth.get(), wm_api.GetSplitViewController()->right_window());
+  EXPECT_TRUE(wm::IsActiveWindow(second.get()));
   aura::Window::Windows windows =
       wm_api.GetWindowListProvider()->GetWindowList();
   ASSERT_EQ(4u, windows.size());
   EXPECT_EQ(second.get(), windows[3]);
-  EXPECT_EQ(third.get(), windows[2]);
-  EXPECT_EQ(fourth.get(), windows[1]);
+  EXPECT_EQ(fourth.get(), windows[2]);
+  EXPECT_EQ(third.get(), windows[1]);
 
   // Swipe the title of the right window now. It should switch to |third|.
   generator.GestureScrollSequence(gfx::Point(x_middle + 20, 10),
                                   gfx::Point(x_middle + 20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_EQ(second.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(third.get(), wm_api.GetSplitViewController()->right_window());
+  EXPECT_TRUE(wm::IsActiveWindow(third.get()));
+  windows = wm_api.GetWindowListProvider()->GetWindowList();
+  ASSERT_EQ(4u, windows.size());
+  EXPECT_EQ(third.get(), windows[3]);
+  EXPECT_EQ(second.get(), windows[2]);
+  EXPECT_EQ(fourth.get(), windows[1]);
 }
 
 TEST_F(WindowManagerTest, NewWindowBounds) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> first(CreateWindow(&delegate));
+  scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
-  aura::client::ParentWindowWithContext(
-      first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
+
   // The window should have the same size as the container.
   const gfx::Size work_area =
       gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().size();
   EXPECT_EQ(work_area.ToString(),
             first->bounds().size().ToString());
   EXPECT_TRUE(first->bounds().origin().IsOrigin());
 
   // A second window should have the same bounds as the first one.
-  scoped_ptr<aura::Window> second(CreateWindow(&delegate));
-  aura::client::ParentWindowWithContext(
-      second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
+  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, second.get());
   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(CreateWindow(&delegate));
-  aura::client::ParentWindowWithContext(
-      third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
+  scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
   EXPECT_EQ(wm_api.GetSplitViewController()->left_window(), third.get());
   EXPECT_EQ(left_bounds.ToString(), third->bounds().ToString());
 }
 
 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(CreateTestWindow(&delegate, gfx::Rect()));
-  w2->Show();
+  scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
 
-  generator.PressKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
-  generator.ReleaseKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
+  wm_api.wm()->ToggleSplitView();

[pkotwicz, 2014/09/08 02:27:46]

In order for accelerators to work when an activity is active, there must a
views::FocusManager. (i.e. we need to use views::Widgets in tests instead of
aura::Windows)
I do not mind changing these tests to use views::Widgets. Though it would be
nice to clean up the "AthenaContainerLayoutManager::SetChildBounds() empty
requested bounds hack" first

   EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   int width =
       gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().width();
 
   EXPECT_EQ(width / 2, w1->bounds().width());
   EXPECT_EQ(width / 2, w2->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());
   EXPECT_EQ(width, w2->bounds().width());
 }
 
 TEST_F(WindowManagerTest, OverviewModeFromSplitMode) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> w1(CreateTestWindow(&delegate, gfx::Rect()));
-  scoped_ptr<aura::Window> w2(CreateTestWindow(&delegate, gfx::Rect()));
-  scoped_ptr<aura::Window> w3(CreateTestWindow(&delegate, gfx::Rect()));
+  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(w3.get(), NULL);
   WindowManager::GetInstance()->ToggleOverview();
   EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_EQ(w3.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(w2.get(), wm_api.GetSplitViewController()->right_window());
 
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
   overview_delegate->OnSelectWindow(w1.get());
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_TRUE(w1->IsVisible());
   // Make sure the windows that were in split-view mode are hidden.
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 }
 
 }  // namespace athena