| Index: cc/CCActiveAnimationTest.cpp
|
| diff --git a/cc/CCActiveAnimationTest.cpp b/cc/CCActiveAnimationTest.cpp
|
| index ec589b4edbd72fdbc195a4532edd8c258394cf83..a29da0bbc68f8d74a61d0b7f2b85fd5a1f5d958c 100644
|
| --- a/cc/CCActiveAnimationTest.cpp
|
| +++ b/cc/CCActiveAnimationTest.cpp
|
| @@ -16,13 +16,18 @@ using namespace cc;
|
|
|
| namespace {
|
|
|
| -PassOwnPtr<CCActiveAnimation> createActiveAnimation(int iterations)
|
| +PassOwnPtr<CCActiveAnimation> createActiveAnimation(int iterations, double duration)
|
| {
|
| - OwnPtr<CCActiveAnimation> toReturn(CCActiveAnimation::create(adoptPtr(new FakeFloatAnimationCurve), 0, 1, CCActiveAnimation::Opacity));
|
| + OwnPtr<CCActiveAnimation> toReturn(CCActiveAnimation::create(adoptPtr(new FakeFloatAnimationCurve(duration)), 0, 1, CCActiveAnimation::Opacity));
|
| toReturn->setIterations(iterations);
|
| return toReturn.release();
|
| }
|
|
|
| +PassOwnPtr<CCActiveAnimation> createActiveAnimation(int iterations)
|
| +{
|
| + return createActiveAnimation(iterations, 1);
|
| +}
|
| +
|
| TEST(CCActiveAnimationTest, TrimTimeZeroIterations)
|
| {
|
| OwnPtr<CCActiveAnimation> anim(createActiveAnimation(0));
|
| @@ -107,6 +112,15 @@ TEST(CCActiveAnimationTest, TrimTimeSuspendResume)
|
| EXPECT_EQ(1, anim->trimTimeToCurrentIteration(1024.5));
|
| }
|
|
|
| +TEST(CCActiveAnimationTest, TrimTimeZeroDuration)
|
| +{
|
| + OwnPtr<CCActiveAnimation> anim(createActiveAnimation(0, 0));
|
| + anim->setRunState(CCActiveAnimation::Running, 0);
|
| + EXPECT_EQ(0, anim->trimTimeToCurrentIteration(-1));
|
| + EXPECT_EQ(0, anim->trimTimeToCurrentIteration(0));
|
| + EXPECT_EQ(0, anim->trimTimeToCurrentIteration(1));
|
| +}
|
| +
|
| TEST(CCActiveAnimationTest, IsFinishedAtZeroIterations)
|
| {
|
| OwnPtr<CCActiveAnimation> anim(createActiveAnimation(0));
|
|
|