Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: ui/views/animation/ink_drop_animation_unittest.cc

Issue 1373983002: Enhanced the InkDropRippleImpl to create/destroy InkDropAnimations as needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge with master. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/animation/ink_drop_animation_observer.cc ('k') | ui/views/animation/ink_drop_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_animation_unittest.cc
diff --git a/ui/views/animation/ink_drop_animation_unittest.cc b/ui/views/animation/ink_drop_animation_unittest.cc
index 68617ce6ae91d3cd8e67f00c24ce1f1eecc13c10..91f8143416a80a857972acd1a1917719b6d7f0bd 100644
--- a/ui/views/animation/ink_drop_animation_unittest.cc
+++ b/ui/views/animation/ink_drop_animation_unittest.cc
@@ -63,7 +63,8 @@ TEST_F(InkDropAnimationTest, AnimateToActionPending) {
TEST_F(InkDropAnimationTest, AnimateToQuickAction) {
scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
ink_drop_animation->AnimateToState(views::InkDropState::QUICK_ACTION);
- EXPECT_EQ(views::InkDropState::HIDDEN, ink_drop_animation->ink_drop_state());
+ EXPECT_EQ(views::InkDropState::QUICK_ACTION,
+ ink_drop_animation->ink_drop_state());
}
TEST_F(InkDropAnimationTest, AnimateToSlowActionPending) {
@@ -76,7 +77,8 @@ TEST_F(InkDropAnimationTest, AnimateToSlowActionPending) {
TEST_F(InkDropAnimationTest, AnimateToSlowAction) {
scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
ink_drop_animation->AnimateToState(views::InkDropState::SLOW_ACTION);
- EXPECT_EQ(views::InkDropState::HIDDEN, ink_drop_animation->ink_drop_state());
+ EXPECT_EQ(views::InkDropState::SLOW_ACTION,
+ ink_drop_animation->ink_drop_state());
}
TEST_F(InkDropAnimationTest, AnimateToActivated) {
@@ -89,7 +91,8 @@ TEST_F(InkDropAnimationTest, AnimateToActivated) {
TEST_F(InkDropAnimationTest, AnimateToDeactivated) {
scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
ink_drop_animation->AnimateToState(views::InkDropState::DEACTIVATED);
- EXPECT_EQ(views::InkDropState::HIDDEN, ink_drop_animation->ink_drop_state());
+ EXPECT_EQ(views::InkDropState::DEACTIVATED,
+ ink_drop_animation->ink_drop_state());
}
TEST_F(InkDropAnimationTest,
« no previous file with comments | « ui/views/animation/ink_drop_animation_observer.cc ('k') | ui/views/animation/ink_drop_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698