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

Side by Side Diff: components/mus/common/event_param_traits_unittest.cc

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
OLDNEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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 "components/mus/common/event_param_traits.h" 5 #include "components/mus/common/event_param_traits.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ipc/ipc_message.h" 9 #include "ipc/ipc_message.h"
10 #include "ipc/ipc_param_traits.h" 10 #include "ipc/ipc_param_traits.h"
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 298
299 TEST_F(EventParamTraitsTest, GoodSimpleMouseEvent) { 299 TEST_F(EventParamTraitsTest, GoodSimpleMouseEvent) {
300 EventType event_types[7] = { 300 EventType event_types[7] = {
301 EventType::ET_MOUSE_PRESSED, EventType::ET_MOUSE_DRAGGED, 301 EventType::ET_MOUSE_PRESSED, EventType::ET_MOUSE_DRAGGED,
302 EventType::ET_MOUSE_RELEASED, EventType::ET_MOUSE_MOVED, 302 EventType::ET_MOUSE_RELEASED, EventType::ET_MOUSE_MOVED,
303 EventType::ET_MOUSE_ENTERED, EventType::ET_MOUSE_EXITED, 303 EventType::ET_MOUSE_ENTERED, EventType::ET_MOUSE_EXITED,
304 EventType::ET_MOUSE_CAPTURE_CHANGED, 304 EventType::ET_MOUSE_CAPTURE_CHANGED,
305 }; 305 };
306 for (int i = 0; i < 7; i++) { 306 for (int i = 0; i < 7; i++) {
307 ScopedEvent event(new MouseEvent(event_types[i], gfx::Point(), gfx::Point(), 307 ScopedEvent event(new MouseEvent(event_types[i], gfx::Point(), gfx::Point(),
308 base::TimeDelta(), 0, 0)); 308 base::TimeTicks(), 0, 0));
309 Verify(event); 309 Verify(event);
310 } 310 }
311 } 311 }
312 312
313 TEST_F(EventParamTraitsTest, GoodCornerCaseMouseEvent) { 313 TEST_F(EventParamTraitsTest, GoodCornerCaseMouseEvent) {
314 EventType event_types[7] = { 314 EventType event_types[7] = {
315 EventType::ET_MOUSE_PRESSED, EventType::ET_MOUSE_DRAGGED, 315 EventType::ET_MOUSE_PRESSED, EventType::ET_MOUSE_DRAGGED,
316 EventType::ET_MOUSE_RELEASED, EventType::ET_MOUSE_MOVED, 316 EventType::ET_MOUSE_RELEASED, EventType::ET_MOUSE_MOVED,
317 EventType::ET_MOUSE_ENTERED, EventType::ET_MOUSE_EXITED, 317 EventType::ET_MOUSE_ENTERED, EventType::ET_MOUSE_EXITED,
318 EventType::ET_MOUSE_CAPTURE_CHANGED, 318 EventType::ET_MOUSE_CAPTURE_CHANGED,
319 }; 319 };
320 for (int i = 0; i < 7; i++) { 320 for (int i = 0; i < 7; i++) {
321 ScopedEvent event(new MouseEvent(event_types[i], gfx::Point(IMIN, IMIN), 321 ScopedEvent event(new MouseEvent(event_types[i], gfx::Point(IMIN, IMIN),
322 gfx::Point(IMAX, IMAX), 322 gfx::Point(IMAX, IMAX),
323 base::TimeDelta::Max(), IMIN, IMAX)); 323 base::TimeTicks::Max(), IMIN, IMAX));
324 Verify(event); 324 Verify(event);
325 } 325 }
326 } 326 }
327 327
328 TEST_F(EventParamTraitsTest, GoodSimpleMouseWheelEvent) { 328 TEST_F(EventParamTraitsTest, GoodSimpleMouseWheelEvent) {
329 ScopedEvent event(new MouseWheelEvent(gfx::Vector2d(), gfx::Point(), 329 ScopedEvent event(new MouseWheelEvent(gfx::Vector2d(), gfx::Point(),
330 gfx::Point(), base::TimeDelta(), 0, 0)); 330 gfx::Point(), base::TimeTicks(), 0, 0));
331 Verify(event); 331 Verify(event);
332 } 332 }
333 333
334 TEST_F(EventParamTraitsTest, GoodCornerCaseMouseWheelEvent) { 334 TEST_F(EventParamTraitsTest, GoodCornerCaseMouseWheelEvent) {
335 ScopedEvent event(new MouseWheelEvent( 335 ScopedEvent event(new MouseWheelEvent(
336 gfx::Vector2d(IMIN, IMAX), gfx::Point(IMIN, IMIN), gfx::Point(IMAX, IMAX), 336 gfx::Vector2d(IMIN, IMAX), gfx::Point(IMIN, IMIN), gfx::Point(IMAX, IMAX),
337 base::TimeDelta::Max(), IMIN, IMAX)); 337 base::TimeTicks::Max(), IMIN, IMAX));
338 Verify(event); 338 Verify(event);
339 } 339 }
340 340
341 TEST_F(EventParamTraitsTest, GoodSimpleTouchEvent) { 341 TEST_F(EventParamTraitsTest, GoodSimpleTouchEvent) {
342 EventType event_types[5] = { 342 EventType event_types[5] = {
343 EventType::ET_TOUCH_RELEASED, EventType::ET_TOUCH_PRESSED, 343 EventType::ET_TOUCH_RELEASED, EventType::ET_TOUCH_PRESSED,
344 EventType::ET_TOUCH_MOVED, EventType::ET_TOUCH_CANCELLED, 344 EventType::ET_TOUCH_MOVED, EventType::ET_TOUCH_CANCELLED,
345 EventType::ET_DROP_TARGET_EVENT, 345 EventType::ET_DROP_TARGET_EVENT,
346 }; 346 };
347 for (int i = 0; i < 5; i++) { 347 for (int i = 0; i < 5; i++) {
348 ScopedEvent event(new TouchEvent(event_types[i], gfx::Point(), 0, 0, 348 ScopedEvent event(new TouchEvent(event_types[i], gfx::Point(), 0, 0,
349 base::TimeDelta(), 0.0, 0.0, 0.0, 0.0)); 349 base::TimeTicks(), 0.0, 0.0, 0.0, 0.0));
350 Verify(event); 350 Verify(event);
351 } 351 }
352 } 352 }
353 353
354 TEST_F(EventParamTraitsTest, GoodCornerCaseTouchEvent) { 354 TEST_F(EventParamTraitsTest, GoodCornerCaseTouchEvent) {
355 EventType event_types[5] = { 355 EventType event_types[5] = {
356 EventType::ET_TOUCH_RELEASED, EventType::ET_TOUCH_PRESSED, 356 EventType::ET_TOUCH_RELEASED, EventType::ET_TOUCH_PRESSED,
357 EventType::ET_TOUCH_MOVED, EventType::ET_TOUCH_CANCELLED, 357 EventType::ET_TOUCH_MOVED, EventType::ET_TOUCH_CANCELLED,
358 EventType::ET_DROP_TARGET_EVENT, 358 EventType::ET_DROP_TARGET_EVENT,
359 }; 359 };
360 for (int i = 0; i < 5; i++) { 360 for (int i = 0; i < 5; i++) {
361 ScopedEvent event(new TouchEvent(event_types[i], gfx::Point(IMIN, IMAX), 361 ScopedEvent event(new TouchEvent(event_types[i], gfx::Point(IMIN, IMAX),
362 IMIN, IMAX, base::TimeDelta::Max(), FMIN, 362 IMIN, IMAX, base::TimeTicks::Max(), FMIN,
363 FMAX, FNAN, FNAN)); 363 FMAX, FNAN, FNAN));
364 Verify(event); 364 Verify(event);
365 } 365 }
366 } 366 }
367 367
368 TEST_F(EventParamTraitsTest, GoodSimpleKeyEvent) { 368 TEST_F(EventParamTraitsTest, GoodSimpleKeyEvent) {
369 EventType event_types[2] = { 369 EventType event_types[2] = {
370 EventType::ET_KEY_PRESSED, EventType::ET_KEY_RELEASED, 370 EventType::ET_KEY_PRESSED, EventType::ET_KEY_RELEASED,
371 }; 371 };
372 for (int i = 0; i < 2; i++) { 372 for (int i = 0; i < 2; i++) {
373 ScopedEvent event(new KeyEvent(event_types[i], KeyboardCode::VKEY_UNKNOWN, 373 ScopedEvent event(new KeyEvent(event_types[i], KeyboardCode::VKEY_UNKNOWN,
374 static_cast<DomCode>(0), 0, DomKey(0), 374 static_cast<DomCode>(0), 0, DomKey(0),
375 base::TimeDelta())); 375 base::TimeTicks()));
376 Verify(event); 376 Verify(event);
377 } 377 }
378 } 378 }
379 379
380 TEST_F(EventParamTraitsTest, GoodCornerCaseKeyEvent) { 380 TEST_F(EventParamTraitsTest, GoodCornerCaseKeyEvent) {
381 EventType event_types[2] = { 381 EventType event_types[2] = {
382 EventType::ET_KEY_PRESSED, EventType::ET_KEY_RELEASED, 382 EventType::ET_KEY_PRESSED, EventType::ET_KEY_RELEASED,
383 }; 383 };
384 for (int i = 0; i < 2; i++) { 384 for (int i = 0; i < 2; i++) {
385 ScopedEvent event(new KeyEvent(event_types[i], KeyboardCode::VKEY_OEM_CLEAR, 385 ScopedEvent event(new KeyEvent(event_types[i], KeyboardCode::VKEY_OEM_CLEAR,
386 static_cast<DomCode>(0x0c028c), IMIN, 386 static_cast<DomCode>(0x0c028c), IMIN,
387 MIN(DomKey), base::TimeDelta::Max())); 387 MIN(DomKey), base::TimeTicks::Max()));
388 Verify(event); 388 Verify(event);
389 } 389 }
390 } 390 }
391 391
392 TEST_F(EventParamTraitsTest, GoodSimpleScrollEvent) { 392 TEST_F(EventParamTraitsTest, GoodSimpleScrollEvent) {
393 ScopedEvent event(new ScrollEvent(EventType::ET_SCROLL, gfx::Point(), 393 ScopedEvent event(new ScrollEvent(EventType::ET_SCROLL, gfx::Point(),
394 base::TimeDelta(), 0, 0.0, 0.0, 0.0, 0.0, 394 base::TimeTicks(), 0, 0.0, 0.0, 0.0, 0.0,
395 0)); 395 0));
396 Verify(event); 396 Verify(event);
397 } 397 }
398 398
399 TEST_F(EventParamTraitsTest, GoodCornerCaseScrollEvent) { 399 TEST_F(EventParamTraitsTest, GoodCornerCaseScrollEvent) {
400 ScopedEvent event(new ScrollEvent(EventType::ET_SCROLL, gfx::Point(), 400 ScopedEvent event(new ScrollEvent(EventType::ET_SCROLL, gfx::Point(),
401 base::TimeDelta(), IMIN, FMIN, FMAX, FNAN, 401 base::TimeTicks(), IMIN, FMIN, FMAX, FNAN,
402 FMIN, IMAX)); 402 FMIN, IMAX));
403 Verify(event); 403 Verify(event);
404 } 404 }
405 405
406 TEST_F(EventParamTraitsTest, GoodSimpleGestureEvent) { 406 TEST_F(EventParamTraitsTest, GoodSimpleGestureEvent) {
407 EventType event_types[19] = { 407 EventType event_types[19] = {
408 EventType::ET_GESTURE_SCROLL_BEGIN, 408 EventType::ET_GESTURE_SCROLL_BEGIN,
409 EventType::ET_GESTURE_SCROLL_END, 409 EventType::ET_GESTURE_SCROLL_END,
410 EventType::ET_GESTURE_SCROLL_UPDATE, 410 EventType::ET_GESTURE_SCROLL_UPDATE,
411 EventType::ET_GESTURE_SHOW_PRESS, 411 EventType::ET_GESTURE_SHOW_PRESS,
412 EventType::ET_GESTURE_WIN8_EDGE_SWIPE, 412 EventType::ET_GESTURE_WIN8_EDGE_SWIPE,
413 EventType::ET_GESTURE_TAP, 413 EventType::ET_GESTURE_TAP,
414 EventType::ET_GESTURE_TAP_DOWN, 414 EventType::ET_GESTURE_TAP_DOWN,
415 EventType::ET_GESTURE_TAP_CANCEL, 415 EventType::ET_GESTURE_TAP_CANCEL,
416 EventType::ET_GESTURE_BEGIN, 416 EventType::ET_GESTURE_BEGIN,
417 EventType::ET_GESTURE_END, 417 EventType::ET_GESTURE_END,
418 EventType::ET_GESTURE_TWO_FINGER_TAP, 418 EventType::ET_GESTURE_TWO_FINGER_TAP,
419 EventType::ET_GESTURE_PINCH_BEGIN, 419 EventType::ET_GESTURE_PINCH_BEGIN,
420 EventType::ET_GESTURE_PINCH_END, 420 EventType::ET_GESTURE_PINCH_END,
421 EventType::ET_GESTURE_PINCH_UPDATE, 421 EventType::ET_GESTURE_PINCH_UPDATE,
422 EventType::ET_GESTURE_LONG_PRESS, 422 EventType::ET_GESTURE_LONG_PRESS,
423 EventType::ET_GESTURE_LONG_TAP, 423 EventType::ET_GESTURE_LONG_TAP,
424 EventType::ET_GESTURE_SWIPE, 424 EventType::ET_GESTURE_SWIPE,
425 EventType::ET_GESTURE_TAP_UNCONFIRMED, 425 EventType::ET_GESTURE_TAP_UNCONFIRMED,
426 EventType::ET_GESTURE_DOUBLE_TAP, 426 EventType::ET_GESTURE_DOUBLE_TAP,
427 }; 427 };
428 for (int i = 0; i < 19; i++) { 428 for (int i = 0; i < 19; i++) {
429 ScopedEvent event(new GestureEvent(0.0, 0.0, 0, base::TimeDelta(), 429 ScopedEvent event(new GestureEvent(0.0, 0.0, 0, base::TimeTicks(),
430 GestureEventDetails(event_types[i]))); 430 GestureEventDetails(event_types[i])));
431 Verify(event); 431 Verify(event);
432 } 432 }
433 } 433 }
434 434
435 TEST_F(EventParamTraitsTest, GoodCornerCaseGestureEvent) { 435 TEST_F(EventParamTraitsTest, GoodCornerCaseGestureEvent) {
436 EventType event_types[17] = { 436 EventType event_types[17] = {
437 EventType::ET_GESTURE_SCROLL_UPDATE, 437 EventType::ET_GESTURE_SCROLL_UPDATE,
438 EventType::ET_GESTURE_SHOW_PRESS, 438 EventType::ET_GESTURE_SHOW_PRESS,
439 EventType::ET_GESTURE_WIN8_EDGE_SWIPE, 439 EventType::ET_GESTURE_WIN8_EDGE_SWIPE,
440 EventType::ET_GESTURE_TAP, 440 EventType::ET_GESTURE_TAP,
441 EventType::ET_GESTURE_TAP_DOWN, 441 EventType::ET_GESTURE_TAP_DOWN,
442 EventType::ET_GESTURE_TAP_CANCEL, 442 EventType::ET_GESTURE_TAP_CANCEL,
443 EventType::ET_GESTURE_BEGIN, 443 EventType::ET_GESTURE_BEGIN,
444 EventType::ET_GESTURE_END, 444 EventType::ET_GESTURE_END,
445 EventType::ET_GESTURE_TWO_FINGER_TAP, 445 EventType::ET_GESTURE_TWO_FINGER_TAP,
446 EventType::ET_GESTURE_PINCH_BEGIN, 446 EventType::ET_GESTURE_PINCH_BEGIN,
447 EventType::ET_GESTURE_PINCH_END, 447 EventType::ET_GESTURE_PINCH_END,
448 EventType::ET_GESTURE_PINCH_UPDATE, 448 EventType::ET_GESTURE_PINCH_UPDATE,
449 EventType::ET_GESTURE_LONG_PRESS, 449 EventType::ET_GESTURE_LONG_PRESS,
450 EventType::ET_GESTURE_LONG_TAP, 450 EventType::ET_GESTURE_LONG_TAP,
451 EventType::ET_GESTURE_SWIPE, 451 EventType::ET_GESTURE_SWIPE,
452 EventType::ET_GESTURE_TAP_UNCONFIRMED, 452 EventType::ET_GESTURE_TAP_UNCONFIRMED,
453 EventType::ET_GESTURE_DOUBLE_TAP, 453 EventType::ET_GESTURE_DOUBLE_TAP,
454 }; 454 };
455 for (int i = 0; i < 17; i++) { 455 for (int i = 0; i < 17; i++) {
456 ScopedEvent event( 456 ScopedEvent event(
457 new GestureEvent(0.0, 0.0, 0, base::TimeDelta(), 457 new GestureEvent(0.0, 0.0, 0, base::TimeTicks(),
458 CreateCornerCaseGestureEventDetails(event_types[i]))); 458 CreateCornerCaseGestureEventDetails(event_types[i])));
459 Verify(event); 459 Verify(event);
460 } 460 }
461 } 461 }
462 462
463 TEST_F(EventParamTraitsTest, GoodSimplePointerEvent) { 463 TEST_F(EventParamTraitsTest, GoodSimplePointerEvent) {
464 EventType event_types[] = { 464 EventType event_types[] = {
465 ET_POINTER_DOWN, ET_POINTER_MOVED, ET_POINTER_UP, 465 ET_POINTER_DOWN, ET_POINTER_MOVED, ET_POINTER_UP,
466 ET_POINTER_CANCELLED, ET_POINTER_ENTERED, ET_POINTER_EXITED, 466 ET_POINTER_CANCELLED, ET_POINTER_ENTERED, ET_POINTER_EXITED,
467 }; 467 };
468 EventPointerType pointer_types[] = { 468 EventPointerType pointer_types[] = {
469 EventPointerType::POINTER_TYPE_MOUSE, 469 EventPointerType::POINTER_TYPE_MOUSE,
470 EventPointerType::POINTER_TYPE_TOUCH, 470 EventPointerType::POINTER_TYPE_TOUCH,
471 }; 471 };
472 472
473 for (size_t i = 0; i < arraysize(event_types); i++) { 473 for (size_t i = 0; i < arraysize(event_types); i++) {
474 for (size_t j = 0; j < arraysize(pointer_types); j++) { 474 for (size_t j = 0; j < arraysize(pointer_types); j++) {
475 ScopedEvent event(new PointerEvent(event_types[i], pointer_types[j], 475 ScopedEvent event(new PointerEvent(event_types[i], pointer_types[j],
476 gfx::Point(), gfx::Point(), 0, 0, 476 gfx::Point(), gfx::Point(), 0, 0,
477 base::TimeDelta())); 477 base::TimeTicks()));
478 Verify(event); 478 Verify(event);
479 } 479 }
480 } 480 }
481 } 481 }
482 482
483 #undef FEQ 483 #undef FEQ
484 #undef ASSERT_FEQ 484 #undef ASSERT_FEQ
485 #undef CAST_EVENT 485 #undef CAST_EVENT
486 #undef COMPARE_BASE 486 #undef COMPARE_BASE
487 #undef MIN 487 #undef MIN
488 #undef MAX 488 #undef MAX
489 #undef IMIN 489 #undef IMIN
490 #undef IMAX 490 #undef IMAX
491 #undef FMIN 491 #undef FMIN
492 #undef FMAX 492 #undef FMAX
493 #undef FNAN 493 #undef FNAN
494 494
495 } // namespace 495 } // namespace
496 } // namespace ui 496 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698