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

Side by Side Diff: webrtc/base/optional_unittest.cc

Issue 1570473002: Replace manual casting to rvalue reference with calls to std::move (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
« no previous file with comments | « webrtc/base/optional.h ('k') | webrtc/base/scoped_ptr.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 "---", "2:0. copy constructor (from 1:0)", "---", 155 "---", "2:0. copy constructor (from 1:0)", "---",
156 "2:0. destructor", "1:0. destructor", "0:0. destructor"), 156 "2:0. destructor", "1:0. destructor", "0:0. destructor"),
157 *log); 157 *log);
158 } 158 }
159 159
160 TEST(OptionalTest, TestConstructMoveEmpty) { 160 TEST(OptionalTest, TestConstructMoveEmpty) {
161 auto log = Logger::Setup(); 161 auto log = Logger::Setup();
162 { 162 {
163 Optional<Logger> x; 163 Optional<Logger> x;
164 EXPECT_FALSE(x); 164 EXPECT_FALSE(x);
165 auto y = static_cast<Optional<Logger>&&>(x); 165 auto y = std::move(x);
166 EXPECT_FALSE(y); 166 EXPECT_FALSE(y);
167 } 167 }
168 EXPECT_EQ(V("0:0. default constructor", "1:0. move constructor (from 0:0)", 168 EXPECT_EQ(V("0:0. default constructor", "1:0. move constructor (from 0:0)",
169 "1:0. destructor", "0:0. destructor"), 169 "1:0. destructor", "0:0. destructor"),
170 *log); 170 *log);
171 } 171 }
172 172
173 TEST(OptionalTest, TestConstructMoveFull) { 173 TEST(OptionalTest, TestConstructMoveFull) {
174 auto log = Logger::Setup(); 174 auto log = Logger::Setup();
175 { 175 {
176 Optional<Logger> x(Logger(17)); 176 Optional<Logger> x(Logger(17));
177 EXPECT_TRUE(x); 177 EXPECT_TRUE(x);
178 log->push_back("---"); 178 log->push_back("---");
179 auto y = static_cast<Optional<Logger>&&>(x); 179 auto y = std::move(x);
180 EXPECT_TRUE(x); 180 EXPECT_TRUE(x);
181 EXPECT_TRUE(y); 181 EXPECT_TRUE(y);
182 log->push_back("---"); 182 log->push_back("---");
183 } 183 }
184 EXPECT_EQ( 184 EXPECT_EQ(
185 V("0:17. explicit constructor", "1:17. move constructor (from 0:17)", 185 V("0:17. explicit constructor", "1:17. move constructor (from 0:17)",
186 "0:17. destructor", "---", "2:17. move constructor (from 1:17)", "---", 186 "0:17. destructor", "---", "2:17. move constructor (from 1:17)", "---",
187 "2:17. destructor", "1:17. destructor"), 187 "2:17. destructor", "1:17. destructor"),
188 *log); 188 *log);
189 } 189 }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 "3:42. copy constructor (from 2:42)", 282 "3:42. copy constructor (from 2:42)",
283 "1:42. operator= move (from 3:42)", "3:42. destructor", "---", 283 "1:42. operator= move (from 3:42)", "3:42. destructor", "---",
284 "2:42. destructor", "1:42. destructor"), 284 "2:42. destructor", "1:42. destructor"),
285 *log); 285 *log);
286 } 286 }
287 287
288 TEST(OptionalTest, TestMoveAssignToEmptyFromEmpty) { 288 TEST(OptionalTest, TestMoveAssignToEmptyFromEmpty) {
289 auto log = Logger::Setup(); 289 auto log = Logger::Setup();
290 { 290 {
291 Optional<Logger> x, y; 291 Optional<Logger> x, y;
292 x = static_cast<Optional<Logger>&&>(y); 292 x = std::move(y);
293 } 293 }
294 EXPECT_EQ( 294 EXPECT_EQ(
295 V("0:0. default constructor", "1:1. default constructor", 295 V("0:0. default constructor", "1:1. default constructor",
296 "0:1. operator= move (from 1:1)", "1:1. destructor", "0:1. destructor"), 296 "0:1. operator= move (from 1:1)", "1:1. destructor", "0:1. destructor"),
297 *log); 297 *log);
298 } 298 }
299 299
300 TEST(OptionalTest, TestMoveAssignToFullFromEmpty) { 300 TEST(OptionalTest, TestMoveAssignToFullFromEmpty) {
301 auto log = Logger::Setup(); 301 auto log = Logger::Setup();
302 { 302 {
303 Optional<Logger> x(Logger(17)); 303 Optional<Logger> x(Logger(17));
304 Optional<Logger> y; 304 Optional<Logger> y;
305 log->push_back("---"); 305 log->push_back("---");
306 x = static_cast<Optional<Logger>&&>(y); 306 x = std::move(y);
307 log->push_back("---"); 307 log->push_back("---");
308 } 308 }
309 EXPECT_EQ( 309 EXPECT_EQ(
310 V("0:17. explicit constructor", "1:17. move constructor (from 0:17)", 310 V("0:17. explicit constructor", "1:17. move constructor (from 0:17)",
311 "0:17. destructor", "2:2. default constructor", "---", 311 "0:17. destructor", "2:2. default constructor", "---",
312 "1:2. operator= move (from 2:2)", "---", "2:2. destructor", 312 "1:2. operator= move (from 2:2)", "---", "2:2. destructor",
313 "1:2. destructor"), 313 "1:2. destructor"),
314 *log); 314 *log);
315 } 315 }
316 316
317 TEST(OptionalTest, TestMoveAssignToEmptyFromFull) { 317 TEST(OptionalTest, TestMoveAssignToEmptyFromFull) {
318 auto log = Logger::Setup(); 318 auto log = Logger::Setup();
319 { 319 {
320 Optional<Logger> x; 320 Optional<Logger> x;
321 Optional<Logger> y(Logger(17)); 321 Optional<Logger> y(Logger(17));
322 log->push_back("---"); 322 log->push_back("---");
323 x = static_cast<Optional<Logger>&&>(y); 323 x = std::move(y);
324 log->push_back("---"); 324 log->push_back("---");
325 } 325 }
326 EXPECT_EQ(V("0:0. default constructor", "1:17. explicit constructor", 326 EXPECT_EQ(V("0:0. default constructor", "1:17. explicit constructor",
327 "2:17. move constructor (from 1:17)", "1:17. destructor", "---", 327 "2:17. move constructor (from 1:17)", "1:17. destructor", "---",
328 "0:17. operator= move (from 2:17)", "---", "2:17. destructor", 328 "0:17. operator= move (from 2:17)", "---", "2:17. destructor",
329 "0:17. destructor"), 329 "0:17. destructor"),
330 *log); 330 *log);
331 } 331 }
332 332
333 TEST(OptionalTest, TestMoveAssignToFullFromFull) { 333 TEST(OptionalTest, TestMoveAssignToFullFromFull) {
334 auto log = Logger::Setup(); 334 auto log = Logger::Setup();
335 { 335 {
336 Optional<Logger> x(Logger(17)); 336 Optional<Logger> x(Logger(17));
337 Optional<Logger> y(Logger(42)); 337 Optional<Logger> y(Logger(42));
338 log->push_back("---"); 338 log->push_back("---");
339 x = static_cast<Optional<Logger>&&>(y); 339 x = std::move(y);
340 log->push_back("---"); 340 log->push_back("---");
341 } 341 }
342 EXPECT_EQ( 342 EXPECT_EQ(
343 V("0:17. explicit constructor", "1:17. move constructor (from 0:17)", 343 V("0:17. explicit constructor", "1:17. move constructor (from 0:17)",
344 "0:17. destructor", "2:42. explicit constructor", 344 "0:17. destructor", "2:42. explicit constructor",
345 "3:42. move constructor (from 2:42)", "2:42. destructor", "---", 345 "3:42. move constructor (from 2:42)", "2:42. destructor", "---",
346 "1:42. operator= move (from 3:42)", "---", "3:42. destructor", 346 "1:42. operator= move (from 3:42)", "---", "3:42. destructor",
347 "1:42. destructor"), 347 "1:42. destructor"),
348 *log); 348 *log);
349 } 349 }
350 350
351 TEST(OptionalTest, TestMoveAssignToEmptyFromT) { 351 TEST(OptionalTest, TestMoveAssignToEmptyFromT) {
352 auto log = Logger::Setup(); 352 auto log = Logger::Setup();
353 { 353 {
354 Optional<Logger> x; 354 Optional<Logger> x;
355 Logger y(17); 355 Logger y(17);
356 log->push_back("---"); 356 log->push_back("---");
357 x = Optional<Logger>(static_cast<Logger&&>(y)); 357 x = Optional<Logger>(std::move(y));
358 log->push_back("---"); 358 log->push_back("---");
359 } 359 }
360 EXPECT_EQ(V("0:0. default constructor", "1:17. explicit constructor", "---", 360 EXPECT_EQ(V("0:0. default constructor", "1:17. explicit constructor", "---",
361 "2:17. move constructor (from 1:17)", 361 "2:17. move constructor (from 1:17)",
362 "0:17. operator= move (from 2:17)", "2:17. destructor", "---", 362 "0:17. operator= move (from 2:17)", "2:17. destructor", "---",
363 "1:17. destructor", "0:17. destructor"), 363 "1:17. destructor", "0:17. destructor"),
364 *log); 364 *log);
365 } 365 }
366 366
367 TEST(OptionalTest, TestMoveAssignToFullFromT) { 367 TEST(OptionalTest, TestMoveAssignToFullFromT) {
368 auto log = Logger::Setup(); 368 auto log = Logger::Setup();
369 { 369 {
370 Optional<Logger> x(Logger(17)); 370 Optional<Logger> x(Logger(17));
371 Logger y(42); 371 Logger y(42);
372 log->push_back("---"); 372 log->push_back("---");
373 x = Optional<Logger>(static_cast<Logger&&>(y)); 373 x = Optional<Logger>(std::move(y));
374 log->push_back("---"); 374 log->push_back("---");
375 } 375 }
376 EXPECT_EQ( 376 EXPECT_EQ(
377 V("0:17. explicit constructor", "1:17. move constructor (from 0:17)", 377 V("0:17. explicit constructor", "1:17. move constructor (from 0:17)",
378 "0:17. destructor", "2:42. explicit constructor", "---", 378 "0:17. destructor", "2:42. explicit constructor", "---",
379 "3:42. move constructor (from 2:42)", 379 "3:42. move constructor (from 2:42)",
380 "1:42. operator= move (from 3:42)", "3:42. destructor", "---", 380 "1:42. operator= move (from 3:42)", "3:42. destructor", "---",
381 "2:42. destructor", "1:42. destructor"), 381 "2:42. destructor", "1:42. destructor"),
382 *log); 382 *log);
383 } 383 }
384 384
385 TEST(OptionalTest, TestDereference) { 385 TEST(OptionalTest, TestDereference) {
386 auto log = Logger::Setup(); 386 auto log = Logger::Setup();
387 { 387 {
388 Optional<Logger> x(Logger(42)); 388 Optional<Logger> x(Logger(42));
389 const auto& y = x; 389 const auto& y = x;
390 log->push_back("---"); 390 log->push_back("---");
391 x->Foo(); 391 x->Foo();
392 y->Foo(); 392 y->Foo();
393 static_cast<Optional<Logger>&&>(x)->Foo(); 393 std::move(x)->Foo();
394 static_cast<const Optional<Logger>&&>(y)->Foo(); 394 std::move(y)->Foo();
395 log->push_back("---"); 395 log->push_back("---");
396 (*x).Foo(); 396 (*x).Foo();
397 (*y).Foo(); 397 (*y).Foo();
398 (*static_cast<Optional<Logger>&&>(x)).Foo(); 398 (*std::move(x)).Foo();
399 (*static_cast<const Optional<Logger>&&>(y)).Foo(); 399 (*std::move(y)).Foo();
400 log->push_back("---"); 400 log->push_back("---");
401 } 401 }
402 EXPECT_EQ(V("0:42. explicit constructor", 402 EXPECT_EQ(V("0:42. explicit constructor",
403 "1:42. move constructor (from 0:42)", "0:42. destructor", "---", 403 "1:42. move constructor (from 0:42)", "0:42. destructor", "---",
404 "1:42. Foo()", "1:42. Foo() const", "1:42. Foo()", 404 "1:42. Foo()", "1:42. Foo() const", "1:42. Foo()",
405 "1:42. Foo() const", "---", "1:42. Foo()", "1:42. Foo() const", 405 "1:42. Foo() const", "---", "1:42. Foo()", "1:42. Foo() const",
406 "1:42. Foo()", "1:42. Foo() const", "---", "1:42. destructor"), 406 "1:42. Foo()", "1:42. Foo() const", "---", "1:42. destructor"),
407 *log); 407 *log);
408 } 408 }
409 409
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 "4:17. copy constructor (from 0:17)", "5:5. default constructor", 480 "4:17. copy constructor (from 0:17)", "5:5. default constructor",
481 "6:6. default constructor", "7:7. default constructor", "---", 481 "6:6. default constructor", "7:7. default constructor", "---",
482 "swap 2:42, 3:17", "swap 4:5, 5:17", "swap 6:7, 7:6", "---", 482 "swap 2:42, 3:17", "swap 4:5, 5:17", "swap 6:7, 7:6", "---",
483 "7:6. destructor", "6:7. destructor", "5:17. destructor", 483 "7:6. destructor", "6:7. destructor", "5:17. destructor",
484 "4:5. destructor", "3:17. destructor", "2:42. destructor", 484 "4:5. destructor", "3:17. destructor", "2:42. destructor",
485 "1:42. destructor", "0:17. destructor"), 485 "1:42. destructor", "0:17. destructor"),
486 *log); 486 *log);
487 } 487 }
488 488
489 } // namespace rtc 489 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/optional.h ('k') | webrtc/base/scoped_ptr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698