Commit e87ec01a authored by Manu Cornet's avatar Manu Cornet

CrOS Shelf: Changing shelf alignment isn't expected to be animated

Bug: 1048119
Change-Id: I0ead8b2aaee34a27c030259829ad279a6261c92c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2042314Reviewed-by: default avatarAndrew Xu <andrewxu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739132}
parent f896c636
...@@ -3298,11 +3298,9 @@ TEST_P(ShelfLayoutManagerTest, ShelfBoundsUpdateAfterOverviewAnimation) { ...@@ -3298,11 +3298,9 @@ TEST_P(ShelfLayoutManagerTest, ShelfBoundsUpdateAfterOverviewAnimation) {
{ {
OverviewAnimationWaiter overview_waiter; OverviewAnimationWaiter overview_waiter;
overview_controller->StartOverview(); overview_controller->StartOverview();
ShelfAnimationWaiter shelf_waiter(left_shelf_bounds); // When setting the shelf alignment, bounds aren't expected to animate.
shelf->SetAlignment(ShelfAlignment::kLeft); shelf->SetAlignment(ShelfAlignment::kLeft);
overview_waiter.Wait(); overview_waiter.Wait();
shelf_waiter.WaitForAnimation();
EXPECT_TRUE(shelf_waiter.WasValidAnimation());
} }
EXPECT_EQ(left_shelf_bounds, GetShelfWidget()->GetWindowBoundsInScreen()); EXPECT_EQ(left_shelf_bounds, GetShelfWidget()->GetWindowBoundsInScreen());
...@@ -3310,11 +3308,9 @@ TEST_P(ShelfLayoutManagerTest, ShelfBoundsUpdateAfterOverviewAnimation) { ...@@ -3310,11 +3308,9 @@ TEST_P(ShelfLayoutManagerTest, ShelfBoundsUpdateAfterOverviewAnimation) {
{ {
OverviewAnimationWaiter overview_waiter; OverviewAnimationWaiter overview_waiter;
overview_controller->EndOverview(); overview_controller->EndOverview();
ShelfAnimationWaiter shelf_waiter(bottom_shelf_bounds); // When setting the shelf alignment, bounds aren't expected to animate.
shelf->SetAlignment(ShelfAlignment::kBottom); shelf->SetAlignment(ShelfAlignment::kBottom);
overview_waiter.Wait(); overview_waiter.Wait();
shelf_waiter.WaitForAnimation();
EXPECT_TRUE(shelf_waiter.WasValidAnimation());
} }
EXPECT_EQ(bottom_shelf_bounds, GetShelfWidget()->GetWindowBoundsInScreen()); EXPECT_EQ(bottom_shelf_bounds, GetShelfWidget()->GetWindowBoundsInScreen());
} }
......
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