Skip to content

GitLab

T
tangled
Commit c0e15aa2 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Commit Bot
Browse files
Options

assistant: add shelf layout unit tests 

* Add a couple shelf layout tests to make sure when Assistant
  is invoked in tablet mode with/without apps, the hotseat state
  won't change.

Bug: None
Test: unit tests
Change-Id: I7103fe9489f780cd441942801aa4d03b71825dbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2013752
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarToni Baržić <tbarzic@chromium.org>
Reviewed-by: default avatarManu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734728}
parent 7470b0a4
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 74 deletions
ash/app_list/views/assistant/assistant_test_api_impl.cc
View file @ c0e15aa2
...@@ -133,6 +133,10 @@ AssistantState* AssistantTestApiImpl::GetAssistantState() { ...@@ -133,6 +133,10 @@ AssistantState* AssistantTestApiImpl::GetAssistantState() {
return AssistantState::Get(); return AssistantState::Get();
} }
void AssistantTestApiImpl::WaitUntilIdle() {
base::RunLoop().RunUntilIdle();
}
void AssistantTestApiImpl::EnableAnimations() { void AssistantTestApiImpl::EnableAnimations() {
scoped_animation_duration_ = nullptr; scoped_animation_duration_ = nullptr;
AppListView::SetShortAnimationForTesting(false); AppListView::SetShortAnimationForTesting(false);
......
ash/app_list/views/assistant/assistant_test_api_impl.h
View file @ c0e15aa2
...@@ -33,6 +33,7 @@ class AssistantTestApiImpl : public AssistantTestApi { ...@@ -33,6 +33,7 @@ class AssistantTestApiImpl : public AssistantTestApi {
void SetTabletMode(bool enable) override; void SetTabletMode(bool enable) override;
void SetPreferVoice(bool value) override; void SetPreferVoice(bool value) override;
AssistantState* GetAssistantState() override; AssistantState* GetAssistantState() override;
void WaitUntilIdle() override;
views::View* page_view() override; views::View* page_view() override;
views::View* main_view() override; views::View* main_view() override;
views::View* ui_element_container() override; views::View* ui_element_container() override;
......
ash/public/cpp/test/assistant_test_api.h
View file @ c0e15aa2
...@@ -55,6 +55,9 @@ class ASH_EXPORT AssistantTestApi { ...@@ -55,6 +55,9 @@ class ASH_EXPORT AssistantTestApi {
// Returns the interface to get/set Assistant related prefs and states. // Returns the interface to get/set Assistant related prefs and states.
virtual AssistantState* GetAssistantState() = 0; virtual AssistantState* GetAssistantState() = 0;
// Wait for all Assistant related actions to settle.
virtual void WaitUntilIdle() = 0;
// Returns the top-level Assistant specific view. // Returns the top-level Assistant specific view.
// Can only be used after the Assistant UI has been shown at least once. // Can only be used after the Assistant UI has been shown at least once.
virtual views::View* page_view() = 0; virtual views::View* page_view() = 0;
......
ash/shelf/hotseat_widget_unittest.cc
View file @ c0e15aa2
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "ash/focus_cycler.h" #include "ash/focus_cycler.h"
#include "ash/home_screen/drag_window_from_shelf_controller_test_api.h" #include "ash/home_screen/drag_window_from_shelf_controller_test_api.h"
#include "ash/public/cpp/ash_features.h" #include "ash/public/cpp/ash_features.h"
#include "ash/public/cpp/test/assistant_test_api.h"
#include "ash/public/cpp/test/shell_test_api.h" #include "ash/public/cpp/test/shell_test_api.h"
#include "ash/shelf/home_button.h" #include "ash/shelf/home_button.h"
#include "ash/shelf/shelf.h" #include "ash/shelf/shelf.h"
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
#include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
#include "chromeos/constants/chromeos_features.h" #include "chromeos/constants/chromeos_features.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/client/aura_constants.h" #include "ui/aura/client/aura_constants.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/events/gesture_detection/gesture_configuration.h" #include "ui/events/gesture_detection/gesture_configuration.h"
...@@ -52,12 +54,64 @@ ShelfLayoutManager* GetShelfLayoutManager() { ...@@ -52,12 +54,64 @@ ShelfLayoutManager* GetShelfLayoutManager() {
class HotseatWidgetTest class HotseatWidgetTest
: public ShelfLayoutManagerTestBase, : public ShelfLayoutManagerTestBase,
public testing::WithParamInterface<ShelfAutoHideBehavior> { public testing::WithParamInterface<
std::tuple<ShelfAutoHideBehavior, /*is_assistant_enabled*/ bool>> {
public: public:
HotseatWidgetTest() = default; HotseatWidgetTest()
: ShelfLayoutManagerTestBase(
base::test::TaskEnvironment::TimeSource::MOCK_TIME),
shelf_auto_hide_behavior_(shelf_auto_hide_behavior()),
is_assistant_enabled_(std::get<1>(GetParam())) {
if (is_assistant_enabled_)
assistant_test_api_ = AssistantTestApi::Create();
}
// testing::Test:
void SetUp() override {
ShelfLayoutManagerTestBase::SetUp();
if (is_assistant_enabled_) {
assistant_test_api_->SetAssistantEnabled(true);
assistant_test_api_->GetAssistantState()->NotifyFeatureAllowed(
mojom::AssistantAllowedState::ALLOWED);
assistant_test_api_->GetAssistantState()->NotifyStatusChanged(
mojom::AssistantState::READY);
assistant_test_api_->WaitUntilIdle();
}
}
ShelfAutoHideBehavior shelf_auto_hide_behavior() const {
return shelf_auto_hide_behavior_;
}
bool is_assistant_enabled() const { return is_assistant_enabled_; }
AssistantTestApi* assistant_test_api() { return assistant_test_api_.get(); }
void ShowShelfAndLongPressHome() {
if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
SwipeUpOnShelf();
views::View* home_button =
GetPrimaryShelf()->shelf_widget()->navigation_widget()->GetHomeButton();
auto center_point = home_button->GetBoundsInScreen().CenterPoint();
GetEventGenerator()->set_current_screen_location(center_point);
GetEventGenerator()->PressTouch();
GetAppListTestHelper()->WaitUntilIdle();
// Advance clock to make sure long press gesture is triggered.
task_environment_->AdvanceClock(base::TimeDelta::FromSeconds(5));
GetAppListTestHelper()->WaitUntilIdle();
GetEventGenerator()->ReleaseTouch();
GetAppListTestHelper()->WaitUntilIdle();
}
private: private:
base::test::ScopedFeatureList scoped_feature_list_; base::test::ScopedFeatureList scoped_feature_list_;
const ShelfAutoHideBehavior shelf_auto_hide_behavior_;
const bool is_assistant_enabled_;
std::unique_ptr<AssistantTestApi> assistant_test_api_;
}; };
// Counts the number of times the work area changes. // Counts the number of times the work area changes.
...@@ -101,15 +155,64 @@ class ShelfStateWatcher : public ShelfObserver { ...@@ -101,15 +155,64 @@ class ShelfStateWatcher : public ShelfObserver {
}; };
// Used to test the Hotseat, ScrollabeShelf, and DenseShelf features. // Used to test the Hotseat, ScrollabeShelf, and DenseShelf features.
INSTANTIATE_TEST_SUITE_P(All, INSTANTIATE_TEST_SUITE_P(
HotseatWidgetTest, All,
testing::Values(ShelfAutoHideBehavior::kNever, HotseatWidgetTest,
ShelfAutoHideBehavior::kAlways)); testing::Combine(testing::Values(ShelfAutoHideBehavior::kNever,
ShelfAutoHideBehavior::kAlways),
testing::Bool()));
TEST_P(HotseatWidgetTest, LongPressHomeWithoutAppWindow) {
GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode();
GetAppListTestHelper()->CheckVisibility(true);
HotseatStateWatcher watcher(GetShelfLayoutManager());
ShowShelfAndLongPressHome();
GetAppListTestHelper()->CheckVisibility(true);
EXPECT_EQ(
is_assistant_enabled(),
GetAppListTestHelper()->GetAppListView()->IsShowingEmbeddedAssistantUI());
// Hotseat should not change when showing Assistant.
watcher.CheckEqual({});
}
TEST_P(HotseatWidgetTest, LongPressHomeWithAppWindow) {
GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode();
GetAppListTestHelper()->CheckVisibility(true);
std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
wm::ActivateWindow(window.get());
GetAppListTestHelper()->CheckVisibility(false);
HotseatStateWatcher watcher(GetShelfLayoutManager());
ShowShelfAndLongPressHome();
GetAppListTestHelper()->CheckVisibility(false);
EXPECT_EQ(
is_assistant_enabled(),
GetAppListTestHelper()->GetAppListView()->IsShowingEmbeddedAssistantUI());
std::vector<HotseatState> expected_state;
if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
// |ShowShelfAndLongPressHome()| will bring up shelf so it will trigger one
// hotseat state change.
expected_state.push_back(HotseatState::kExtended);
}
watcher.CheckEqual(expected_state);
}
// Tests that closing a window which was opened prior to entering tablet mode // Tests that closing a window which was opened prior to entering tablet mode
// results in a kShown hotseat. // results in a kShown hotseat.
TEST_P(HotseatWidgetTest, ClosingLastWindowInTabletMode) { TEST_P(HotseatWidgetTest, ClosingLastWindowInTabletMode) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
// Activate the window and go to tablet mode. // Activate the window and go to tablet mode.
...@@ -126,7 +229,7 @@ TEST_P(HotseatWidgetTest, ClosingLastWindowInTabletMode) { ...@@ -126,7 +229,7 @@ TEST_P(HotseatWidgetTest, ClosingLastWindowInTabletMode) {
// Tests that the hotseat is kShown when entering tablet mode with no windows. // Tests that the hotseat is kShown when entering tablet mode with no windows.
TEST_P(HotseatWidgetTest, GoingToTabletModeNoWindows) { TEST_P(HotseatWidgetTest, GoingToTabletModeNoWindows) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
GetAppListTestHelper()->CheckVisibility(true); GetAppListTestHelper()->CheckVisibility(true);
...@@ -135,7 +238,7 @@ TEST_P(HotseatWidgetTest, GoingToTabletModeNoWindows) { ...@@ -135,7 +238,7 @@ TEST_P(HotseatWidgetTest, GoingToTabletModeNoWindows) {
// Tests that the hotseat is kHidden when entering tablet mode with a window. // Tests that the hotseat is kHidden when entering tablet mode with a window.
TEST_P(HotseatWidgetTest, GoingToTabletModeWithWindows) { TEST_P(HotseatWidgetTest, GoingToTabletModeWithWindows) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -150,7 +253,7 @@ TEST_P(HotseatWidgetTest, GoingToTabletModeWithWindows) { ...@@ -150,7 +253,7 @@ TEST_P(HotseatWidgetTest, GoingToTabletModeWithWindows) {
// The in-app Hotseat should not be hidden automatically when the shelf context // The in-app Hotseat should not be hidden automatically when the shelf context
// menu shows (https://crbug.com/1020388). // menu shows (https://crbug.com/1020388).
TEST_P(HotseatWidgetTest, InAppShelfShowingContextMenu) { TEST_P(HotseatWidgetTest, InAppShelfShowingContextMenu) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -196,7 +299,7 @@ TEST_P(HotseatWidgetTest, InAppShelfShowingContextMenu) { ...@@ -196,7 +299,7 @@ TEST_P(HotseatWidgetTest, InAppShelfShowingContextMenu) {
// Tests that a window that is created after going to tablet mode, then closed, // Tests that a window that is created after going to tablet mode, then closed,
// results in a kShown hotseat. // results in a kShown hotseat.
TEST_P(HotseatWidgetTest, CloseLastWindowOpenedInTabletMode) { TEST_P(HotseatWidgetTest, CloseLastWindowOpenedInTabletMode) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -217,7 +320,10 @@ TEST_P(HotseatWidgetTest, CloseLastWindowOpenedInTabletMode) { ...@@ -217,7 +320,10 @@ TEST_P(HotseatWidgetTest, CloseLastWindowOpenedInTabletMode) {
// Tests that swiping up on an autohidden shelf shows the hotseat, and swiping // Tests that swiping up on an autohidden shelf shows the hotseat, and swiping
// down hides it. // down hides it.
TEST_F(HotseatWidgetTest, ShowingAndHidingAutohiddenShelf) { TEST_P(HotseatWidgetTest, ShowingAndHidingAutohiddenShelf) {
if (shelf_auto_hide_behavior() != ShelfAutoHideBehavior::kAlways)
return;
GetPrimaryShelf()->SetAutoHideBehavior(ShelfAutoHideBehavior::kAlways); GetPrimaryShelf()->SetAutoHideBehavior(ShelfAutoHideBehavior::kAlways);
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -243,7 +349,7 @@ TEST_F(HotseatWidgetTest, ShowingAndHidingAutohiddenShelf) { ...@@ -243,7 +349,7 @@ TEST_F(HotseatWidgetTest, ShowingAndHidingAutohiddenShelf) {
// Tests that swiping up on several places in the in-app shelf shows the // Tests that swiping up on several places in the in-app shelf shows the
// hotseat (crbug.com/1016931). // hotseat (crbug.com/1016931).
TEST_F(HotseatWidgetTest, SwipeUpInAppShelfShowsHotseat) { TEST_P(HotseatWidgetTest, SwipeUpInAppShelfShowsHotseat) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -328,7 +434,7 @@ TEST_F(HotseatWidgetTest, SwipeUpInAppShelfShowsHotseat) { ...@@ -328,7 +434,7 @@ TEST_F(HotseatWidgetTest, SwipeUpInAppShelfShowsHotseat) {
// Tests that swiping up on the hotseat does nothing. // Tests that swiping up on the hotseat does nothing.
TEST_P(HotseatWidgetTest, SwipeUpOnHotseatBackgroundDoesNothing) { TEST_P(HotseatWidgetTest, SwipeUpOnHotseatBackgroundDoesNothing) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -350,7 +456,7 @@ TEST_P(HotseatWidgetTest, SwipeUpOnHotseatBackgroundDoesNothing) { ...@@ -350,7 +456,7 @@ TEST_P(HotseatWidgetTest, SwipeUpOnHotseatBackgroundDoesNothing) {
InAppShelfGestures::kSwipeDownToHide, 0); InAppShelfGestures::kSwipeDownToHide, 0);
histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName, histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName,
InAppShelfGestures::kSwipeUpToShow, 1); InAppShelfGestures::kSwipeUpToShow, 1);
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState());
// Swipe up on the Hotseat (parent of ShelfView) does nothing. // Swipe up on the Hotseat (parent of ShelfView) does nothing.
...@@ -367,7 +473,7 @@ TEST_P(HotseatWidgetTest, SwipeUpOnHotseatBackgroundDoesNothing) { ...@@ -367,7 +473,7 @@ TEST_P(HotseatWidgetTest, SwipeUpOnHotseatBackgroundDoesNothing) {
EXPECT_FALSE(Shell::Get()->app_list_controller()->IsVisible()); EXPECT_FALSE(Shell::Get()->app_list_controller()->IsVisible());
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState());
histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName, histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName,
InAppShelfGestures::kSwipeDownToHide, 0); InAppShelfGestures::kSwipeDownToHide, 0);
...@@ -378,7 +484,7 @@ TEST_P(HotseatWidgetTest, SwipeUpOnHotseatBackgroundDoesNothing) { ...@@ -378,7 +484,7 @@ TEST_P(HotseatWidgetTest, SwipeUpOnHotseatBackgroundDoesNothing) {
// Tests that tapping an active window with an extended hotseat results in a // Tests that tapping an active window with an extended hotseat results in a
// hidden hotseat. // hidden hotseat.
TEST_P(HotseatWidgetTest, TappingActiveWindowHidesHotseat) { TEST_P(HotseatWidgetTest, TappingActiveWindowHidesHotseat) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -405,7 +511,7 @@ TEST_P(HotseatWidgetTest, TappingActiveWindowHidesHotseat) { ...@@ -405,7 +511,7 @@ TEST_P(HotseatWidgetTest, TappingActiveWindowHidesHotseat) {
GetEventGenerator()->GestureTapAt(tap_point); GetEventGenerator()->GestureTapAt(tap_point);
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState());
// Tap the active window, the hotseat should hide. // Tap the active window, the hotseat should hide.
...@@ -413,7 +519,7 @@ TEST_P(HotseatWidgetTest, TappingActiveWindowHidesHotseat) { ...@@ -413,7 +519,7 @@ TEST_P(HotseatWidgetTest, TappingActiveWindowHidesHotseat) {
GetEventGenerator()->GestureTapAt(tap_point); GetEventGenerator()->GestureTapAt(tap_point);
EXPECT_EQ(HotseatState::kHidden, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kHidden, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, GetPrimaryShelf()->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, GetPrimaryShelf()->GetAutoHideState());
histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName, histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName,
...@@ -424,7 +530,7 @@ TEST_P(HotseatWidgetTest, TappingActiveWindowHidesHotseat) { ...@@ -424,7 +530,7 @@ TEST_P(HotseatWidgetTest, TappingActiveWindowHidesHotseat) {
// Tests that gesture dragging an active window hides the hotseat. // Tests that gesture dragging an active window hides the hotseat.
TEST_P(HotseatWidgetTest, GestureDraggingActiveWindowHidesHotseat) { TEST_P(HotseatWidgetTest, GestureDraggingActiveWindowHidesHotseat) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -444,7 +550,7 @@ TEST_P(HotseatWidgetTest, GestureDraggingActiveWindowHidesHotseat) { ...@@ -444,7 +550,7 @@ TEST_P(HotseatWidgetTest, GestureDraggingActiveWindowHidesHotseat) {
histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName, histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName,
InAppShelfGestures::kSwipeUpToShow, 1); InAppShelfGestures::kSwipeUpToShow, 1);
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState());
// Gesture drag on the active window, the hotseat should hide. // Gesture drag on the active window, the hotseat should hide.
...@@ -458,7 +564,7 @@ TEST_P(HotseatWidgetTest, GestureDraggingActiveWindowHidesHotseat) { ...@@ -458,7 +564,7 @@ TEST_P(HotseatWidgetTest, GestureDraggingActiveWindowHidesHotseat) {
start, end, base::TimeDelta::FromMilliseconds(10), 4); start, end, base::TimeDelta::FromMilliseconds(10), 4);
EXPECT_EQ(HotseatState::kHidden, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kHidden, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, GetPrimaryShelf()->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, GetPrimaryShelf()->GetAutoHideState());
histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName, histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName,
...@@ -468,7 +574,7 @@ TEST_P(HotseatWidgetTest, GestureDraggingActiveWindowHidesHotseat) { ...@@ -468,7 +574,7 @@ TEST_P(HotseatWidgetTest, GestureDraggingActiveWindowHidesHotseat) {
} }
// Tests that a swipe up on the shelf shows the hotseat while in split view. // Tests that a swipe up on the shelf shows the hotseat while in split view.
TEST_F(HotseatWidgetTest, SwipeUpOnShelfShowsHotseatInSplitView) { TEST_P(HotseatWidgetTest, SwipeUpOnShelfShowsHotseatInSplitView) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -500,7 +606,7 @@ TEST_F(HotseatWidgetTest, SwipeUpOnShelfShowsHotseatInSplitView) { ...@@ -500,7 +606,7 @@ TEST_F(HotseatWidgetTest, SwipeUpOnShelfShowsHotseatInSplitView) {
// Tests that releasing the hotseat gesture below the threshold results in a // Tests that releasing the hotseat gesture below the threshold results in a
// kHidden hotseat when the shelf is shown. // kHidden hotseat when the shelf is shown.
TEST_F(HotseatWidgetTest, ReleasingSlowDragBelowThreshold) { TEST_P(HotseatWidgetTest, ReleasingSlowDragBelowThreshold) {
GetPrimaryShelf()->SetAutoHideBehavior(ShelfAutoHideBehavior::kNever); GetPrimaryShelf()->SetAutoHideBehavior(ShelfAutoHideBehavior::kNever);
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -537,7 +643,7 @@ TEST_F(HotseatWidgetTest, ReleasingSlowDragBelowThreshold) { ...@@ -537,7 +643,7 @@ TEST_F(HotseatWidgetTest, ReleasingSlowDragBelowThreshold) {
// Tests that releasing the hotseat gesture above the threshold results in a // Tests that releasing the hotseat gesture above the threshold results in a
// kExtended hotseat. // kExtended hotseat.
TEST_P(HotseatWidgetTest, ReleasingSlowDragAboveThreshold) { TEST_P(HotseatWidgetTest, ReleasingSlowDragAboveThreshold) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -564,7 +670,7 @@ TEST_P(HotseatWidgetTest, ReleasingSlowDragAboveThreshold) { ...@@ -564,7 +670,7 @@ TEST_P(HotseatWidgetTest, ReleasingSlowDragAboveThreshold) {
kNumScrollSteps); kNumScrollSteps);
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, GetPrimaryShelf()->GetAutoHideState());
histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName, histogram_tester.ExpectBucketCount(kHotseatGestureHistogramName,
InAppShelfGestures::kSwipeDownToHide, 0); InAppShelfGestures::kSwipeDownToHide, 0);
...@@ -575,7 +681,7 @@ TEST_P(HotseatWidgetTest, ReleasingSlowDragAboveThreshold) { ...@@ -575,7 +681,7 @@ TEST_P(HotseatWidgetTest, ReleasingSlowDragAboveThreshold) {
// Tests that showing overview after showing the hotseat results in only one // Tests that showing overview after showing the hotseat results in only one
// animation, to |kExtended|. // animation, to |kExtended|.
TEST_P(HotseatWidgetTest, ShowingOverviewFromShownAnimatesOnce) { TEST_P(HotseatWidgetTest, ShowingOverviewFromShownAnimatesOnce) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -600,7 +706,7 @@ TEST_P(HotseatWidgetTest, ShowingOverviewFromShownAnimatesOnce) { ...@@ -600,7 +706,7 @@ TEST_P(HotseatWidgetTest, ShowingOverviewFromShownAnimatesOnce) {
// Tests that the hotseat is not flush with the bottom of the screen when home // Tests that the hotseat is not flush with the bottom of the screen when home
// launcher is showing. // launcher is showing.
TEST_P(HotseatWidgetTest, HotseatNotFlushWhenHomeLauncherShowing) { TEST_P(HotseatWidgetTest, HotseatNotFlushWhenHomeLauncherShowing) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
const int display_height = const int display_height =
display::Screen::GetScreen()->GetPrimaryDisplay().bounds().height(); display::Screen::GetScreen()->GetPrimaryDisplay().bounds().height();
...@@ -614,7 +720,7 @@ TEST_P(HotseatWidgetTest, HotseatNotFlushWhenHomeLauncherShowing) { ...@@ -614,7 +720,7 @@ TEST_P(HotseatWidgetTest, HotseatNotFlushWhenHomeLauncherShowing) {
// Tests that home -> overview results in only one hotseat state change. // Tests that home -> overview results in only one hotseat state change.
TEST_P(HotseatWidgetTest, HomeToOverviewChangesStateOnce) { TEST_P(HotseatWidgetTest, HomeToOverviewChangesStateOnce) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
// First, try with no windows open. // First, try with no windows open.
...@@ -637,7 +743,7 @@ TEST_P(HotseatWidgetTest, HomeToOverviewChangesStateOnce) { ...@@ -637,7 +743,7 @@ TEST_P(HotseatWidgetTest, HomeToOverviewChangesStateOnce) {
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
wm::ActivateWindow(window.get()); wm::ActivateWindow(window.get());
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
SwipeUpOnShelf(); SwipeUpOnShelf();
views::View* home_button = views::View* home_button =
GetPrimaryShelf()->shelf_widget()->navigation_widget()->GetHomeButton(); GetPrimaryShelf()->shelf_widget()->navigation_widget()->GetHomeButton();
...@@ -657,7 +763,7 @@ TEST_P(HotseatWidgetTest, HomeToOverviewChangesStateOnce) { ...@@ -657,7 +763,7 @@ TEST_P(HotseatWidgetTest, HomeToOverviewChangesStateOnce) {
// Tests that home -> in-app results in only one state change. // Tests that home -> in-app results in only one state change.
TEST_P(HotseatWidgetTest, HomeToInAppChangesStateOnce) { TEST_P(HotseatWidgetTest, HomeToInAppChangesStateOnce) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
// Go to in-app, the hotseat should hide. // Go to in-app, the hotseat should hide.
...@@ -673,7 +779,7 @@ TEST_P(HotseatWidgetTest, HomeToInAppChangesStateOnce) { ...@@ -673,7 +779,7 @@ TEST_P(HotseatWidgetTest, HomeToInAppChangesStateOnce) {
// bottom of the shelf, and tapping the home launcher button results in only one // bottom of the shelf, and tapping the home launcher button results in only one
// state change. // state change.
TEST_P(HotseatWidgetTest, InAppToHomeChangesStateOnce) { TEST_P(HotseatWidgetTest, InAppToHomeChangesStateOnce) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
// Go to in-app with an extended hotseat. // Go to in-app with an extended hotseat.
...@@ -713,7 +819,7 @@ TEST_P(HotseatWidgetTest, InAppToHomeChangesStateOnce) { ...@@ -713,7 +819,7 @@ TEST_P(HotseatWidgetTest, InAppToHomeChangesStateOnce) {
} }
// Nothing left to test for autohidden shelf. // Nothing left to test for autohidden shelf.
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
return; return;
// Go to in-app and do not extend the hotseat. // Go to in-app and do not extend the hotseat.
...@@ -736,7 +842,7 @@ TEST_P(HotseatWidgetTest, InAppToHomeChangesStateOnce) { ...@@ -736,7 +842,7 @@ TEST_P(HotseatWidgetTest, InAppToHomeChangesStateOnce) {
// to overview is still in progress ends up with hotseat in kShown state (and in // to overview is still in progress ends up with hotseat in kShown state (and in
// app shelf not visible). // app shelf not visible).
TEST_P(HotseatWidgetTest, HomeToOverviewAndBack) { TEST_P(HotseatWidgetTest, HomeToOverviewAndBack) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -773,7 +879,7 @@ TEST_P(HotseatWidgetTest, HomeToOverviewAndBack) { ...@@ -773,7 +879,7 @@ TEST_P(HotseatWidgetTest, HomeToOverviewAndBack) {
} }
TEST_P(HotseatWidgetTest, InAppToOverviewAndBack) { TEST_P(HotseatWidgetTest, InAppToOverviewAndBack) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -786,7 +892,7 @@ TEST_P(HotseatWidgetTest, InAppToOverviewAndBack) { ...@@ -786,7 +892,7 @@ TEST_P(HotseatWidgetTest, InAppToOverviewAndBack) {
// Make sure shelf (and overview button) are visible - this is moves the // Make sure shelf (and overview button) are visible - this is moves the
// hotseat into kExtended state. // hotseat into kExtended state.
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
SwipeUpOnShelf(); SwipeUpOnShelf();
gfx::Point overview_button_center = GetPrimaryShelf() gfx::Point overview_button_center = GetPrimaryShelf()
...@@ -824,7 +930,7 @@ TEST_P(HotseatWidgetTest, InAppToOverviewAndBack) { ...@@ -824,7 +930,7 @@ TEST_P(HotseatWidgetTest, InAppToOverviewAndBack) {
// Tests transition to home screen initiated while transition from app window to // Tests transition to home screen initiated while transition from app window to
// overview is in progress. // overview is in progress.
TEST_P(HotseatWidgetTest, GoHomeDuringInAppToOverviewTransition) { TEST_P(HotseatWidgetTest, GoHomeDuringInAppToOverviewTransition) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -837,7 +943,7 @@ TEST_P(HotseatWidgetTest, GoHomeDuringInAppToOverviewTransition) { ...@@ -837,7 +943,7 @@ TEST_P(HotseatWidgetTest, GoHomeDuringInAppToOverviewTransition) {
// Make sure shelf (and overview button) are visible - this is moves the // Make sure shelf (and overview button) are visible - this is moves the
// hotseat into kExtended state. // hotseat into kExtended state.
if (GetParam() == ShelfAutoHideBehavior::kAlways) if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways)
SwipeUpOnShelf(); SwipeUpOnShelf();
gfx::Point overview_button_center = GetPrimaryShelf() gfx::Point overview_button_center = GetPrimaryShelf()
...@@ -878,7 +984,7 @@ TEST_P(HotseatWidgetTest, GoHomeDuringInAppToOverviewTransition) { ...@@ -878,7 +984,7 @@ TEST_P(HotseatWidgetTest, GoHomeDuringInAppToOverviewTransition) {
// Tests that in-app -> overview results in only one state change with an // Tests that in-app -> overview results in only one state change with an
// autohidden shelf. // autohidden shelf.
TEST_F(HotseatWidgetTest, InAppToOverviewChangesStateOnceAutohiddenShelf) { TEST_P(HotseatWidgetTest, InAppToOverviewChangesStateOnceAutohiddenShelf) {
GetPrimaryShelf()->SetAutoHideBehavior(ShelfAutoHideBehavior::kAlways); GetPrimaryShelf()->SetAutoHideBehavior(ShelfAutoHideBehavior::kAlways);
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
...@@ -922,7 +1028,7 @@ TEST_F(HotseatWidgetTest, InAppToOverviewChangesStateOnceAutohiddenShelf) { ...@@ -922,7 +1028,7 @@ TEST_F(HotseatWidgetTest, InAppToOverviewChangesStateOnceAutohiddenShelf) {
// Tests that going between Applist and overview in tablet mode with no windows // Tests that going between Applist and overview in tablet mode with no windows
// results in no work area change. // results in no work area change.
TEST_F(HotseatWidgetTest, TEST_P(HotseatWidgetTest,
WorkAreaDoesNotUpdateAppListToFromOverviewWithNoWindow) { WorkAreaDoesNotUpdateAppListToFromOverviewWithNoWindow) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
DisplayWorkAreaChangeCounter counter; DisplayWorkAreaChangeCounter counter;
...@@ -946,7 +1052,7 @@ TEST_F(HotseatWidgetTest, ...@@ -946,7 +1052,7 @@ TEST_F(HotseatWidgetTest,
// Tests that switching between AppList and overview with a window results in no // Tests that switching between AppList and overview with a window results in no
// work area change. // work area change.
TEST_F(HotseatWidgetTest, TEST_P(HotseatWidgetTest,
WorkAreaDoesNotUpdateAppListToFromOverviewWithWindow) { WorkAreaDoesNotUpdateAppListToFromOverviewWithWindow) {
DisplayWorkAreaChangeCounter counter; DisplayWorkAreaChangeCounter counter;
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
...@@ -991,7 +1097,7 @@ TEST_F(HotseatWidgetTest, ...@@ -991,7 +1097,7 @@ TEST_F(HotseatWidgetTest,
// Tests that switching between AppList and an active window does not update the // Tests that switching between AppList and an active window does not update the
// work area. // work area.
TEST_F(HotseatWidgetTest, WorkAreaDoesNotUpdateOpenWindowToFromAppList) { TEST_P(HotseatWidgetTest, WorkAreaDoesNotUpdateOpenWindowToFromAppList) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1017,7 +1123,7 @@ TEST_F(HotseatWidgetTest, WorkAreaDoesNotUpdateOpenWindowToFromAppList) { ...@@ -1017,7 +1123,7 @@ TEST_F(HotseatWidgetTest, WorkAreaDoesNotUpdateOpenWindowToFromAppList) {
// Tests that switching between overview and an active window does not update // Tests that switching between overview and an active window does not update
// the work area. // the work area.
TEST_F(HotseatWidgetTest, WorkAreaDoesNotUpdateOpenWindowToFromOverview) { TEST_P(HotseatWidgetTest, WorkAreaDoesNotUpdateOpenWindowToFromOverview) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1049,7 +1155,7 @@ TEST_F(HotseatWidgetTest, WorkAreaDoesNotUpdateOpenWindowToFromOverview) { ...@@ -1049,7 +1155,7 @@ TEST_F(HotseatWidgetTest, WorkAreaDoesNotUpdateOpenWindowToFromOverview) {
// Tests that the shelf opaque background is properly updated after a tablet // Tests that the shelf opaque background is properly updated after a tablet
// mode transition with no apps. // mode transition with no apps.
TEST_F(HotseatWidgetTest, ShelfBackgroundNotVisibleInTabletModeNoApps) { TEST_P(HotseatWidgetTest, ShelfBackgroundNotVisibleInTabletModeNoApps) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
EXPECT_FALSE(GetShelfWidget()->GetOpaqueBackground()->visible()); EXPECT_FALSE(GetShelfWidget()->GetOpaqueBackground()->visible());
...@@ -1057,7 +1163,7 @@ TEST_F(HotseatWidgetTest, ShelfBackgroundNotVisibleInTabletModeNoApps) { ...@@ -1057,7 +1163,7 @@ TEST_F(HotseatWidgetTest, ShelfBackgroundNotVisibleInTabletModeNoApps) {
// Tests that the shelf opaque background is properly updated after a tablet // Tests that the shelf opaque background is properly updated after a tablet
// mode transition with no apps with dense shelf. // mode transition with no apps with dense shelf.
TEST_F(HotseatWidgetTest, DenseShelfBackgroundNotVisibleInTabletModeNoApps) { TEST_P(HotseatWidgetTest, DenseShelfBackgroundNotVisibleInTabletModeNoApps) {
UpdateDisplay("300x1000"); UpdateDisplay("300x1000");
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
...@@ -1065,7 +1171,7 @@ TEST_F(HotseatWidgetTest, DenseShelfBackgroundNotVisibleInTabletModeNoApps) { ...@@ -1065,7 +1171,7 @@ TEST_F(HotseatWidgetTest, DenseShelfBackgroundNotVisibleInTabletModeNoApps) {
} }
// Tests that the hotseat is extended if focused with a keyboard. // Tests that the hotseat is extended if focused with a keyboard.
TEST_F(HotseatWidgetTest, ExtendHotseatIfFocusedWithKeyboard) { TEST_P(HotseatWidgetTest, ExtendHotseatIfFocusedWithKeyboard) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1097,7 +1203,7 @@ TEST_F(HotseatWidgetTest, ExtendHotseatIfFocusedWithKeyboard) { ...@@ -1097,7 +1203,7 @@ TEST_F(HotseatWidgetTest, ExtendHotseatIfFocusedWithKeyboard) {
// Tests that if the hotseat was hidden while being focused, doing a traversal // Tests that if the hotseat was hidden while being focused, doing a traversal
// focus on the next element brings it up again. // focus on the next element brings it up again.
TEST_F(HotseatWidgetTest, SwipeDownOnFocusedHotseat) { TEST_P(HotseatWidgetTest, SwipeDownOnFocusedHotseat) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1125,7 +1231,7 @@ TEST_F(HotseatWidgetTest, SwipeDownOnFocusedHotseat) { ...@@ -1125,7 +1231,7 @@ TEST_F(HotseatWidgetTest, SwipeDownOnFocusedHotseat) {
// Tests that in overview, we can still exit by clicking on the hotseat if the // Tests that in overview, we can still exit by clicking on the hotseat if the
// point is not on the visible area. // point is not on the visible area.
TEST_F(HotseatWidgetTest, ExitOverviewWithClickOnHotseat) { TEST_P(HotseatWidgetTest, ExitOverviewWithClickOnHotseat) {
std::unique_ptr<aura::Window> window1 = AshTestBase::CreateTestWindow(); std::unique_ptr<aura::Window> window1 = AshTestBase::CreateTestWindow();
ShelfTestUtil::AddAppShortcut("app_id_1", TYPE_APP); ShelfTestUtil::AddAppShortcut("app_id_1", TYPE_APP);
...@@ -1153,7 +1259,7 @@ TEST_F(HotseatWidgetTest, ExitOverviewWithClickOnHotseat) { ...@@ -1153,7 +1259,7 @@ TEST_F(HotseatWidgetTest, ExitOverviewWithClickOnHotseat) {
// Hides the hotseat if the hotseat is in kExtendedMode and the system tray // Hides the hotseat if the hotseat is in kExtendedMode and the system tray
// is about to show (see https://crbug.com/1028321). // is about to show (see https://crbug.com/1028321).
TEST_F(HotseatWidgetTest, DismissHotseatWhenSystemTrayShows) { TEST_P(HotseatWidgetTest, DismissHotseatWhenSystemTrayShows) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1175,7 +1281,7 @@ TEST_F(HotseatWidgetTest, DismissHotseatWhenSystemTrayShows) { ...@@ -1175,7 +1281,7 @@ TEST_F(HotseatWidgetTest, DismissHotseatWhenSystemTrayShows) {
// Tests that the work area updates once each when going to/from tablet mode // Tests that the work area updates once each when going to/from tablet mode
// with no windows open. // with no windows open.
TEST_F(HotseatWidgetTest, WorkAreaUpdatesClamshellToFromHomeLauncherNoWindows) { TEST_P(HotseatWidgetTest, WorkAreaUpdatesClamshellToFromHomeLauncherNoWindows) {
DisplayWorkAreaChangeCounter counter; DisplayWorkAreaChangeCounter counter;
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
...@@ -1188,7 +1294,7 @@ TEST_F(HotseatWidgetTest, WorkAreaUpdatesClamshellToFromHomeLauncherNoWindows) { ...@@ -1188,7 +1294,7 @@ TEST_F(HotseatWidgetTest, WorkAreaUpdatesClamshellToFromHomeLauncherNoWindows) {
// Tests that the work area changes just once when opening a window in tablet // Tests that the work area changes just once when opening a window in tablet
// mode. // mode.
TEST_F(HotseatWidgetTest, OpenWindowInTabletModeChangesWorkArea) { TEST_P(HotseatWidgetTest, OpenWindowInTabletModeChangesWorkArea) {
DisplayWorkAreaChangeCounter counter; DisplayWorkAreaChangeCounter counter;
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
ASSERT_EQ(1, counter.count()); ASSERT_EQ(1, counter.count());
...@@ -1202,7 +1308,7 @@ TEST_F(HotseatWidgetTest, OpenWindowInTabletModeChangesWorkArea) { ...@@ -1202,7 +1308,7 @@ TEST_F(HotseatWidgetTest, OpenWindowInTabletModeChangesWorkArea) {
// Tests that going to and from tablet mode with an open window results in a // Tests that going to and from tablet mode with an open window results in a
// work area change. // work area change.
TEST_F(HotseatWidgetTest, ToFromTabletModeWithWindowChangesWorkArea) { TEST_P(HotseatWidgetTest, ToFromTabletModeWithWindowChangesWorkArea) {
DisplayWorkAreaChangeCounter counter; DisplayWorkAreaChangeCounter counter;
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1218,7 +1324,7 @@ TEST_F(HotseatWidgetTest, ToFromTabletModeWithWindowChangesWorkArea) { ...@@ -1218,7 +1324,7 @@ TEST_F(HotseatWidgetTest, ToFromTabletModeWithWindowChangesWorkArea) {
// Tests that the hotseat is flush with the bottom of the screen when in // Tests that the hotseat is flush with the bottom of the screen when in
// clamshell mode and the shelf is oriented on the bottom. // clamshell mode and the shelf is oriented on the bottom.
TEST_P(HotseatWidgetTest, HotseatFlushWithScreenBottomInClamshell) { TEST_P(HotseatWidgetTest, HotseatFlushWithScreenBottomInClamshell) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
const int display_height = const int display_height =
display::Screen::GetScreen()->GetPrimaryDisplay().bounds().height(); display::Screen::GetScreen()->GetPrimaryDisplay().bounds().height();
const int hotseat_bottom = GetPrimaryShelf() const int hotseat_bottom = GetPrimaryShelf()
...@@ -1236,7 +1342,7 @@ TEST_P(HotseatWidgetTest, DragActiveWindowInTabletMode) { ...@@ -1236,7 +1342,7 @@ TEST_P(HotseatWidgetTest, DragActiveWindowInTabletMode) {
scoped_features.InitAndEnableFeature( scoped_features.InitAndEnableFeature(
features::kDragFromShelfToHomeOrOverview); features::kDragFromShelfToHomeOrOverview);
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1277,7 +1383,7 @@ TEST_P(HotseatWidgetTest, ExitingOvervieHidesHotseat) { ...@@ -1277,7 +1383,7 @@ TEST_P(HotseatWidgetTest, ExitingOvervieHidesHotseat) {
scoped_features.InitAndEnableFeature( scoped_features.InitAndEnableFeature(
features::kDragFromShelfToHomeOrOverview); features::kDragFromShelfToHomeOrOverview);
const ShelfAutoHideBehavior auto_hide_behavior = GetParam(); const ShelfAutoHideBehavior auto_hide_behavior = shelf_auto_hide_behavior();
GetPrimaryShelf()->SetAutoHideBehavior(auto_hide_behavior); GetPrimaryShelf()->SetAutoHideBehavior(auto_hide_behavior);
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
...@@ -1331,7 +1437,7 @@ TEST_P(HotseatWidgetTest, FailingOverviewDragResultsInExtendedHotseat) { ...@@ -1331,7 +1437,7 @@ TEST_P(HotseatWidgetTest, FailingOverviewDragResultsInExtendedHotseat) {
scoped_features.InitAndEnableFeature( scoped_features.InitAndEnableFeature(
features::kDragFromShelfToHomeOrOverview); features::kDragFromShelfToHomeOrOverview);
const ShelfAutoHideBehavior auto_hide_behavior = GetParam(); const ShelfAutoHideBehavior auto_hide_behavior = shelf_auto_hide_behavior();
GetPrimaryShelf()->SetAutoHideBehavior(auto_hide_behavior); GetPrimaryShelf()->SetAutoHideBehavior(auto_hide_behavior);
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
...@@ -1367,7 +1473,7 @@ TEST_P(HotseatWidgetTest, FailingOverviewDragResultsInExtendedHotseat) { ...@@ -1367,7 +1473,7 @@ TEST_P(HotseatWidgetTest, FailingOverviewDragResultsInExtendedHotseat) {
// Tests that hotseat remains in extended state while in overview mode when // Tests that hotseat remains in extended state while in overview mode when
// flinging the shelf up or down. // flinging the shelf up or down.
TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) { TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) {
GetPrimaryShelf()->SetAutoHideBehavior(GetParam()); GetPrimaryShelf()->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -1383,7 +1489,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) { ...@@ -1383,7 +1489,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) {
EXPECT_TRUE(overview_controller->InOverviewSession()); EXPECT_TRUE(overview_controller->InOverviewSession());
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
} else { } else {
...@@ -1396,7 +1502,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) { ...@@ -1396,7 +1502,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) {
EXPECT_TRUE(overview_controller->InOverviewSession()); EXPECT_TRUE(overview_controller->InOverviewSession());
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
} else { } else {
...@@ -1407,7 +1513,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) { ...@@ -1407,7 +1513,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) {
EXPECT_TRUE(overview_controller->InOverviewSession()); EXPECT_TRUE(overview_controller->InOverviewSession());
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
} else { } else {
...@@ -1417,7 +1523,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) { ...@@ -1417,7 +1523,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInOverview) {
TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) { TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) {
Shelf* const shelf = GetPrimaryShelf(); Shelf* const shelf = GetPrimaryShelf();
shelf->SetAutoHideBehavior(GetParam()); shelf->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -1436,7 +1542,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) { ...@@ -1436,7 +1542,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) {
EXPECT_TRUE(split_view_controller->InSplitViewMode()); EXPECT_TRUE(split_view_controller->InSplitViewMode());
EXPECT_TRUE(overview_controller->InOverviewSession()); EXPECT_TRUE(overview_controller->InOverviewSession());
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
} else { } else {
...@@ -1448,7 +1554,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) { ...@@ -1448,7 +1554,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) {
EXPECT_TRUE(split_view_controller->InSplitViewMode()); EXPECT_TRUE(split_view_controller->InSplitViewMode());
EXPECT_TRUE(overview_controller->InOverviewSession()); EXPECT_TRUE(overview_controller->InOverviewSession());
EXPECT_EQ(HotseatState::kHidden, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kHidden, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
} else { } else {
...@@ -1460,7 +1566,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) { ...@@ -1460,7 +1566,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) {
EXPECT_TRUE(split_view_controller->InSplitViewMode()); EXPECT_TRUE(split_view_controller->InSplitViewMode());
EXPECT_TRUE(overview_controller->InOverviewSession()); EXPECT_TRUE(overview_controller->InOverviewSession());
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
} else { } else {
...@@ -1470,7 +1576,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) { ...@@ -1470,7 +1576,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitViewWithOverview) {
TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) { TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) {
Shelf* const shelf = GetPrimaryShelf(); Shelf* const shelf = GetPrimaryShelf();
shelf->SetAutoHideBehavior(GetParam()); shelf->SetAutoHideBehavior(shelf_auto_hide_behavior());
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window1 = std::unique_ptr<aura::Window> window1 =
...@@ -1489,7 +1595,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) { ...@@ -1489,7 +1595,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) {
EXPECT_TRUE(split_view_controller->InSplitViewMode()); EXPECT_TRUE(split_view_controller->InSplitViewMode());
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
} else { } else {
...@@ -1500,7 +1606,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) { ...@@ -1500,7 +1606,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) {
EXPECT_TRUE(split_view_controller->InSplitViewMode()); EXPECT_TRUE(split_view_controller->InSplitViewMode());
EXPECT_EQ(HotseatState::kHidden, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kHidden, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
} else { } else {
...@@ -1511,7 +1617,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) { ...@@ -1511,7 +1617,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) {
EXPECT_TRUE(split_view_controller->InSplitViewMode()); EXPECT_TRUE(split_view_controller->InSplitViewMode());
EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state()); EXPECT_EQ(HotseatState::kExtended, GetShelfLayoutManager()->hotseat_state());
if (GetParam() == ShelfAutoHideBehavior::kAlways) { if (shelf_auto_hide_behavior() == ShelfAutoHideBehavior::kAlways) {
EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
} else { } else {
...@@ -1521,7 +1627,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) { ...@@ -1521,7 +1627,7 @@ TEST_P(HotseatWidgetTest, SwipeOnHotseatInSplitView) {
// Tests that swiping downward, towards the bezel, from a variety of points // Tests that swiping downward, towards the bezel, from a variety of points
// results in hiding the hotseat. // results in hiding the hotseat.
TEST_F(HotseatWidgetTest, HotseatHidesWhenSwipedToBezel) { TEST_P(HotseatWidgetTest, HotseatHidesWhenSwipedToBezel) {
// Go to in-app shelf and extend the hotseat. // Go to in-app shelf and extend the hotseat.
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
...@@ -1592,7 +1698,7 @@ TEST_F(HotseatWidgetTest, HotseatHidesWhenSwipedToBezel) { ...@@ -1592,7 +1698,7 @@ TEST_F(HotseatWidgetTest, HotseatHidesWhenSwipedToBezel) {
} }
// Tests that flinging up the in-app shelf should show the hotseat. // Tests that flinging up the in-app shelf should show the hotseat.
TEST_F(HotseatWidgetTest, FlingUpHotseatWithShortFling) { TEST_P(HotseatWidgetTest, FlingUpHotseatWithShortFling) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1628,7 +1734,7 @@ TEST_F(HotseatWidgetTest, FlingUpHotseatWithShortFling) { ...@@ -1628,7 +1734,7 @@ TEST_F(HotseatWidgetTest, FlingUpHotseatWithShortFling) {
// Tests that flinging up the in-app shelf should show the home launcher if the // Tests that flinging up the in-app shelf should show the home launcher if the
// gesture distance is long enough. // gesture distance is long enough.
TEST_F(HotseatWidgetTest, FlingUpHotseatWithLongFling) { TEST_P(HotseatWidgetTest, FlingUpHotseatWithLongFling) {
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400)); AshTestBase::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
...@@ -1666,7 +1772,7 @@ TEST_F(HotseatWidgetTest, FlingUpHotseatWithLongFling) { ...@@ -1666,7 +1772,7 @@ TEST_F(HotseatWidgetTest, FlingUpHotseatWithLongFling) {
// Tests that UpdateVisibilityState is ignored during a shelf drag. This // Tests that UpdateVisibilityState is ignored during a shelf drag. This
// prevents drag from getting interrupted. // prevents drag from getting interrupted.
TEST_F(HotseatWidgetTest, NoVisibilityStateUpdateDuringDrag) { TEST_P(HotseatWidgetTest, NoVisibilityStateUpdateDuringDrag) {
// Autohide the shelf, then start a shelf drag. // Autohide the shelf, then start a shelf drag.
GetPrimaryShelf()->SetAutoHideBehavior(ShelfAutoHideBehavior::kAlways); GetPrimaryShelf()->SetAutoHideBehavior(ShelfAutoHideBehavior::kAlways);
std::unique_ptr<aura::Window> window1 = std::unique_ptr<aura::Window> window1 =
...@@ -1691,7 +1797,7 @@ TEST_F(HotseatWidgetTest, NoVisibilityStateUpdateDuringDrag) { ...@@ -1691,7 +1797,7 @@ TEST_F(HotseatWidgetTest, NoVisibilityStateUpdateDuringDrag) {
} }
// Tests that popups don't activate the hotseat. (crbug.com/1018266) // Tests that popups don't activate the hotseat. (crbug.com/1018266)
TEST_F(HotseatWidgetTest, HotseatRemainsHiddenIfPopupLaunched) { TEST_P(HotseatWidgetTest, HotseatRemainsHiddenIfPopupLaunched) {
// Go to in-app shelf and extend the hotseat. // Go to in-app shelf and extend the hotseat.
TabletModeControllerTestApi().EnterTabletMode(); TabletModeControllerTestApi().EnterTabletMode();
std::unique_ptr<aura::Window> window = std::unique_ptr<aura::Window> window =
......
ash/shelf/test/shelf_layout_manager_test_base.h
View file @ c0e15aa2
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#ifndef ASH_SHELF_TEST_SHELF_LAYOUT_MANAGER_TEST_BASE_H_ #ifndef ASH_SHELF_TEST_SHELF_LAYOUT_MANAGER_TEST_BASE_H_
#define ASH_SHELF_TEST_SHELF_LAYOUT_MANAGER_TEST_BASE_H_ #define ASH_SHELF_TEST_SHELF_LAYOUT_MANAGER_TEST_BASE_H_
#include <utility>
#include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/shelf_types.h"
#include "ash/test/ash_test_base.h" #include "ash/test/ash_test_base.h"
#include "ash/wm/workspace/workspace_types.h" #include "ash/wm/workspace/workspace_types.h"
...@@ -19,7 +21,9 @@ class ShelfLayoutManager; ...@@ -19,7 +21,9 @@ class ShelfLayoutManager;
class ShelfLayoutManagerTestBase : public AshTestBase { class ShelfLayoutManagerTestBase : public AshTestBase {
public: public:
ShelfLayoutManagerTestBase() = default; template <typename... TaskEnvironmentTraits>
explicit ShelfLayoutManagerTestBase(TaskEnvironmentTraits&&... traits)
: AshTestBase(std::forward<TaskEnvironmentTraits>(traits)...) {}
// Calls the private SetState() function. // Calls the private SetState() function.
void SetState(ShelfLayoutManager* layout_manager, ShelfVisibilityState state); void SetState(ShelfLayoutManager* layout_manager, ShelfVisibilityState state);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment