Added a views::test::TestInkDropAnimationObserverHelper

ui/views/animation/ink_drop_animation_unittest.cc

 // Copyright 2015 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.
 
 #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_
 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_
 
 #include "ui/views/animation/ink_drop_animation.h"
 
 #include <memory>
@@ skipping 163 matching lines @@
 }
 
 // Verify animations are aborted during deletion and the
 // InkDropAnimationObservers are notified.
 TEST_P(InkDropAnimationTest, AnimationsAbortedDuringDeletion) {
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
   ink_drop_animation_.reset();
   EXPECT_EQ(1, observer_.last_animation_started_ordinal());
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
   EXPECT_EQ(views::InkDropState::ACTION_PENDING,
-            observer_.last_animation_state_ended());
-  EXPECT_EQ(InkDropAnimationObserver::InkDropAnimationEndedReason::PRE_EMPTED,
+            observer_.last_animation_ended_context());
+  EXPECT_EQ(InkDropAnimationEndedReason::PRE_EMPTED,
             observer_.last_animation_ended_reason());
 }
 
 TEST_P(InkDropAnimationTest, VerifyObserversAreNotified) {
   ink_drop_animation_->AnimateToState(InkDropState::ACTION_PENDING);
 
   EXPECT_TRUE(test_api_->HasActiveAnimations());
   EXPECT_EQ(1, observer_.last_animation_started_ordinal());
   EXPECT_TRUE(observer_.AnimationHasNotEnded());
   EXPECT_EQ(InkDropState::ACTION_PENDING,
-            observer_.last_animation_state_started());
+            observer_.last_animation_started_context());
 
   test_api_->CompleteAnimations();
 
   EXPECT_FALSE(test_api_->HasActiveAnimations());
   EXPECT_EQ(1, observer_.last_animation_started_ordinal());
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
   EXPECT_EQ(InkDropState::ACTION_PENDING,
-            observer_.last_animation_state_ended());
+            observer_.last_animation_ended_context());
 }
 
 TEST_P(InkDropAnimationTest, VerifyObserversAreNotifiedOfSuccessfulAnimations) {
   ink_drop_animation_->AnimateToState(InkDropState::ACTION_PENDING);
   test_api_->CompleteAnimations();
 
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
-  EXPECT_EQ(InkDropAnimationObserver::InkDropAnimationEndedReason::SUCCESS,
+  EXPECT_EQ(InkDropAnimationEndedReason::SUCCESS,
             observer_.last_animation_ended_reason());
 }
 
 TEST_P(InkDropAnimationTest, VerifyObserversAreNotifiedOfPreemptedAnimations) {
   ink_drop_animation_->AnimateToState(InkDropState::ACTION_PENDING);
   ink_drop_animation_->AnimateToState(InkDropState::ALTERNATE_ACTION_PENDING);
 
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
-  EXPECT_EQ(InkDropAnimationObserver::InkDropAnimationEndedReason::PRE_EMPTED,
+  EXPECT_EQ(InkDropAnimationEndedReason::PRE_EMPTED,
             observer_.last_animation_ended_reason());
 }
 
 TEST_P(InkDropAnimationTest, InkDropStatesPersistWhenCallingAnimateToState) {
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTIVATED);
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             ink_drop_animation_->target_ink_drop_state());
 }
 
@@ skipping 27 matching lines @@
   EXPECT_EQ(1, observer_.last_animation_started_ordinal());
 
   ink_drop_animation_->HideImmediately();
 
   EXPECT_FALSE(test_api_->HasActiveAnimations());
   EXPECT_EQ(views::InkDropState::HIDDEN,
             ink_drop_animation_->target_ink_drop_state());
   EXPECT_EQ(1, observer_.last_animation_started_ordinal());
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
   EXPECT_EQ(InkDropState::ACTION_PENDING,
-            observer_.last_animation_state_ended());
-  EXPECT_EQ(InkDropAnimationObserver::InkDropAnimationEndedReason::PRE_EMPTED,
+            observer_.last_animation_ended_context());
+  EXPECT_EQ(InkDropAnimationEndedReason::PRE_EMPTED,
             observer_.last_animation_ended_reason());
 
   EXPECT_EQ(InkDropAnimation::kHiddenOpacity, test_api_->GetCurrentOpacity());
   EXPECT_FALSE(ink_drop_animation_->IsVisible());
 }
 
 TEST_P(InkDropAnimationTest, SnapToActivatedWithoutActiveAnimations) {
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
   test_api_->CompleteAnimations();
   EXPECT_EQ(1, observer_.last_animation_started_ordinal());
@@ skipping 24 matching lines @@
             ink_drop_animation_->target_ink_drop_state());
   EXPECT_EQ(1, observer_.last_animation_started_ordinal());
 
   ink_drop_animation_->SnapToActivated();
 
   EXPECT_FALSE(test_api_->HasActiveAnimations());
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             ink_drop_animation_->target_ink_drop_state());
   EXPECT_EQ(3, observer_.last_animation_started_ordinal());
   EXPECT_EQ(4, observer_.last_animation_ended_ordinal());
-  EXPECT_EQ(InkDropState::ACTIVATED, observer_.last_animation_state_ended());
-  EXPECT_EQ(InkDropAnimationObserver::InkDropAnimationEndedReason::SUCCESS,
+  EXPECT_EQ(InkDropState::ACTIVATED, observer_.last_animation_ended_context());
+  EXPECT_EQ(InkDropAnimationEndedReason::SUCCESS,
             observer_.last_animation_ended_reason());
 
   EXPECT_EQ(InkDropAnimation::kVisibleOpacity, test_api_->GetCurrentOpacity());
   EXPECT_TRUE(ink_drop_animation_->IsVisible());
 }
 
 TEST_P(InkDropAnimationTest, AnimateToVisibleFromHidden) {
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop_animation_->target_ink_drop_state());
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
   EXPECT_TRUE(ink_drop_animation_->IsVisible());
@@ skipping 20 matching lines @@
 
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
   EXPECT_EQ(views::InkDropState::HIDDEN,
             observer_.target_state_at_last_animation_ended());
 }
 
 }  // namespace test
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_