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

Side by Side Diff: third_party/WebKit/Source/platform/animation/TimingFunctionTest.cpp

Issue 2615813003: Migrate WTF::Vector::append() to ::push_back() [part 14 of N] (Closed)
Patch Set: rebase, small fix in FontSettings.h Created 3 years, 11 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
OLDNEW
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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 RefPtr<TimingFunction> cubicTiming1 = CubicBezierTimingFunction::preset( 120 RefPtr<TimingFunction> cubicTiming1 = CubicBezierTimingFunction::preset(
121 CubicBezierTimingFunction::EaseType::EASE_IN); 121 CubicBezierTimingFunction::EaseType::EASE_IN);
122 RefPtr<TimingFunction> cubicTiming2 = 122 RefPtr<TimingFunction> cubicTiming2 =
123 CubicBezierTimingFunction::create(0.17, 0.67, 1, -1.73); 123 CubicBezierTimingFunction::create(0.17, 0.67, 1, -1.73);
124 RefPtr<TimingFunction> stepsTiming1 = 124 RefPtr<TimingFunction> stepsTiming1 =
125 StepsTimingFunction::preset(StepsTimingFunction::StepPosition::END); 125 StepsTimingFunction::preset(StepsTimingFunction::StepPosition::END);
126 RefPtr<TimingFunction> stepsTiming2 = 126 RefPtr<TimingFunction> stepsTiming2 =
127 StepsTimingFunction::create(5, StepsTimingFunction::StepPosition::START); 127 StepsTimingFunction::create(5, StepsTimingFunction::StepPosition::START);
128 128
129 Vector<std::pair<std::string, RefPtr<TimingFunction>>> v; 129 Vector<std::pair<std::string, RefPtr<TimingFunction>>> v;
130 v.append(std::make_pair("linearTiming", linearTiming)); 130 v.push_back(std::make_pair("linearTiming", linearTiming));
131 v.append(std::make_pair("cubicTiming1", cubicTiming1)); 131 v.push_back(std::make_pair("cubicTiming1", cubicTiming1));
132 v.append(std::make_pair("cubicTiming2", cubicTiming2)); 132 v.push_back(std::make_pair("cubicTiming2", cubicTiming2));
133 v.append(std::make_pair("stepsTiming1", stepsTiming1)); 133 v.push_back(std::make_pair("stepsTiming1", stepsTiming1));
134 v.append(std::make_pair("stepsTiming2", stepsTiming2)); 134 v.push_back(std::make_pair("stepsTiming2", stepsTiming2));
135 notEqualHelperLoop(v); 135 notEqualHelperLoop(v);
136 } 136 }
137 137
138 TEST_F(TimingFunctionTest, LinearOperatorEq) { 138 TEST_F(TimingFunctionTest, LinearOperatorEq) {
139 RefPtr<TimingFunction> linearTiming1 = LinearTimingFunction::shared(); 139 RefPtr<TimingFunction> linearTiming1 = LinearTimingFunction::shared();
140 RefPtr<TimingFunction> linearTiming2 = LinearTimingFunction::shared(); 140 RefPtr<TimingFunction> linearTiming2 = LinearTimingFunction::shared();
141 EXPECT_EQ(*linearTiming1, *linearTiming1); 141 EXPECT_EQ(*linearTiming1, *linearTiming1);
142 EXPECT_EQ(*linearTiming1, *linearTiming2); 142 EXPECT_EQ(*linearTiming1, *linearTiming2);
143 } 143 }
144 144
(...skipping 24 matching lines...) Expand all
169 EXPECT_EQ(*cubicEaseInOutTiming1, *cubicEaseInOutTiming2); 169 EXPECT_EQ(*cubicEaseInOutTiming1, *cubicEaseInOutTiming2);
170 170
171 RefPtr<TimingFunction> cubicCustomTiming1 = 171 RefPtr<TimingFunction> cubicCustomTiming1 =
172 CubicBezierTimingFunction::create(0.17, 0.67, 1, -1.73); 172 CubicBezierTimingFunction::create(0.17, 0.67, 1, -1.73);
173 RefPtr<TimingFunction> cubicCustomTiming2 = 173 RefPtr<TimingFunction> cubicCustomTiming2 =
174 CubicBezierTimingFunction::create(0.17, 0.67, 1, -1.73); 174 CubicBezierTimingFunction::create(0.17, 0.67, 1, -1.73);
175 EXPECT_EQ(*cubicCustomTiming1, *cubicCustomTiming1); 175 EXPECT_EQ(*cubicCustomTiming1, *cubicCustomTiming1);
176 EXPECT_EQ(*cubicCustomTiming1, *cubicCustomTiming2); 176 EXPECT_EQ(*cubicCustomTiming1, *cubicCustomTiming2);
177 177
178 Vector<std::pair<std::string, RefPtr<TimingFunction>>> v; 178 Vector<std::pair<std::string, RefPtr<TimingFunction>>> v;
179 v.append(std::make_pair("cubicEaseInTiming1", cubicEaseInTiming1)); 179 v.push_back(std::make_pair("cubicEaseInTiming1", cubicEaseInTiming1));
180 v.append(std::make_pair("cubicEaseOutTiming1", cubicEaseOutTiming1)); 180 v.push_back(std::make_pair("cubicEaseOutTiming1", cubicEaseOutTiming1));
181 v.append(std::make_pair("cubicEaseInOutTiming1", cubicEaseInOutTiming1)); 181 v.push_back(std::make_pair("cubicEaseInOutTiming1", cubicEaseInOutTiming1));
182 v.append(std::make_pair("cubicCustomTiming1", cubicCustomTiming1)); 182 v.push_back(std::make_pair("cubicCustomTiming1", cubicCustomTiming1));
183 notEqualHelperLoop(v); 183 notEqualHelperLoop(v);
184 } 184 }
185 185
186 TEST_F(TimingFunctionTest, CubicOperatorEqReflectivity) { 186 TEST_F(TimingFunctionTest, CubicOperatorEqReflectivity) {
187 RefPtr<TimingFunction> cubicA = CubicBezierTimingFunction::preset( 187 RefPtr<TimingFunction> cubicA = CubicBezierTimingFunction::preset(
188 CubicBezierTimingFunction::EaseType::EASE_IN); 188 CubicBezierTimingFunction::EaseType::EASE_IN);
189 RefPtr<TimingFunction> cubicB = 189 RefPtr<TimingFunction> cubicB =
190 CubicBezierTimingFunction::create(0.42, 0.0, 1.0, 1.0); 190 CubicBezierTimingFunction::create(0.42, 0.0, 1.0, 1.0);
191 EXPECT_NE(*cubicA, *cubicB); 191 EXPECT_NE(*cubicA, *cubicB);
192 EXPECT_NE(*cubicB, *cubicA); 192 EXPECT_NE(*cubicB, *cubicA);
(...skipping 30 matching lines...) Expand all
223 *StepsTimingFunction::create(5, StepsTimingFunction::StepPosition::END), 223 *StepsTimingFunction::create(5, StepsTimingFunction::StepPosition::END),
224 *stepsTimingCustom2); 224 *stepsTimingCustom2);
225 EXPECT_EQ( 225 EXPECT_EQ(
226 *StepsTimingFunction::create(7, StepsTimingFunction::StepPosition::START), 226 *StepsTimingFunction::create(7, StepsTimingFunction::StepPosition::START),
227 *stepsTimingCustom3); 227 *stepsTimingCustom3);
228 EXPECT_EQ( 228 EXPECT_EQ(
229 *StepsTimingFunction::create(7, StepsTimingFunction::StepPosition::END), 229 *StepsTimingFunction::create(7, StepsTimingFunction::StepPosition::END),
230 *stepsTimingCustom4); 230 *stepsTimingCustom4);
231 231
232 Vector<std::pair<std::string, RefPtr<TimingFunction>>> v; 232 Vector<std::pair<std::string, RefPtr<TimingFunction>>> v;
233 v.append(std::make_pair("stepsTimingStart1", stepsTimingStart1)); 233 v.push_back(std::make_pair("stepsTimingStart1", stepsTimingStart1));
234 v.append(std::make_pair("stepsTimingEnd1", stepsTimingEnd1)); 234 v.push_back(std::make_pair("stepsTimingEnd1", stepsTimingEnd1));
235 v.append(std::make_pair("stepsTimingCustom1", stepsTimingCustom1)); 235 v.push_back(std::make_pair("stepsTimingCustom1", stepsTimingCustom1));
236 v.append(std::make_pair("stepsTimingCustom2", stepsTimingCustom2)); 236 v.push_back(std::make_pair("stepsTimingCustom2", stepsTimingCustom2));
237 v.append(std::make_pair("stepsTimingCustom3", stepsTimingCustom3)); 237 v.push_back(std::make_pair("stepsTimingCustom3", stepsTimingCustom3));
238 v.append(std::make_pair("stepsTimingCustom4", stepsTimingCustom4)); 238 v.push_back(std::make_pair("stepsTimingCustom4", stepsTimingCustom4));
239 notEqualHelperLoop(v); 239 notEqualHelperLoop(v);
240 } 240 }
241 241
242 TEST_F(TimingFunctionTest, StepsOperatorEqPreset) { 242 TEST_F(TimingFunctionTest, StepsOperatorEqPreset) {
243 RefPtr<TimingFunction> stepsA = 243 RefPtr<TimingFunction> stepsA =
244 StepsTimingFunction::preset(StepsTimingFunction::StepPosition::START); 244 StepsTimingFunction::preset(StepsTimingFunction::StepPosition::START);
245 RefPtr<TimingFunction> stepsB = 245 RefPtr<TimingFunction> stepsB =
246 StepsTimingFunction::create(1, StepsTimingFunction::StepPosition::START); 246 StepsTimingFunction::create(1, StepsTimingFunction::StepPosition::START);
247 EXPECT_EQ(*stepsA, *stepsB); 247 EXPECT_EQ(*stepsA, *stepsB);
248 EXPECT_EQ(*stepsB, *stepsA); 248 EXPECT_EQ(*stepsB, *stepsA);
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 EXPECT_EQ(0.50, stepsTimingCustomEnd->evaluate(0.74, 0)); 463 EXPECT_EQ(0.50, stepsTimingCustomEnd->evaluate(0.74, 0));
464 EXPECT_EQ(0.75, stepsTimingCustomEnd->evaluate(0.75, 0)); 464 EXPECT_EQ(0.75, stepsTimingCustomEnd->evaluate(0.75, 0));
465 EXPECT_EQ(0.75, stepsTimingCustomEnd->evaluate(0.99, 0)); 465 EXPECT_EQ(0.75, stepsTimingCustomEnd->evaluate(0.99, 0));
466 EXPECT_EQ(1.00, stepsTimingCustomEnd->evaluate(1.00, 0)); 466 EXPECT_EQ(1.00, stepsTimingCustomEnd->evaluate(1.00, 0));
467 EXPECT_EQ(1.00, stepsTimingCustomEnd->evaluate(2.00, 0)); 467 EXPECT_EQ(1.00, stepsTimingCustomEnd->evaluate(2.00, 0));
468 } 468 }
469 469
470 } // namespace 470 } // namespace
471 471
472 } // namespace blink 472 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698