| Index: ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
|
| diff --git a/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc b/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
|
| index 633c332d6833d983404b9e7e3e0f6b59b8613c6e..4f98549e0ffe18aa75f87c6903eecf84192a9d57 100644
|
| --- a/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
|
| +++ b/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
|
| @@ -70,8 +70,19 @@ TEST_F(InkDropAnimationControllerImplTest, SetHoveredIsFadingInOrVisible) {
|
| }
|
|
|
| TEST_F(InkDropAnimationControllerImplTest,
|
| - HoveredStateAfterHoverTimerFiresWhenHostIsHovered) {
|
| + HoverDoesntFadeInAfterAnimationIfHoverNotSet) {
|
| ink_drop_host_.set_should_show_hover(true);
|
| + ink_drop_animation_controller_.SetHovered(false);
|
| + ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);
|
| +
|
| + EXPECT_FALSE(task_runner_->HasPendingTask());
|
| + EXPECT_FALSE(is_hover_fading_in_or_visible());
|
| +}
|
| +
|
| +TEST_F(InkDropAnimationControllerImplTest,
|
| + HoverFadesInAfterAnimationWhenHostIsHovered) {
|
| + ink_drop_host_.set_should_show_hover(true);
|
| + ink_drop_animation_controller_.SetHovered(true);
|
| ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);
|
|
|
| EXPECT_TRUE(task_runner_->HasPendingTask());
|
| @@ -82,8 +93,9 @@ TEST_F(InkDropAnimationControllerImplTest,
|
| }
|
|
|
| TEST_F(InkDropAnimationControllerImplTest,
|
| - HoveredStateAfterHoverTimerFiresWhenHostIsNotHovered) {
|
| + HoverDoesntFadeInAfterAnimationWhenHostIsNotHovered) {
|
| ink_drop_host_.set_should_show_hover(false);
|
| + ink_drop_animation_controller_.SetHovered(true);
|
| ink_drop_animation_controller_.AnimateToState(InkDropState::QUICK_ACTION);
|
|
|
| EXPECT_TRUE(task_runner_->HasPendingTask());
|
| @@ -115,4 +127,15 @@ TEST_F(InkDropAnimationControllerImplTest,
|
| EXPECT_FALSE(hover());
|
| }
|
|
|
| +TEST_F(InkDropAnimationControllerImplTest, HoverFadesOutOnSnapToActivated) {
|
| + ink_drop_host_.set_should_show_hover(true);
|
| + ink_drop_animation_controller_.SetHovered(true);
|
| +
|
| + EXPECT_TRUE(is_hover_fading_in_or_visible());
|
| +
|
| + ink_drop_animation_controller_.SnapToActivated();
|
| +
|
| + EXPECT_FALSE(is_hover_fading_in_or_visible());
|
| +}
|
| +
|
| } // namespace views
|
|
|