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

Unified Diff: ui/compositor/layer_animation_sequence_unittest.cc

Issue 11316315: Remove ui::LayerAnimationSequence::duration and ui::LayerAnimationElement::duration. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Make unit tests use IsFinished() instead of duration() Created 8 years 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/compositor/layer_animation_sequence.cc ('k') | ui/compositor/layer_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animation_sequence_unittest.cc
diff --git a/ui/compositor/layer_animation_sequence_unittest.cc b/ui/compositor/layer_animation_sequence_unittest.cc
index 827c449593d34efe46374b126b5782d129cad71c..233dea30c0e5d6ada4d2db5308667af104f70dff 100644
--- a/ui/compositor/layer_animation_sequence_unittest.cc
+++ b/ui/compositor/layer_animation_sequence_unittest.cc
@@ -24,7 +24,7 @@ namespace {
// Check that the sequence behaves sanely when it contains no elements.
TEST(LayerAnimationSequenceTest, NoElement) {
LayerAnimationSequence sequence;
- EXPECT_EQ(sequence.duration(), base::TimeDelta());
+ EXPECT_TRUE(sequence.IsFinished(base::TimeDelta()));
EXPECT_TRUE(sequence.properties().size() == 0);
LayerAnimationElement::AnimatableProperties properties;
EXPECT_FALSE(sequence.HasCommonProperty(properties));
@@ -55,7 +55,7 @@ TEST(LayerAnimationSequenceTest, SingleElement) {
EXPECT_TRUE(sequence.properties().size() == 1);
EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::OPACITY) !=
sequence.properties().end());
- EXPECT_EQ(delta, sequence.duration());
+ EXPECT_TRUE(sequence.IsFinished(delta));
}
// Check that the sequences progresses the delegate as expected when it contains
@@ -124,7 +124,7 @@ TEST(LayerAnimationSequenceTest, MultipleElement) {
sequence.properties().end());
EXPECT_TRUE(sequence.properties().find(LayerAnimationElement::BOUNDS) !=
sequence.properties().end());
- EXPECT_EQ(delta + delta + delta, sequence.duration());
+ EXPECT_TRUE(sequence.IsFinished(delta + delta + delta));
}
// Check that a sequence can still be aborted if it has cycled many times.
« no previous file with comments | « ui/compositor/layer_animation_sequence.cc ('k') | ui/compositor/layer_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698