Parameterize Ash unittests to pass with material design enabled

ash/root_window_controller_unittest.cc

 // Copyright (c) 2012 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 "ash/root_window_controller.h"
 
 #include <memory>
 
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
+#include "ash/test/material_design_controller_test_api.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
@@ skipping 62 matching lines @@
 
   aura::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(DeleteOnBlurDelegate);
 };
 
 }  // namespace
 
 namespace test {
 
-class RootWindowControllerTest : public test::AshTestBase {
+class RootWindowControllerTest
+    : public test::AshTestBase,
+      public testing::WithParamInterface<ash::MaterialDesignController::Mode> {
  public:
+  RootWindowControllerTest() : md_maximized_window_height_offset_(0) {}
+
+  void SetUp() override {
+    test::AshTestBase::SetUp();
+    material_design_state_.reset(
+        new test::MaterialDesignControllerTestAPI(GetParam()));
+    md_maximized_window_height_offset_ =
+        ash::MaterialDesignController::IsMaterial() ? -1 : 0;
+  }
+
+  void TearDown() override {
+    material_design_state_.reset();
+    test::AshTestBase::TearDown();
+  }
+
   views::Widget* CreateTestWidget(const gfx::Rect& bounds) {
     views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
         NULL, CurrentContext(), bounds);
     widget->Show();
     return widget;
   }
 
   views::Widget* CreateModalWidget(const gfx::Rect& bounds) {
     views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
         new TestDelegate(true), CurrentContext(), bounds);
     widget->Show();
     return widget;
   }
 
   views::Widget* CreateModalWidgetWithParent(const gfx::Rect& bounds,
                                              gfx::NativeWindow parent) {
     views::Widget* widget =
         views::Widget::CreateWindowWithParentAndBounds(new TestDelegate(true),
                                                        parent,
                                                        bounds);
     widget->Show();
     return widget;
   }
 
   aura::Window* GetModalContainer(aura::Window* root_window) {
     return Shell::GetContainer(root_window,
                                ash::kShellWindowId_SystemModalContainer);
   }
+
+  int GetMdMaximizedWindowHeightOffset() {
+    return md_maximized_window_height_offset_;
+  }
+
+ private:
+  std::unique_ptr<test::MaterialDesignControllerTestAPI>
+      material_design_state_;
+
+  // The material design shelf is taller (by 1px) so use this offset to
+  // adjust the expected height of a maximized window.
+  int md_maximized_window_height_offset_;
 };
 
-TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
+// Note: First argument is optional and intentionally left blank.
+// (it's a prefix for the generated test cases)
+INSTANTIATE_TEST_CASE_P(
+    ,
+    RootWindowControllerTest,
+    testing::Values(ash::MaterialDesignController::NON_MATERIAL,
+                    ash::MaterialDesignController::MATERIAL_NORMAL,
+                    ash::MaterialDesignController::MATERIAL_EXPERIMENTAL));
+
+TEST_P(RootWindowControllerTest, MoveWindows_Basic) {
   if (!SupportsMultipleDisplays())
     return;
+  const int height_offset = GetMdMaximizedWindowHeightOffset();
+
   // Windows origin should be doubled when moved to the 1st display.
   UpdateDisplay("600x600,300x300");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   views::Widget* normal = CreateTestWidget(gfx::Rect(650, 10, 100, 100));
   EXPECT_EQ(root_windows[1], normal->GetNativeView()->GetRootWindow());
   EXPECT_EQ("650,10 100x100", normal->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("50,10 100x100",
             normal->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   views::Widget* maximized = CreateTestWidget(gfx::Rect(700, 10, 100, 100));
   maximized->Maximize();
   EXPECT_EQ(root_windows[1], maximized->GetNativeView()->GetRootWindow());
-  EXPECT_EQ("600,0 300x253", maximized->GetWindowBoundsInScreen().ToString());
-  EXPECT_EQ("0,0 300x253",
+  EXPECT_EQ(gfx::Rect(600, 0, 300, 253 + height_offset).ToString(),
+            maximized->GetWindowBoundsInScreen().ToString());
+  EXPECT_EQ(gfx::Rect(0, 0, 300, 253 + height_offset).ToString(),
             maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   views::Widget* minimized = CreateTestWidget(gfx::Rect(800, 10, 100, 100));
   minimized->Minimize();
   EXPECT_EQ(root_windows[1], minimized->GetNativeView()->GetRootWindow());
   EXPECT_EQ("800,10 100x100",
             minimized->GetWindowBoundsInScreen().ToString());
 
   views::Widget* fullscreen = CreateTestWidget(gfx::Rect(850, 10, 100, 100));
   fullscreen->SetFullscreen(true);
@@ skipping 40 matching lines @@
   EXPECT_EQ("100,20 100x100",
             normal->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   // Maximized area on primary display has 47px for non-md and 48px for md
   // (defined in ash::SHELF_SIZE) inset at the bottom.
 
   // First clear fullscreen status, since both fullscreen and maximized windows
   // share the same desktop workspace, which cancels the shelf status.
   fullscreen->SetFullscreen(false);
   EXPECT_EQ(root_windows[0], maximized->GetNativeView()->GetRootWindow());
-  EXPECT_EQ("0,0 600x553", maximized->GetWindowBoundsInScreen().ToString());
-  EXPECT_EQ("0,0 600x553",
+  EXPECT_EQ(gfx::Rect(0, 0, 600, 553 + height_offset).ToString(),
+            maximized->GetWindowBoundsInScreen().ToString());
+  EXPECT_EQ(gfx::Rect(0, 0, 600, 553 + height_offset).ToString(),
             maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   // Set fullscreen to true, but maximized window's size won't change because
   // it's not visible. see crbug.com/504299.
   fullscreen->SetFullscreen(true);
   EXPECT_EQ(root_windows[0], maximized->GetNativeView()->GetRootWindow());
-  EXPECT_EQ("0,0 600x553", maximized->GetWindowBoundsInScreen().ToString());
-  EXPECT_EQ("0,0 600x553",
+  EXPECT_EQ(gfx::Rect(0, 0, 600, 553 + height_offset).ToString(),
+            maximized->GetWindowBoundsInScreen().ToString());
+  EXPECT_EQ(gfx::Rect(0, 0, 600, 553 + height_offset).ToString(),
             maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   EXPECT_EQ(root_windows[0], minimized->GetNativeView()->GetRootWindow());
   EXPECT_EQ("400,20 100x100",
             minimized->GetWindowBoundsInScreen().ToString());
 
   EXPECT_EQ(root_windows[0], fullscreen->GetNativeView()->GetRootWindow());
   EXPECT_TRUE(fullscreen->IsFullscreen());
   EXPECT_EQ("0,0 600x600",
             fullscreen->GetWindowBoundsInScreen().ToString());
@@ skipping 16 matching lines @@
   EXPECT_EQ(root_windows[0],
             unparented_control->GetNativeView()->GetRootWindow());
   EXPECT_EQ(kShellWindowId_UnparentedControlContainer,
             unparented_control->GetNativeView()->parent()->id());
 
   // Test if the panel has moved.
   EXPECT_EQ(root_windows[0], panel->GetRootWindow());
   EXPECT_EQ(kShellWindowId_PanelContainer, panel->parent()->id());
 }
 
-TEST_F(RootWindowControllerTest, MoveWindows_Modal) {
+TEST_P(RootWindowControllerTest, MoveWindows_Modal) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("500x500,500x500");
 
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   // Emulate virtual screen coordinate system.
   root_windows[0]->SetBounds(gfx::Rect(0, 0, 500, 500));
   root_windows[1]->SetBounds(gfx::Rect(500, 0, 500, 500));
 
@@ skipping 12 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));
 
   UpdateDisplay("500x500");
   EXPECT_EQ(root_windows[0], modal->GetNativeView()->GetRootWindow());
   EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));
   generator_1st.ClickLeftButton();
   EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));
 }
 
 // Make sure lock related windows moves.
-TEST_F(RootWindowControllerTest, MoveWindows_LockWindowsInUnified) {
+TEST_P(RootWindowControllerTest, MoveWindows_LockWindowsInUnified) {
   if (!SupportsMultipleDisplays())
     return;
   Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(true);
 
   UpdateDisplay("500x500");
   const int kLockScreenWindowId = 1000;
   const int kLockBackgroundWindowId = 1001;
 
   RootWindowController* controller =
       Shell::GetInstance()->GetPrimaryRootWindowController();
@@ skipping 61 matching lines @@
 
   controller = Shell::GetInstance()->GetPrimaryRootWindowController();
 
   ASSERT_EQ(lock_screen->GetNativeWindow(),
             controller->GetRootWindow()->GetChildById(kLockScreenWindowId));
   ASSERT_EQ(lock_background->GetNativeWindow(),
             controller->GetRootWindow()->GetChildById(kLockBackgroundWindowId));
   EXPECT_EQ("0,0 600x500", lock_screen->GetNativeWindow()->bounds().ToString());
 }
 
-TEST_F(RootWindowControllerTest, ModalContainer) {
+TEST_P(RootWindowControllerTest, ModalContainer) {
   UpdateDisplay("600x600");
   Shell* shell = Shell::GetInstance();
   WmShell* wm_shell = WmShell::Get();
   RootWindowController* controller = shell->GetPrimaryRootWindowController();
   EXPECT_EQ(LoginStatus::USER,
             wm_shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(NULL));
 
@@ skipping 20 matching lines @@
             controller->GetSystemModalLayoutManager(
                 lock_modal_widget->GetNativeView()));
   EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 session_modal_widget->GetNativeView()));
 
   shell->session_state_delegate()->UnlockScreen();
 }
 
-TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
+TEST_P(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
   UpdateDisplay("600x600");
   Shell* shell = Shell::GetInstance();
   WmShell* wm_shell = WmShell::Get();
 
   // Configure login screen environment.
   SetUserLoggedIn(false);
   EXPECT_EQ(LoginStatus::NOT_LOGGED_IN,
             wm_shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(0, shell->session_state_delegate()->NumberOfLoggedInUsers());
   EXPECT_FALSE(shell->session_state_delegate()->IsActiveUserSessionStarted());
@@ skipping 25 matching lines @@
             controller->GetSystemModalLayoutManager(NULL));
 
   views::Widget* session_modal_widget =
         CreateModalWidget(gfx::Rect(300, 10, 100, 100));
   EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 session_modal_widget->GetNativeView()));
 }
 
-TEST_F(RootWindowControllerTest, ModalContainerBlockedSession) {
+TEST_P(RootWindowControllerTest, ModalContainerBlockedSession) {
   UpdateDisplay("600x600");
   RootWindowController* controller = Shell::GetPrimaryRootWindowController();
   aura::Window* lock_container =
       controller->GetContainer(kShellWindowId_LockScreenContainer);
   for (int block_reason = FIRST_BLOCK_REASON;
        block_reason < NUMBER_OF_BLOCK_REASONS;
        ++block_reason) {
     views::Widget* session_modal_widget =
           CreateModalWidget(gfx::Rect(300, 10, 100, 100));
     EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
@@ skipping 25 matching lines @@
                   ->layout_manager(),
               controller->GetSystemModalLayoutManager(
                   session_modal_widget->GetNativeView()));
     session_modal_widget->Close();
 
     lock_modal_widget->Close();
     UnblockUserSession();
   }
 }
 
-TEST_F(RootWindowControllerTest, GetWindowForFullscreenMode) {
+TEST_P(RootWindowControllerTest, GetWindowForFullscreenMode) {
   UpdateDisplay("600x600");
   RootWindowController* controller =
       Shell::GetInstance()->GetPrimaryRootWindowController();
 
   Widget* w1 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w1->Maximize();
   Widget* w2 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w2->SetFullscreen(true);
   // |w3| is a transient child of |w2|.
   Widget* w3 = Widget::CreateWindowWithParentAndBounds(NULL,
@@ skipping 11 matching lines @@
   w3->Close();
 
   // Only w2 remains, if minimized GetWindowForFullscreenMode should return
   // NULL.
   w2->Activate();
   EXPECT_EQ(w2->GetNativeWindow(), controller->GetWindowForFullscreenMode());
   w2->Minimize();
   EXPECT_EQ(NULL, controller->GetWindowForFullscreenMode());
 }
 
-TEST_F(RootWindowControllerTest, MultipleDisplaysGetWindowForFullscreenMode) {
+TEST_P(RootWindowControllerTest, MultipleDisplaysGetWindowForFullscreenMode) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("600x600,600x600");
   Shell::RootWindowControllerList controllers =
       Shell::GetInstance()->GetAllRootWindowControllers();
 
   Widget* w1 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w1->Maximize();
   Widget* w2 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
@@ skipping 19 matching lines @@
   // Verify that the first root window controller remains in fullscreen mode
   // when a window on the other display is activated.
   w3->Activate();
   EXPECT_EQ(w2->GetNativeWindow(),
             controllers[0]->GetWindowForFullscreenMode());
   EXPECT_EQ(NULL, controllers[1]->GetWindowForFullscreenMode());
 }
 
 // Test that GetRootWindowController() works with multiple displays and
 // child widgets.
-TEST_F(RootWindowControllerTest, GetRootWindowController) {
+TEST_P(RootWindowControllerTest, GetRootWindowController) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("600x600,600x600");
   Shell::RootWindowControllerList controllers =
       Shell::GetInstance()->GetAllRootWindowControllers();
   ASSERT_EQ(2u, controllers.size());
 
   // Test null.
   EXPECT_FALSE(GetRootWindowController(nullptr));
 
   // Test a widget on the first display.
   Widget* w1 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   EXPECT_EQ(controllers[0],
             GetRootWindowController(w1->GetNativeWindow()->GetRootWindow()));
 
   // Test a child widget.
   Widget* w2 = Widget::CreateWindowWithParentAndBounds(
       nullptr, w1->GetNativeWindow(), gfx::Rect(0, 0, 100, 100));
   EXPECT_EQ(controllers[0],
             GetRootWindowController(w2->GetNativeWindow()->GetRootWindow()));
 
   // Test a widget on the second display.
   Widget* w3 = CreateTestWidget(gfx::Rect(600, 0, 100, 100));
   EXPECT_EQ(controllers[1],
             GetRootWindowController(w3->GetNativeWindow()->GetRootWindow()));
 }
 
 // Test that user session window can't be focused if user session blocked by
 // some overlapping UI.
-TEST_F(RootWindowControllerTest, FocusBlockedWindow) {
+TEST_P(RootWindowControllerTest, FocusBlockedWindow) {
   UpdateDisplay("600x600");
   RootWindowController* controller =
       Shell::GetInstance()->GetPrimaryRootWindowController();
   aura::Window* lock_container =
       controller->GetContainer(kShellWindowId_LockScreenContainer);
   aura::Window* lock_window = Widget::CreateWindowWithParentAndBounds(NULL,
       lock_container, gfx::Rect(0, 0, 100, 100))->GetNativeView();
   lock_window->Show();
   aura::Window* session_window =
       CreateTestWidget(gfx::Rect(0, 0, 100, 100))->GetNativeView();
@@ skipping 38 matching lines @@
     window_ = NULL;
   }
 
   bool destroyed_;
   Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(DestroyedWindowObserver);
 };
 
 // Verifies shutdown doesn't delete windows that are not owned by the parent.
-TEST_F(RootWindowControllerTest, DontDeleteWindowsNotOwnedByParent) {
+TEST_P(RootWindowControllerTest, DontDeleteWindowsNotOwnedByParent) {
   DestroyedWindowObserver observer1;
   aura::test::TestWindowDelegate delegate1;
   aura::Window* window1 = new aura::Window(&delegate1);
   window1->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   window1->set_owned_by_parent(false);
   observer1.SetWindow(window1);
   window1->Init(ui::LAYER_NOT_DRAWN);
   aura::client::ParentWindowWithContext(
       window1, Shell::GetInstance()->GetPrimaryRootWindow(), gfx::Rect());
 
@@ skipping 370 matching lines @@
   keyboard_controller->ui()->GetKeyboardWindow()->SetBounds(
       gfx::Rect(0, 400, 800, 200));
   EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString());
 
   UpdateDisplay("600x800");
   EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString());
 }
 
 }  // namespace test
 }  // namespace ash