Skip to content

GitLab

T
tangled
Commit 2273eb11 authored by Avery Musbach's avatar Avery Musbach Committed by Commit Bot
Browse files
Options

tablet: Clean up some unit tests 

1. StartTabletActiveRightSnapPreviousLeftSnap is supposed to test with
the right snapped window active (according to both the name and the
comment), but actually tests with the left snapped window active. The
present CL makes it test what it is supposed to test.

2. Among the tests with an active window and a previous window, some
make it totally clear by activating both windows one after the other,
while others just activate one window and assume that the other one will
be previous. The present CL works out this inconsistency (at least for
the tests that are the focus of my attention at the moment).

3. The comment on StartTabletActiveLeftSnapPreviousLeftSnap has some
text left over from before [1], and currently does not even make sense.
The present CL removes the offending text.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1535172

Change-Id: I086612a9cc180dd5092cd3c8794ccc29ee8b5a49
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1738633Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Commit-Queue: Avery Musbach <amusbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685248}
parent afaa8a3a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 18 deletions
ash/wm/tablet_mode/tablet_mode_controller_unittest.cc
View file @ 2273eb11
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "ash/wm/splitview/split_view_controller.h" #include "ash/wm/splitview/split_view_controller.h"
#include "ash/wm/splitview/split_view_utils.h" #include "ash/wm/splitview/split_view_utils.h"
#include "ash/wm/tablet_mode/tablet_mode_controller_test_api.h" #include "ash/wm/tablet_mode/tablet_mode_controller_test_api.h"
#include "ash/wm/window_util.h"
#include "ash/wm/wm_event.h" #include "ash/wm/wm_event.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/run_loop.h" #include "base/run_loop.h"
...@@ -1134,7 +1135,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveNoSnap) { ...@@ -1134,7 +1135,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveNoSnap) {
SplitViewController* split_view_controller = SplitViewController* split_view_controller =
Shell::Get()->split_view_controller(); Shell::Get()->split_view_controller();
std::unique_ptr<aura::Window> window = CreateTestWindow(); std::unique_ptr<aura::Window> window = CreateTestWindow();
wm::ActivateWindow(window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kNoSnap, split_view_controller->state()); EXPECT_EQ(SplitViewState::kNoSnap, split_view_controller->state());
EXPECT_FALSE(Shell::Get()->overview_controller()->InOverviewSession()); EXPECT_FALSE(Shell::Get()->overview_controller()->InOverviewSession());
...@@ -1146,7 +1146,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveLeftSnap) { ...@@ -1146,7 +1146,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveLeftSnap) {
SplitViewController* split_view_controller = SplitViewController* split_view_controller =
Shell::Get()->split_view_controller(); Shell::Get()->split_view_controller();
std::unique_ptr<aura::Window> window = CreateDesktopWindowSnappedLeft(); std::unique_ptr<aura::Window> window = CreateDesktopWindowSnappedLeft();
wm::ActivateWindow(window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state()); EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state());
EXPECT_EQ(window.get(), split_view_controller->left_window()); EXPECT_EQ(window.get(), split_view_controller->left_window());
...@@ -1159,7 +1158,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveRightSnap) { ...@@ -1159,7 +1158,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveRightSnap) {
SplitViewController* split_view_controller = SplitViewController* split_view_controller =
Shell::Get()->split_view_controller(); Shell::Get()->split_view_controller();
std::unique_ptr<aura::Window> window = CreateDesktopWindowSnappedRight(); std::unique_ptr<aura::Window> window = CreateDesktopWindowSnappedRight();
wm::ActivateWindow(window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kRightSnapped, split_view_controller->state()); EXPECT_EQ(SplitViewState::kRightSnapped, split_view_controller->state());
EXPECT_EQ(window.get(), split_view_controller->right_window()); EXPECT_EQ(window.get(), split_view_controller->right_window());
...@@ -1192,7 +1190,7 @@ TEST_F(TabletModeControllerTest, StartTabletActiveRightSnapPreviousLeftSnap) { ...@@ -1192,7 +1190,7 @@ TEST_F(TabletModeControllerTest, StartTabletActiveRightSnapPreviousLeftSnap) {
std::unique_ptr<aura::Window> left_window = CreateDesktopWindowSnappedLeft(); std::unique_ptr<aura::Window> left_window = CreateDesktopWindowSnappedLeft();
std::unique_ptr<aura::Window> right_window = std::unique_ptr<aura::Window> right_window =
CreateDesktopWindowSnappedRight(); CreateDesktopWindowSnappedRight();
wm::ActivateWindow(left_window.get()); ASSERT_EQ(right_window.get(), window_util::GetActiveWindow());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kBothSnapped, split_view_controller->state()); EXPECT_EQ(SplitViewState::kBothSnapped, split_view_controller->state());
EXPECT_EQ(left_window.get(), split_view_controller->left_window()); EXPECT_EQ(left_window.get(), split_view_controller->left_window());
...@@ -1251,7 +1249,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveTransientChildOfLeftSnap) { ...@@ -1251,7 +1249,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveTransientChildOfLeftSnap) {
std::unique_ptr<aura::Window> child = std::unique_ptr<aura::Window> child =
CreateTestWindow(gfx::Rect(), aura::client::WINDOW_TYPE_POPUP); CreateTestWindow(gfx::Rect(), aura::client::WINDOW_TYPE_POPUP);
::wm::AddTransientChild(parent.get(), child.get()); ::wm::AddTransientChild(parent.get(), child.get());
wm::ActivateWindow(parent.get());
wm::ActivateWindow(child.get()); wm::ActivateWindow(child.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state()); EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state());
...@@ -1266,7 +1263,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveAppListPreviousLeftSnap) { ...@@ -1266,7 +1263,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveAppListPreviousLeftSnap) {
SplitViewController* split_view_controller = SplitViewController* split_view_controller =
Shell::Get()->split_view_controller(); Shell::Get()->split_view_controller();
std::unique_ptr<aura::Window> window = CreateDesktopWindowSnappedLeft(); std::unique_ptr<aura::Window> window = CreateDesktopWindowSnappedLeft();
wm::ActivateWindow(window.get());
Shell::Get()->app_list_controller()->ShowAppList(); Shell::Get()->app_list_controller()->ShowAppList();
ASSERT_TRUE(wm::IsActiveWindow( ASSERT_TRUE(wm::IsActiveWindow(
GetAppListTestHelper()->GetAppListView()->GetWidget()->GetNativeView())); GetAppListTestHelper()->GetAppListView()->GetWidget()->GetNativeView()));
...@@ -1291,7 +1287,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveDraggedPreviousLeftSnap) { ...@@ -1291,7 +1287,6 @@ TEST_F(TabletModeControllerTest, StartTabletActiveDraggedPreviousLeftSnap) {
ASSERT_TRUE(dragged_window_state->is_dragged()); ASSERT_TRUE(dragged_window_state->is_dragged());
std::unique_ptr<aura::Window> snapped_window = std::unique_ptr<aura::Window> snapped_window =
CreateDesktopWindowSnappedLeft(); CreateDesktopWindowSnappedLeft();
wm::ActivateWindow(snapped_window.get());
wm::ActivateWindow(dragged_window.get()); wm::ActivateWindow(dragged_window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state()); EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state());
...@@ -1311,7 +1306,6 @@ TEST_F(TabletModeControllerTest, ...@@ -1311,7 +1306,6 @@ TEST_F(TabletModeControllerTest,
window_hidden_from_overview->SetProperty(kHideInOverviewKey, true); window_hidden_from_overview->SetProperty(kHideInOverviewKey, true);
std::unique_ptr<aura::Window> snapped_window = std::unique_ptr<aura::Window> snapped_window =
CreateDesktopWindowSnappedLeft(); CreateDesktopWindowSnappedLeft();
wm::ActivateWindow(snapped_window.get());
wm::ActivateWindow(window_hidden_from_overview.get()); wm::ActivateWindow(window_hidden_from_overview.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state()); EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state());
...@@ -1341,7 +1335,6 @@ TEST_F(TabletModeControllerTest, ...@@ -1341,7 +1335,6 @@ TEST_F(TabletModeControllerTest,
left_window_state->OnWMEvent(&snap_to_left); left_window_state->OnWMEvent(&snap_to_left);
std::unique_ptr<aura::Window> right_window = std::unique_ptr<aura::Window> right_window =
CreateDesktopWindowSnappedRight(); CreateDesktopWindowSnappedRight();
wm::ActivateWindow(right_window.get());
wm::ActivateWindow(left_window.get()); wm::ActivateWindow(left_window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kNoSnap, split_view_controller->state()); EXPECT_EQ(SplitViewState::kNoSnap, split_view_controller->state());
...@@ -1371,7 +1364,6 @@ TEST_F(TabletModeControllerTest, ...@@ -1371,7 +1364,6 @@ TEST_F(TabletModeControllerTest,
ASSERT_FALSE(CanSnapInSplitview(right_window.get())); ASSERT_FALSE(CanSnapInSplitview(right_window.get()));
WMEvent snap_to_right(WM_EVENT_CYCLE_SNAP_RIGHT); WMEvent snap_to_right(WM_EVENT_CYCLE_SNAP_RIGHT);
right_window_state->OnWMEvent(&snap_to_right); right_window_state->OnWMEvent(&snap_to_right);
wm::ActivateWindow(left_window.get());
wm::ActivateWindow(right_window.get()); wm::ActivateWindow(right_window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kNoSnap, split_view_controller->state()); EXPECT_EQ(SplitViewState::kNoSnap, split_view_controller->state());
...@@ -1402,8 +1394,7 @@ TEST_F(TabletModeControllerTest, ...@@ -1402,8 +1394,7 @@ TEST_F(TabletModeControllerTest,
ASSERT_FALSE(CanSnapInSplitview(right_window.get())); ASSERT_FALSE(CanSnapInSplitview(right_window.get()));
WMEvent snap_to_right(WM_EVENT_CYCLE_SNAP_RIGHT); WMEvent snap_to_right(WM_EVENT_CYCLE_SNAP_RIGHT);
right_window_state->OnWMEvent(&snap_to_right); right_window_state->OnWMEvent(&snap_to_right);
wm::ActivateWindow(right_window.get()); ASSERT_EQ(left_window.get(), window_util::GetActiveWindow());
wm::ActivateWindow(left_window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state()); EXPECT_EQ(SplitViewState::kLeftSnapped, split_view_controller->state());
EXPECT_EQ(left_window.get(), split_view_controller->left_window()); EXPECT_EQ(left_window.get(), split_view_controller->left_window());
...@@ -1433,8 +1424,7 @@ TEST_F(TabletModeControllerTest, ...@@ -1433,8 +1424,7 @@ TEST_F(TabletModeControllerTest,
left_window_state->OnWMEvent(&snap_to_left); left_window_state->OnWMEvent(&snap_to_left);
std::unique_ptr<aura::Window> right_window = std::unique_ptr<aura::Window> right_window =
CreateDesktopWindowSnappedRight(); CreateDesktopWindowSnappedRight();
wm::ActivateWindow(left_window.get()); ASSERT_EQ(right_window.get(), window_util::GetActiveWindow());
wm::ActivateWindow(right_window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
EXPECT_EQ(SplitViewState::kRightSnapped, split_view_controller->state()); EXPECT_EQ(SplitViewState::kRightSnapped, split_view_controller->state());
EXPECT_EQ(right_window.get(), split_view_controller->right_window()); EXPECT_EQ(right_window.get(), split_view_controller->right_window());
...@@ -1447,7 +1437,6 @@ TEST_F(TabletModeControllerTest, AppListWorksAfterEnteringTabletForOverview) { ...@@ -1447,7 +1437,6 @@ TEST_F(TabletModeControllerTest, AppListWorksAfterEnteringTabletForOverview) {
AppListControllerImpl* app_list_controller = AppListControllerImpl* app_list_controller =
Shell::Get()->app_list_controller(); Shell::Get()->app_list_controller();
std::unique_ptr<aura::Window> window = CreateDesktopWindowSnappedLeft(); std::unique_ptr<aura::Window> window = CreateDesktopWindowSnappedLeft();
wm::ActivateWindow(window.get());
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
app_list_controller->ShowAppList(); app_list_controller->ShowAppList();
EXPECT_TRUE(app_list_controller->IsVisible()); EXPECT_TRUE(app_list_controller->IsVisible());
...@@ -1455,8 +1444,7 @@ TEST_F(TabletModeControllerTest, AppListWorksAfterEnteringTabletForOverview) { ...@@ -1455,8 +1444,7 @@ TEST_F(TabletModeControllerTest, AppListWorksAfterEnteringTabletForOverview) {
// Test that if both the active window and the previous window are snapped on // Test that if both the active window and the previous window are snapped on
// the left before tablet mode, then split view is activated with the active // the left before tablet mode, then split view is activated with the active
// window on the left, and if the user proceeds to snap the other window on the // window on the left.
// right and then enter overview again.
TEST_F(TabletModeControllerTest, StartTabletActiveLeftSnapPreviousLeftSnap) { TEST_F(TabletModeControllerTest, StartTabletActiveLeftSnapPreviousLeftSnap) {
SplitViewController* split_view_controller = SplitViewController* split_view_controller =
Shell::Get()->split_view_controller(); Shell::Get()->split_view_controller();
...@@ -1477,7 +1465,6 @@ TEST_F(TabletModeControllerTest, ...@@ -1477,7 +1465,6 @@ TEST_F(TabletModeControllerTest,
Shell::Get()->split_view_controller(); Shell::Get()->split_view_controller();
tablet_mode_controller()->SetEnabledForTest(true); tablet_mode_controller()->SetEnabledForTest(true);
std::unique_ptr<aura::Window> window = CreateTestWindow(); std::unique_ptr<aura::Window> window = CreateTestWindow();
wm::ActivateWindow(window.get());
split_view_controller->SnapWindow(window.get(), SplitViewController::LEFT); split_view_controller->SnapWindow(window.get(), SplitViewController::LEFT);
EXPECT_TRUE(Shell::Get()->overview_controller()->StartOverview()); EXPECT_TRUE(Shell::Get()->overview_controller()->StartOverview());
} }
......
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