Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 | 90 |
| 91 // infinte activeTime | 91 // infinte activeTime |
| 92 timing.playbackRate = 0; | 92 timing.playbackRate = 0; |
| 93 EXPECT_EQ(0, calculateScaledActiveTime(std::numeric_limits<double>::infinity (), std::numeric_limits<double>::infinity(), 0, timing)); | 93 EXPECT_EQ(0, calculateScaledActiveTime(std::numeric_limits<double>::infinity (), std::numeric_limits<double>::infinity(), 0, timing)); |
| 94 timing.playbackRate = 1; | 94 timing.playbackRate = 1; |
| 95 EXPECT_EQ(std::numeric_limits<double>::infinity(), calculateScaledActiveTime (std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity( ), 0, timing)); | 95 EXPECT_EQ(std::numeric_limits<double>::infinity(), calculateScaledActiveTime (std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity( ), 0, timing)); |
| 96 timing.playbackRate = -1; | 96 timing.playbackRate = -1; |
| 97 EXPECT_EQ(std::numeric_limits<double>::infinity(), calculateScaledActiveTime (std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity( ), 0, timing)); | 97 EXPECT_EQ(std::numeric_limits<double>::infinity(), calculateScaledActiveTime (std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity( ), 0, timing)); |
| 98 } | 98 } |
| 99 | 99 |
| 100 TEST(AnimationTimingCalculationsTest, IterationTime) | 100 TEST(AnimationTimingCalculationsTest, IterationTime) |
|
suzyh_UTC10 (ex-contributor)
2016/07/25 00:51:09
This test is confusing and not easy to read, so le
suzyh_UTC10 (ex-contributor)
2016/07/25 01:52:12
Ping on this. I suspect this comment got lost beca
alancutter (OOO until 2018)
2016/07/25 04:46:48
I think it's not a good use of time to rewrite the
suzyh_UTC10 (ex-contributor)
2016/07/25 04:55:23
OK. Make a note in the rewrite bug you filed and/o
alancutter (OOO until 2018)
2016/07/26 00:49:39
The unit tests will be rewritten as part of rewrit
| |
| 101 { | 101 { |
| 102 Timing timing; | 102 Timing timing; |
| 103 | 103 |
| 104 // calculateIterationTime(iterationDuration, repeatedDuration, scaledActiveT ime, startOffset, timing) | 104 // calculateIterationTime(iterationDuration, repeatedDuration, scaledActiveT ime, startOffset, phase, timing) |
| 105 | 105 |
| 106 // if the scaled active time is null | 106 // if the scaled active time is null |
| 107 EXPECT_TRUE(isNull(calculateIterationTime(1, 1, nullValue(), 1, timing))); | 107 EXPECT_TRUE(isNull(calculateIterationTime(1, 1, nullValue(), 1, AnimationEff ect::PhaseActive, timing))); |
| 108 | 108 |
| 109 // if (complex-conditions)... | 109 // if (complex-conditions)... |
| 110 EXPECT_EQ(12, calculateIterationTime(12, 12, 12, 0, timing)); | 110 EXPECT_EQ(12, calculateIterationTime(12, 12, 12, 0, AnimationEffect::PhaseAc tive, timing)); |
| 111 | 111 |
| 112 // otherwise | 112 // otherwise |
| 113 timing.iterationCount = 10; | 113 timing.iterationCount = 10; |
| 114 EXPECT_EQ(5, calculateIterationTime(10, 100, 25, 4, timing)); | 114 EXPECT_EQ(5, calculateIterationTime(10, 100, 25, 4, AnimationEffect::PhaseAc tive, timing)); |
| 115 EXPECT_EQ(7, calculateIterationTime(11, 110, 29, 1, timing)); | 115 EXPECT_EQ(7, calculateIterationTime(11, 110, 29, 1, AnimationEffect::PhaseAc tive, timing)); |
| 116 timing.iterationStart = 1.1; | 116 timing.iterationStart = 1.1; |
| 117 EXPECT_EQ(8, calculateIterationTime(12, 120, 20, 7, timing)); | 117 EXPECT_EQ(8, calculateIterationTime(12, 120, 20, 7, AnimationEffect::PhaseAc tive, timing)); |
| 118 } | 118 } |
| 119 | 119 |
| 120 TEST(AnimationTimingCalculationsTest, CurrentIteration) | 120 TEST(AnimationTimingCalculationsTest, CurrentIteration) |
| 121 { | 121 { |
| 122 Timing timing; | 122 Timing timing; |
| 123 | 123 |
| 124 // calculateCurrentIteration(iterationDuration, iterationTime, scaledActiveT ime, timing) | 124 // calculateCurrentIteration(iterationDuration, iterationTime, scaledActiveT ime, timing) |
| 125 | 125 |
| 126 // if the scaled active time is null | 126 // if the scaled active time is null |
| 127 EXPECT_TRUE(isNull(calculateCurrentIteration(1, 1, nullValue(), timing))); | 127 EXPECT_TRUE(isNull(calculateCurrentIteration(1, 1, nullValue(), timing))); |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 204 // Timing function when iterationDuration is infinity | 204 // Timing function when iterationDuration is infinity |
| 205 timing.direction = Timing::PlaybackDirectionNormal; | 205 timing.direction = Timing::PlaybackDirectionNormal; |
| 206 EXPECT_EQ(0, calculateTransformedTime(0, std::numeric_limits<double>::infini ty(), 0, timing)); | 206 EXPECT_EQ(0, calculateTransformedTime(0, std::numeric_limits<double>::infini ty(), 0, timing)); |
| 207 EXPECT_EQ(1, calculateTransformedTime(0, std::numeric_limits<double>::infini ty(), 1, timing)); | 207 EXPECT_EQ(1, calculateTransformedTime(0, std::numeric_limits<double>::infini ty(), 1, timing)); |
| 208 timing.direction = Timing::PlaybackDirectionReverse; | 208 timing.direction = Timing::PlaybackDirectionReverse; |
| 209 EXPECT_EQ(std::numeric_limits<double>::infinity(), calculateTransformedTime( 0, std::numeric_limits<double>::infinity(), 0, timing)); | 209 EXPECT_EQ(std::numeric_limits<double>::infinity(), calculateTransformedTime( 0, std::numeric_limits<double>::infinity(), 0, timing)); |
| 210 EXPECT_EQ(std::numeric_limits<double>::infinity(), calculateTransformedTime( 0, std::numeric_limits<double>::infinity(), 1, timing)); | 210 EXPECT_EQ(std::numeric_limits<double>::infinity(), calculateTransformedTime( 0, std::numeric_limits<double>::infinity(), 1, timing)); |
| 211 } | 211 } |
| 212 | 212 |
| 213 } // namespace blink | 213 } // namespace blink |
| OLD | NEW |