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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: cc/animation/animation_unittest.cc

Issue 231133002: CC::Animations should use TimeTicks & TimeDelta to represent time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self review changes. Created 6 years, 7 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 unified diff | Download patch
« no previous file with comments | « cc/animation/animation_events.cc ('k') | cc/animation/layer_animation_controller.h » ('j') | cc/animation/layer_animation_controller.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/animation/animation.h" 5 #include "cc/animation/animation.h"
6 #include "cc/base/time_util.h"
6 7
7 #include "cc/test/animation_test_common.h" 8 #include "cc/test/animation_test_common.h"
8 #include "testing/gmock/include/gmock/gmock.h" 9 #include "testing/gmock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
10 11
11 namespace cc { 12 namespace cc {
12 namespace { 13 namespace {
13 14
15 using base::TimeDelta;
16
14 scoped_ptr<Animation> CreateAnimation(int iterations, double duration) { 17 scoped_ptr<Animation> CreateAnimation(int iterations, double duration) {
15 scoped_ptr<Animation> to_return(Animation::Create( 18 scoped_ptr<Animation> to_return(Animation::Create(
16 make_scoped_ptr( 19 make_scoped_ptr(
17 new FakeFloatAnimationCurve(duration)).PassAs<AnimationCurve>(), 20 new FakeFloatAnimationCurve(duration)).PassAs<AnimationCurve>(),
18 0, 21 0,
19 1, 22 1,
20 Animation::Opacity)); 23 Animation::Opacity));
21 to_return->set_iterations(iterations); 24 to_return->set_iterations(iterations);
22 return to_return.Pass(); 25 return to_return.Pass();
23 } 26 }
24 27
25 scoped_ptr<Animation> CreateAnimation(int iterations) { 28 scoped_ptr<Animation> CreateAnimation(int iterations) {
26 return CreateAnimation(iterations, 1); 29 return CreateAnimation(iterations, 1);
27 } 30 }
28 31
29 TEST(AnimationTest, TrimTimeZeroIterations) { 32 TEST(AnimationTest, TrimTimeZeroIterations) {
30 scoped_ptr<Animation> anim(CreateAnimation(0)); 33 scoped_ptr<Animation> anim(CreateAnimation(0));
31 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(-1.0)); 34 EXPECT_EQ(
32 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 35 0, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(-1.0)));
33 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0)); 36 EXPECT_EQ(0,
37 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
38 EXPECT_EQ(0,
39 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
34 } 40 }
35 41
36 TEST(AnimationTest, TrimTimeOneIteration) { 42 TEST(AnimationTest, TrimTimeOneIteration) {
37 scoped_ptr<Animation> anim(CreateAnimation(1)); 43 scoped_ptr<Animation> anim(CreateAnimation(1));
38 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(-1.0)); 44 EXPECT_EQ(
39 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 45 0, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(-1.0)));
40 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1.0)); 46 EXPECT_EQ(0,
41 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(2.0)); 47 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
48 EXPECT_EQ(1,
49 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
50 EXPECT_EQ(1,
51 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(2.0)));
42 } 52 }
43 53
44 TEST(AnimationTest, TrimTimeInfiniteIterations) { 54 TEST(AnimationTest, TrimTimeInfiniteIterations) {
45 scoped_ptr<Animation> anim(CreateAnimation(-1)); 55 scoped_ptr<Animation> anim(CreateAnimation(-1));
46 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 56 EXPECT_EQ(0,
47 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 57 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
48 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0)); 58 EXPECT_EQ(0.5,
49 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1.5)); 59 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
60 EXPECT_EQ(0,
61 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
62 EXPECT_EQ(0.5,
63 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.5)));
50 } 64 }
51 65
52 TEST(AnimationTest, TrimTimeReverse) { 66 TEST(AnimationTest, TrimTimeReverse) {
53 scoped_ptr<Animation> anim(CreateAnimation(-1)); 67 scoped_ptr<Animation> anim(CreateAnimation(-1));
54 anim->set_direction(Animation::Reverse); 68 anim->set_direction(Animation::Reverse);
55 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0)); 69 EXPECT_EQ(1.0,
56 EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(0.25)); 70 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0)));
57 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 71 EXPECT_EQ(
58 EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(0.75)); 72 0.75,
59 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(1.0)); 73 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.25)));
60 EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(1.25)); 74 EXPECT_EQ(0.5,
75 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
76 EXPECT_EQ(
77 0.25,
78 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.75)));
79 EXPECT_EQ(1.0,
80 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
81 EXPECT_EQ(
82 0.75,
83 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.25)));
61 } 84 }
62 85
63 TEST(AnimationTest, TrimTimeAlternate) { 86 TEST(AnimationTest, TrimTimeAlternate) {
64 scoped_ptr<Animation> anim(CreateAnimation(-1)); 87 scoped_ptr<Animation> anim(CreateAnimation(-1));
65 anim->set_direction(Animation::Alternate); 88 anim->set_direction(Animation::Alternate);
66 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 89 EXPECT_EQ(0,
67 EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(0.25)); 90 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
68 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 91 EXPECT_EQ(
69 EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(0.75)); 92 0.25,
70 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1.0)); 93 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.25)));
71 EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(1.25)); 94 EXPECT_EQ(0.5,
95 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
96 EXPECT_EQ(
97 0.75,
98 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.75)));
99 EXPECT_EQ(1,
100 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
101 EXPECT_EQ(
102 0.75,
103 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.25)));
72 } 104 }
73 105
74 TEST(AnimationTest, TrimTimeAlternateReverse) { 106 TEST(AnimationTest, TrimTimeAlternateReverse) {
75 scoped_ptr<Animation> anim(CreateAnimation(-1)); 107 scoped_ptr<Animation> anim(CreateAnimation(-1));
76 anim->set_direction(Animation::AlternateReverse); 108 anim->set_direction(Animation::AlternateReverse);
77 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0)); 109 EXPECT_EQ(1.0,
78 EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(0.25)); 110 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
79 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 111 EXPECT_EQ(
80 EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(0.75)); 112 0.75,
81 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0)); 113 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.25)));
82 EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(1.25)); 114 EXPECT_EQ(0.5,
115 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
116 EXPECT_EQ(
117 0.25,
118 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.75)));
119 EXPECT_EQ(0,
120 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
121 EXPECT_EQ(
122 0.25,
123 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.25)));
83 } 124 }
84 125
85 TEST(AnimationTest, TrimTimeStartTime) { 126 TEST(AnimationTest, TrimTimeStartTime) {
86 scoped_ptr<Animation> anim(CreateAnimation(1)); 127 scoped_ptr<Animation> anim(CreateAnimation(1));
87 anim->set_start_time(4); 128 anim->set_start_time(TimeUtil::TicksFromSecondsF(4));
88 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 129 EXPECT_EQ(0,
89 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(4.0)); 130 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
90 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(4.5)); 131 EXPECT_EQ(0,
91 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(5.0)); 132 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(4.0)));
92 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(6.0)); 133 EXPECT_EQ(0.5,
134 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(4.5)));
135 EXPECT_EQ(1,
136 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(5.0)));
137 EXPECT_EQ(1,
138 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(6.0)));
93 } 139 }
94 140
95 TEST(AnimationTest, TrimTimeStartTimeReverse) { 141 TEST(AnimationTest, TrimTimeStartTimeReverse) {
96 scoped_ptr<Animation> anim(CreateAnimation(1)); 142 scoped_ptr<Animation> anim(CreateAnimation(1));
97 anim->set_start_time(4); 143 anim->set_start_time(TimeUtil::TicksFromSecondsF(4));
98 anim->set_direction(Animation::Reverse); 144 anim->set_direction(Animation::Reverse);
99 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 145 EXPECT_EQ(0,
100 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(4.0)); 146 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
101 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(4.5)); 147 EXPECT_EQ(1.0,
102 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(5.0)); 148 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(4.0)));
103 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(6.0)); 149 EXPECT_EQ(0.5,
150 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(4.5)));
151 EXPECT_EQ(0,
152 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(5.0)));
153 EXPECT_EQ(0,
154 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(6.0)));
104 } 155 }
105 156
106 TEST(AnimationTest, TrimTimeTimeOffset) { 157 TEST(AnimationTest, TrimTimeTimeOffset) {
107 scoped_ptr<Animation> anim(CreateAnimation(1)); 158 scoped_ptr<Animation> anim(CreateAnimation(1));
108 anim->set_time_offset(4); 159 anim->set_time_offset(TimeDelta::FromMilliseconds(4000));
109 anim->set_start_time(4); 160 anim->set_start_time(TimeUtil::TicksFromSecondsF(4));
110 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 161 EXPECT_EQ(0,
111 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 162 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
112 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1.0)); 163 EXPECT_EQ(0.5,
113 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1.0)); 164 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
165 EXPECT_EQ(1,
166 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
167 EXPECT_EQ(1,
168 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
114 } 169 }
115 170
116 TEST(AnimationTest, TrimTimeTimeOffsetReverse) { 171 TEST(AnimationTest, TrimTimeTimeOffsetReverse) {
117 scoped_ptr<Animation> anim(CreateAnimation(1)); 172 scoped_ptr<Animation> anim(CreateAnimation(1));
118 anim->set_time_offset(4); 173 anim->set_time_offset(TimeDelta::FromMilliseconds(4000));
119 anim->set_start_time(4); 174 anim->set_start_time(TimeUtil::TicksFromSecondsF(4));
120 anim->set_direction(Animation::Reverse); 175 anim->set_direction(Animation::Reverse);
121 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0)); 176 EXPECT_EQ(1.0,
122 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 177 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
123 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0)); 178 EXPECT_EQ(0.5,
124 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0)); 179 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
180 EXPECT_EQ(0,
181 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
182 EXPECT_EQ(0,
183 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
125 } 184 }
126 185
127 TEST(AnimationTest, TrimTimeNegativeTimeOffset) { 186 TEST(AnimationTest, TrimTimeNegativeTimeOffset) {
128 scoped_ptr<Animation> anim(CreateAnimation(1)); 187 scoped_ptr<Animation> anim(CreateAnimation(1));
129 anim->set_time_offset(-4); 188 anim->set_time_offset(TimeDelta::FromMilliseconds(-4000));
130 189
131 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 190 EXPECT_EQ(0,
132 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(4.0)); 191 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
133 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(4.5)); 192 EXPECT_EQ(0,
134 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(5.0)); 193 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(4.0)));
194 EXPECT_EQ(0.5,
195 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(4.5)));
196 EXPECT_EQ(1,
197 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(5.0)));
135 } 198 }
136 199
137 TEST(AnimationTest, TrimTimeNegativeTimeOffsetReverse) { 200 TEST(AnimationTest, TrimTimeNegativeTimeOffsetReverse) {
138 scoped_ptr<Animation> anim(CreateAnimation(1)); 201 scoped_ptr<Animation> anim(CreateAnimation(1));
139 anim->set_time_offset(-4); 202 anim->set_time_offset(TimeDelta::FromMilliseconds(-4000));
140 anim->set_direction(Animation::Reverse); 203 anim->set_direction(Animation::Reverse);
141 204
142 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 205 EXPECT_EQ(0,
143 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(4.0)); 206 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
144 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(4.5)); 207 EXPECT_EQ(1.0,
145 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(5.0)); 208 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(4.0)));
209 EXPECT_EQ(0.5,
210 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(4.5)));
211 EXPECT_EQ(0,
212 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(5.0)));
146 } 213 }
147 214
148 TEST(AnimationTest, TrimTimePauseResume) { 215 TEST(AnimationTest, TrimTimePauseResume) {
149 scoped_ptr<Animation> anim(CreateAnimation(1)); 216 scoped_ptr<Animation> anim(CreateAnimation(1));
150 anim->SetRunState(Animation::Running, 0.0); 217 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
151 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 218 EXPECT_EQ(0,
152 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 219 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
153 anim->SetRunState(Animation::Paused, 0.5); 220 EXPECT_EQ(0.5,
154 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1024.0)); 221 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
155 anim->SetRunState(Animation::Running, 1024.0); 222 anim->SetRunState(Animation::Paused, TimeUtil::TicksFromSecondsF(0.5));
156 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1024.0)); 223 EXPECT_EQ(
157 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1024.5)); 224 0.5,
225 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.0)));
226 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(1024.0));
227 EXPECT_EQ(
228 0.5,
229 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.0)));
230 EXPECT_EQ(
231 1, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.5)));
158 } 232 }
159 233
160 TEST(AnimationTest, TrimTimePauseResumeReverse) { 234 TEST(AnimationTest, TrimTimePauseResumeReverse) {
161 scoped_ptr<Animation> anim(CreateAnimation(1)); 235 scoped_ptr<Animation> anim(CreateAnimation(1));
162 anim->set_direction(Animation::Reverse); 236 anim->set_direction(Animation::Reverse);
163 anim->SetRunState(Animation::Running, 0.0); 237 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
164 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0)); 238 EXPECT_EQ(1.0,
165 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 239 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
166 anim->SetRunState(Animation::Paused, 0.25); 240 EXPECT_EQ(0.5,
167 EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(1024.0)); 241 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
168 anim->SetRunState(Animation::Running, 1024.0); 242 anim->SetRunState(Animation::Paused, TimeUtil::TicksFromSecondsF(0.25));
169 EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(1024.0)); 243 EXPECT_EQ(
170 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1024.75)); 244 0.75,
245 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.0)));
246 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(1024.0));
247 EXPECT_EQ(
248 0.75,
249 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.0)));
250 EXPECT_EQ(
251 0,
252 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.75)));
171 } 253 }
172 254
173 TEST(AnimationTest, TrimTimeSuspendResume) { 255 TEST(AnimationTest, TrimTimeSuspendResume) {
174 scoped_ptr<Animation> anim(CreateAnimation(1)); 256 scoped_ptr<Animation> anim(CreateAnimation(1));
175 anim->SetRunState(Animation::Running, 0.0); 257 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
176 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 258 EXPECT_EQ(0,
177 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5)); 259 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
178 anim->Suspend(0.5); 260 EXPECT_EQ(0.5,
179 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1024.0)); 261 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.5)));
180 anim->Resume(1024); 262 anim->Suspend(TimeUtil::TicksFromSecondsF(0.5));
181 EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1024.0)); 263 EXPECT_EQ(
182 EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1024.5)); 264 0.5,
265 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.0)));
266 anim->Resume(TimeUtil::TicksFromSecondsF(1024));
267 EXPECT_EQ(
268 0.5,
269 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.0)));
270 EXPECT_EQ(
271 1, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.5)));
183 } 272 }
184 273
185 TEST(AnimationTest, TrimTimeSuspendResumeReverse) { 274 TEST(AnimationTest, TrimTimeSuspendResumeReverse) {
186 scoped_ptr<Animation> anim(CreateAnimation(1)); 275 scoped_ptr<Animation> anim(CreateAnimation(1));
187 anim->set_direction(Animation::Reverse); 276 anim->set_direction(Animation::Reverse);
188 anim->SetRunState(Animation::Running, 0.0); 277 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
189 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0)); 278 EXPECT_EQ(1.0,
190 EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(0.25)); 279 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
191 anim->Suspend(0.75); 280 EXPECT_EQ(
192 EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(1024.0)); 281 0.75,
193 anim->Resume(1024); 282 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.25)));
194 EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(1024.0)); 283 anim->Suspend(TimeUtil::TicksFromSecondsF(0.75));
195 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1024.25)); 284 EXPECT_EQ(
285 0.25,
286 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.0)));
287 anim->Resume(TimeUtil::TicksFromSecondsF(1024));
288 EXPECT_EQ(
289 0.25,
290 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.0)));
291 EXPECT_EQ(
292 0,
293 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1024.25)));
196 } 294 }
197 295
198 TEST(AnimationTest, TrimTimeZeroDuration) { 296 TEST(AnimationTest, TrimTimeZeroDuration) {
199 scoped_ptr<Animation> anim(CreateAnimation(0, 0)); 297 scoped_ptr<Animation> anim(CreateAnimation(0, 0));
200 anim->SetRunState(Animation::Running, 0.0); 298 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
201 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(-1.0)); 299 EXPECT_EQ(
202 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0)); 300 0, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(-1.0)));
203 EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0)); 301 EXPECT_EQ(0,
302 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
303 EXPECT_EQ(0,
304 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
204 } 305 }
205 306
206 TEST(AnimationTest, TrimTimeStarting) { 307 TEST(AnimationTest, TrimTimeStarting) {
207 scoped_ptr<Animation> anim(CreateAnimation(1, 5.0)); 308 scoped_ptr<Animation> anim(CreateAnimation(1, 5.0));
208 anim->SetRunState(Animation::Starting, 0.0); 309 anim->SetRunState(Animation::Starting, TimeUtil::TicksFromSecondsF(0.0));
209 EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(-1.0)); 310 EXPECT_EQ(
210 EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(0.0)); 311 0.0, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(-1.0)));
211 EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(1.0)); 312 EXPECT_EQ(0.0,
212 anim->set_time_offset(2.0); 313 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
213 EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(-1.0)); 314 EXPECT_EQ(0.0,
214 EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(0.0)); 315 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
215 EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(1.0)); 316 anim->set_time_offset(TimeDelta::FromMilliseconds(2000));
216 anim->set_start_time(1.0); 317 EXPECT_EQ(
217 EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(-1.0)); 318 2.0, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(-1.0)));
218 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0)); 319 EXPECT_EQ(2.0,
219 EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(1.0)); 320 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
220 EXPECT_EQ(3.0, anim->TrimTimeToCurrentIteration(2.0)); 321 EXPECT_EQ(2.0,
322 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
323 anim->set_start_time(TimeUtil::TicksFromSecondsF(1.0));
324 EXPECT_EQ(
325 0.0, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(-1.0)));
326 EXPECT_EQ(1.0,
327 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
328 EXPECT_EQ(2.0,
329 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
330 EXPECT_EQ(3.0,
331 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(2.0)));
221 } 332 }
222 333
223 TEST(AnimationTest, TrimTimeNeedsSynchronizedStartTime) { 334 TEST(AnimationTest, TrimTimeNeedsSynchronizedStartTime) {
224 scoped_ptr<Animation> anim(CreateAnimation(1, 5.0)); 335 scoped_ptr<Animation> anim(CreateAnimation(1, 5.0));
225 anim->SetRunState(Animation::Running, 0.0); 336 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
226 anim->set_needs_synchronized_start_time(true); 337 anim->set_needs_synchronized_start_time(true);
227 EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(-1.0)); 338 EXPECT_EQ(
228 EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(0.0)); 339 0.0, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(-1.0)));
229 EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(1.0)); 340 EXPECT_EQ(0.0,
230 anim->set_time_offset(2.0); 341 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
231 EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(-1.0)); 342 EXPECT_EQ(0.0,
232 EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(0.0)); 343 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
233 EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(1.0)); 344 anim->set_time_offset(TimeDelta::FromMilliseconds(2000));
234 anim->set_start_time(1.0); 345 EXPECT_EQ(
346 2.0, anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(-1.0)));
347 EXPECT_EQ(2.0,
348 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
349 EXPECT_EQ(2.0,
350 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
351 anim->set_start_time(TimeUtil::TicksFromSecondsF(1.0));
235 anim->set_needs_synchronized_start_time(false); 352 anim->set_needs_synchronized_start_time(false);
236 EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0)); 353 EXPECT_EQ(1.0,
237 EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(1.0)); 354 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(0.0)));
238 EXPECT_EQ(3.0, anim->TrimTimeToCurrentIteration(2.0)); 355 EXPECT_EQ(2.0,
356 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(1.0)));
357 EXPECT_EQ(3.0,
358 anim->TrimTimeToCurrentIteration(TimeUtil::TicksFromSecondsF(2.0)));
239 } 359 }
240 360
241 TEST(AnimationTest, IsFinishedAtZeroIterations) { 361 TEST(AnimationTest, IsFinishedAtZeroIterations) {
242 scoped_ptr<Animation> anim(CreateAnimation(0)); 362 scoped_ptr<Animation> anim(CreateAnimation(0));
243 anim->SetRunState(Animation::Running, 0.0); 363 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
244 EXPECT_FALSE(anim->IsFinishedAt(-1.0)); 364 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(-1.0)));
245 EXPECT_TRUE(anim->IsFinishedAt(0.0)); 365 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
246 EXPECT_TRUE(anim->IsFinishedAt(1.0)); 366 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(1.0)));
247 } 367 }
248 368
249 TEST(AnimationTest, IsFinishedAtOneIteration) { 369 TEST(AnimationTest, IsFinishedAtOneIteration) {
250 scoped_ptr<Animation> anim(CreateAnimation(1)); 370 scoped_ptr<Animation> anim(CreateAnimation(1));
251 anim->SetRunState(Animation::Running, 0.0); 371 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
252 EXPECT_FALSE(anim->IsFinishedAt(-1.0)); 372 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(-1.0)));
253 EXPECT_FALSE(anim->IsFinishedAt(0.0)); 373 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
254 EXPECT_TRUE(anim->IsFinishedAt(1.0)); 374 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(1.0)));
255 EXPECT_TRUE(anim->IsFinishedAt(2.0)); 375 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(2.0)));
256 } 376 }
257 377
258 TEST(AnimationTest, IsFinishedAtInfiniteIterations) { 378 TEST(AnimationTest, IsFinishedAtInfiniteIterations) {
259 scoped_ptr<Animation> anim(CreateAnimation(-1)); 379 scoped_ptr<Animation> anim(CreateAnimation(-1));
260 anim->SetRunState(Animation::Running, 0.0); 380 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
261 EXPECT_FALSE(anim->IsFinishedAt(0.0)); 381 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
262 EXPECT_FALSE(anim->IsFinishedAt(0.5)); 382 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.5)));
263 EXPECT_FALSE(anim->IsFinishedAt(1.0)); 383 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(1.0)));
264 EXPECT_FALSE(anim->IsFinishedAt(1.5)); 384 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(1.5)));
265 } 385 }
266 386
267 TEST(AnimationTest, IsFinishedNegativeTimeOffset) { 387 TEST(AnimationTest, IsFinishedNegativeTimeOffset) {
268 scoped_ptr<Animation> anim(CreateAnimation(1)); 388 scoped_ptr<Animation> anim(CreateAnimation(1));
269 anim->set_time_offset(-0.5); 389 anim->set_time_offset(TimeDelta::FromMilliseconds(-500));
270 anim->SetRunState(Animation::Running, 0.0); 390 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
271 391
272 EXPECT_FALSE(anim->IsFinishedAt(-1.0)); 392 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(-1.0)));
273 EXPECT_FALSE(anim->IsFinishedAt(0.0)); 393 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
274 EXPECT_FALSE(anim->IsFinishedAt(0.5)); 394 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.5)));
275 EXPECT_FALSE(anim->IsFinishedAt(1.0)); 395 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(1.0)));
276 EXPECT_TRUE(anim->IsFinishedAt(1.5)); 396 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(1.5)));
277 EXPECT_TRUE(anim->IsFinishedAt(2.0)); 397 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(2.0)));
278 EXPECT_TRUE(anim->IsFinishedAt(2.5)); 398 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(2.5)));
279 } 399 }
280 400
281 TEST(AnimationTest, IsFinishedPositiveTimeOffset) { 401 TEST(AnimationTest, IsFinishedPositiveTimeOffset) {
282 scoped_ptr<Animation> anim(CreateAnimation(1)); 402 scoped_ptr<Animation> anim(CreateAnimation(1));
283 anim->set_time_offset(0.5); 403 anim->set_time_offset(TimeDelta::FromMilliseconds(500));
284 anim->SetRunState(Animation::Running, 0.0); 404 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
285 405
286 EXPECT_FALSE(anim->IsFinishedAt(-1.0)); 406 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(-1.0)));
287 EXPECT_FALSE(anim->IsFinishedAt(0.0)); 407 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
288 EXPECT_TRUE(anim->IsFinishedAt(0.5)); 408 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.5)));
289 EXPECT_TRUE(anim->IsFinishedAt(1.0)); 409 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(1.0)));
290 } 410 }
291 411
292 TEST(AnimationTest, IsFinishedAtNotRunning) { 412 TEST(AnimationTest, IsFinishedAtNotRunning) {
293 scoped_ptr<Animation> anim(CreateAnimation(0)); 413 scoped_ptr<Animation> anim(CreateAnimation(0));
294 anim->SetRunState(Animation::Running, 0.0); 414 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
295 EXPECT_TRUE(anim->IsFinishedAt(0.0)); 415 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
296 anim->SetRunState(Animation::Paused, 0.0); 416 anim->SetRunState(Animation::Paused, TimeUtil::TicksFromSecondsF(0.0));
297 EXPECT_FALSE(anim->IsFinishedAt(0.0)); 417 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
298 anim->SetRunState(Animation::WaitingForTargetAvailability, 0.0); 418 anim->SetRunState(Animation::WaitingForTargetAvailability,
299 EXPECT_FALSE(anim->IsFinishedAt(0.0)); 419 TimeUtil::TicksFromSecondsF(0.0));
300 anim->SetRunState(Animation::Finished, 0.0); 420 EXPECT_FALSE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
301 EXPECT_TRUE(anim->IsFinishedAt(0.0)); 421 anim->SetRunState(Animation::Finished, TimeUtil::TicksFromSecondsF(0.0));
302 anim->SetRunState(Animation::Aborted, 0.0); 422 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
303 EXPECT_TRUE(anim->IsFinishedAt(0.0)); 423 anim->SetRunState(Animation::Aborted, TimeUtil::TicksFromSecondsF(0.0));
424 EXPECT_TRUE(anim->IsFinishedAt(TimeUtil::TicksFromSecondsF(0.0)));
304 } 425 }
305 426
306 TEST(AnimationTest, IsFinished) { 427 TEST(AnimationTest, IsFinished) {
307 scoped_ptr<Animation> anim(CreateAnimation(1)); 428 scoped_ptr<Animation> anim(CreateAnimation(1));
308 anim->SetRunState(Animation::Running, 0.0); 429 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
309 EXPECT_FALSE(anim->is_finished()); 430 EXPECT_FALSE(anim->is_finished());
310 anim->SetRunState(Animation::Paused, 0.0); 431 anim->SetRunState(Animation::Paused, TimeUtil::TicksFromSecondsF(0.0));
311 EXPECT_FALSE(anim->is_finished()); 432 EXPECT_FALSE(anim->is_finished());
312 anim->SetRunState(Animation::WaitingForTargetAvailability, 0.0); 433 anim->SetRunState(Animation::WaitingForTargetAvailability,
313 EXPECT_FALSE(anim->is_finished()); 434 TimeUtil::TicksFromSecondsF(0.0));
314 anim->SetRunState(Animation::Finished, 0.0); 435 EXPECT_FALSE(anim->is_finished());
436 anim->SetRunState(Animation::Finished, TimeUtil::TicksFromSecondsF(0.0));
315 EXPECT_TRUE(anim->is_finished()); 437 EXPECT_TRUE(anim->is_finished());
316 anim->SetRunState(Animation::Aborted, 0.0); 438 anim->SetRunState(Animation::Aborted, TimeUtil::TicksFromSecondsF(0.0));
317 EXPECT_TRUE(anim->is_finished()); 439 EXPECT_TRUE(anim->is_finished());
318 } 440 }
319 441
320 TEST(AnimationTest, IsFinishedNeedsSynchronizedStartTime) { 442 TEST(AnimationTest, IsFinishedNeedsSynchronizedStartTime) {
321 scoped_ptr<Animation> anim(CreateAnimation(1)); 443 scoped_ptr<Animation> anim(CreateAnimation(1));
322 anim->SetRunState(Animation::Running, 2.0); 444 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(2.0));
323 EXPECT_FALSE(anim->is_finished()); 445 EXPECT_FALSE(anim->is_finished());
324 anim->SetRunState(Animation::Paused, 2.0); 446 anim->SetRunState(Animation::Paused, TimeUtil::TicksFromSecondsF(2.0));
325 EXPECT_FALSE(anim->is_finished()); 447 EXPECT_FALSE(anim->is_finished());
326 anim->SetRunState(Animation::WaitingForTargetAvailability, 2.0); 448 anim->SetRunState(Animation::WaitingForTargetAvailability,
327 EXPECT_FALSE(anim->is_finished()); 449 TimeUtil::TicksFromSecondsF(2.0));
328 anim->SetRunState(Animation::Finished, 0.0); 450 EXPECT_FALSE(anim->is_finished());
451 anim->SetRunState(Animation::Finished, TimeUtil::TicksFromSecondsF(0.0));
329 EXPECT_TRUE(anim->is_finished()); 452 EXPECT_TRUE(anim->is_finished());
330 anim->SetRunState(Animation::Aborted, 0.0); 453 anim->SetRunState(Animation::Aborted, TimeUtil::TicksFromSecondsF(0.0));
331 EXPECT_TRUE(anim->is_finished()); 454 EXPECT_TRUE(anim->is_finished());
332 } 455 }
333 456
334 TEST(AnimationTest, RunStateChangesIgnoredWhileSuspended) { 457 TEST(AnimationTest, RunStateChangesIgnoredWhileSuspended) {
335 scoped_ptr<Animation> anim(CreateAnimation(1)); 458 scoped_ptr<Animation> anim(CreateAnimation(1));
336 anim->Suspend(0); 459 anim->Suspend(TimeUtil::TicksFromSecondsF(0));
337 EXPECT_EQ(Animation::Paused, anim->run_state()); 460 EXPECT_EQ(Animation::Paused, anim->run_state());
338 anim->SetRunState(Animation::Running, 0.0); 461 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
339 EXPECT_EQ(Animation::Paused, anim->run_state()); 462 EXPECT_EQ(Animation::Paused, anim->run_state());
340 anim->Resume(0); 463 anim->Resume(TimeUtil::TicksFromSecondsF(0));
341 anim->SetRunState(Animation::Running, 0.0); 464 anim->SetRunState(Animation::Running, TimeUtil::TicksFromSecondsF(0.0));
342 EXPECT_EQ(Animation::Running, anim->run_state()); 465 EXPECT_EQ(Animation::Running, anim->run_state());
343 } 466 }
344 467
345 } // namespace 468 } // namespace
346 } // namespace cc 469 } // namespace cc
OLDNEW
« no previous file with comments | « cc/animation/animation_events.cc ('k') | cc/animation/layer_animation_controller.h » ('j') | cc/animation/layer_animation_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698