Implementation of a full screen app list and re-alphabetized switches

ash/app_list/app_list_presenter_delegate_unittest.cc

 // Copyright 2013 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 <memory>
 
+#include "ash/ash_switches.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_app_list_view_presenter_impl.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
+#include "base/command_line.h"
 #include "base/macros.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {
 namespace {
 
 int64_t GetPrimaryDisplayId() {
   return display::Screen::GetScreen()->GetPrimaryDisplay().id();
 }
 
+void SetFullscreenAppListSwitch() {

[vadimt, 2017/04/19 00:57:15]

You can define it in app_list_switches.h and use everywhere.

[newcomer, 2017/04/20 19:59:01]

Done.

[vadimt, 2017/04/20 20:21:34]

Thanks, but I made a mistake :(, I meant the method that *checks* the flag...

[newcomer, 2017/04/21 19:51:22]

 Roger and Done! I moved both functions into app_list_switches.cc. I'll talk
with you to confirm if you want both in app_list_switches or just the function
that checks the flag.

+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      app_list::switches::kEnableFullscreenAppList);
+}
+
 }  // namespace
 
-class AppListPresenterDelegateTest : public test::AshTestBase {
+class AppListPresenterDelegateTest
+    : public test::AshTestBase,
+      public ::testing::WithParamInterface<bool> {

[vadimt, 2017/04/19 00:57:15]

Do we need that '::' before 'testing'?

[newcomer, 2017/04/20 19:59:01]

Done.

  public:
   AppListPresenterDelegateTest() {}
   ~AppListPresenterDelegateTest() override {}
 
   app_list::AppListPresenterImpl* app_list_presenter_impl() {
     return &app_list_presenter_impl_;
   }
 
   // testing::Test:
   void SetUp() override {
     AshTestBase::SetUp();
 
     // Make the display big enough to hold the app list.
     UpdateDisplay("1024x768");
   }
 
  private:
   test::TestAppListViewPresenterImpl app_list_presenter_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListPresenterDelegateTest);
 };
 
+// Instantiate the Boolean which is used to toggle the Fullscreen app list in
+// the parameterized tests.
+INSTANTIATE_TEST_CASE_P(, AppListPresenterDelegateTest, testing::Bool());
+
 // Tests that app launcher hides when focus moves to a normal window.
-TEST_F(AppListPresenterDelegateTest, HideOnFocusOut) {
+TEST_P(AppListPresenterDelegateTest, HideOnFocusOut) {
+  bool testWithFullscreen = GetParam();

[sky, 2017/04/19 15:18:51]

test_with_fullscreen That said, why don't you configre this in SetUp() so you
don't need it in each test?

[newcomer, 2017/04/20 19:59:01]

Done! Check SetUp().

+  if (testWithFullscreen)
+    SetFullscreenAppListSwitch();
+
   app_list_presenter_impl()->Show(GetPrimaryDisplayId());
   EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window.get());
 
   EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests that app launcher remains visible when focus is moved to a different
 // window in kShellWindowId_AppListContainer.
-TEST_F(AppListPresenterDelegateTest,
+TEST_P(AppListPresenterDelegateTest,
        RemainVisibleWhenFocusingToApplistContainer) {
+  bool testWithFullscreen = GetParam();
+  if (testWithFullscreen)
+    SetFullscreenAppListSwitch();
+
   app_list_presenter_impl()->Show(GetPrimaryDisplayId());
   EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   aura::Window* applist_container = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(), kShellWindowId_AppListContainer);
   std::unique_ptr<aura::Window> window(
       aura::test::CreateTestWindowWithId(0, applist_container));
   wm::ActivateWindow(window.get());
 
   EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests that clicking outside the app-list bubble closes it.
-TEST_F(AppListPresenterDelegateTest, ClickOutsideBubbleClosesBubble) {
+TEST_P(AppListPresenterDelegateTest, ClickOutsideBubbleClosesBubble) {
+  bool testWithFullscreen = GetParam();
+  if (testWithFullscreen)
+    SetFullscreenAppListSwitch();
   app_list_presenter_impl()->Show(GetPrimaryDisplayId());
   aura::Window* app_window = app_list_presenter_impl()->GetWindow();
   ASSERT_TRUE(app_window);
   ui::test::EventGenerator& generator = GetEventGenerator();
   // Click on the bubble itself. The bubble should remain visible.
   generator.MoveMouseToCenterOf(app_window);
   generator.ClickLeftButton();
   EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   // Click outside the bubble. This should close it.
   gfx::Rect app_window_bounds = app_window->GetBoundsInRootWindow();
   gfx::Point point_outside =
       gfx::Point(app_window_bounds.right(), app_window_bounds.y()) +
       gfx::Vector2d(10, 0);
   generator.MoveMouseToInHost(point_outside);
   generator.ClickLeftButton();
   EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests that clicking outside the app-list bubble closes it.
-TEST_F(AppListPresenterDelegateTest, TapOutsideBubbleClosesBubble) {
+TEST_P(AppListPresenterDelegateTest, TapOutsideBubbleClosesBubble) {
+  bool testWithFullscreen = GetParam();
+  if (testWithFullscreen)
+    SetFullscreenAppListSwitch();
   app_list_presenter_impl()->Show(GetPrimaryDisplayId());
 
   aura::Window* app_window = app_list_presenter_impl()->GetWindow();
   ASSERT_TRUE(app_window);
   gfx::Rect app_window_bounds = app_window->GetBoundsInRootWindow();
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   // Click on the bubble itself. The bubble should remain visible.
   generator.GestureTapAt(app_window_bounds.CenterPoint());
   EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   // Click outside the bubble. This should close it.
   gfx::Point point_outside =
       gfx::Point(app_window_bounds.right(), app_window_bounds.y()) +
       gfx::Vector2d(10, 0);
   generator.GestureTapAt(point_outside);
   EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests opening the app launcher on a non-primary display, then deleting the
 // display.
-TEST_F(AppListPresenterDelegateTest, NonPrimaryDisplay) {
+TEST_P(AppListPresenterDelegateTest, NonPrimaryDisplay) {
   // Set up a screen with two displays (horizontally adjacent).
+  bool testWithFullscreen = GetParam();
+  if (testWithFullscreen)
+    SetFullscreenAppListSwitch();
+
   UpdateDisplay("1024x768,1024x768");
 
   std::vector<WmWindow*> root_windows = ShellPort::Get()->GetAllRootWindows();
   ASSERT_EQ(2u, root_windows.size());
   WmWindow* secondary_root = root_windows[1];
   EXPECT_EQ("1024,0 1024x768", secondary_root->GetBoundsInScreen().ToString());
 
   app_list_presenter_impl()->Show(
       secondary_root->GetDisplayNearestWindow().id());
   EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
@@ skipping 12 matching lines @@
   UpdateDisplay("400x300");
 
   app_list_presenter_impl()->Show(GetPrimaryDisplayId());
   EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   // The top of the app list should be on-screen (even if the bottom is not).
   // We need to manually calculate the Y coordinate of the top of the app list
   // from the anchor (center) and height. There isn't a bounds rect that gives
   // the actual app list position (the widget bounds include the bubble border
   // which is much bigger than the actual app list size).
+
   app_list::AppListView* app_list = app_list_presenter_impl()->GetView();
   int app_list_view_top =
       app_list->anchor_rect().y() - app_list->bounds().height() / 2;
   const int kMinimalAppListMargin = 10;
+
   EXPECT_GE(app_list_view_top, kMinimalAppListMargin);
 }
 
 }  // namespace ash