| Index: ui/events/event_unittest.cc
|
| diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
|
| index 523cf0883f52ec671e4d29bdfd2e1cf70d92e3bc..1297f3095b60f153b0fb08d9a5d8f01012e4c6f1 100644
|
| --- a/ui/events/event_unittest.cc
|
| +++ b/ui/events/event_unittest.cc
|
| @@ -79,6 +79,15 @@ TEST(EventTest, RepeatedClick) {
|
| base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
|
| base::TimeDelta later = start + base::TimeDelta::FromMilliseconds(1000);
|
|
|
| + // Same event.
|
| + test_ev1.set_location(gfx::Point(0, 0));
|
| + test_ev2.set_location(gfx::Point(1, 0));
|
| + test_ev1.set_time_stamp(start);
|
| + test_ev2.set_time_stamp(start);
|
| + EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
|
| + MouseEvent mouse_ev3(mouse_ev1);
|
| + EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev3));
|
| +
|
| // Close point.
|
| test_ev1.set_location(gfx::Point(0, 0));
|
| test_ev2.set_location(gfx::Point(1, 0));
|
| @@ -110,6 +119,7 @@ TEST(EventTest, DoubleClickRequiresRelease) {
|
| const gfx::Point origin2(100, 0);
|
| scoped_ptr<MouseEvent> ev;
|
| base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
|
| + base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
|
|
|
| ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(),
|
| 0, 0));
|
| @@ -130,11 +140,11 @@ TEST(EventTest, DoubleClickRequiresRelease) {
|
| EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
|
| ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin2, origin2, EventTimeForNow(),
|
| 0, 0));
|
| - ev->set_time_stamp(start);
|
| + ev->set_time_stamp(soon);
|
| EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
|
| ev.reset(new MouseEvent(ET_MOUSE_RELEASED, origin2, origin2,
|
| EventTimeForNow(), 0, 0));
|
| - ev->set_time_stamp(start);
|
| + ev->set_time_stamp(soon);
|
| EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
|
| MouseEvent::ResetLastClickForTest();
|
| }
|
| @@ -145,6 +155,7 @@ TEST(EventTest, SingleClickRightLeft) {
|
| const gfx::Point origin(0, 0);
|
| scoped_ptr<MouseEvent> ev;
|
| base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
|
| + base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
|
|
|
| ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
|
| ui::EF_RIGHT_MOUSE_BUTTON,
|
| @@ -161,7 +172,7 @@ TEST(EventTest, SingleClickRightLeft) {
|
| EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
|
| ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
|
| ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
|
| - ev->set_time_stamp(start);
|
| + ev->set_time_stamp(soon);
|
| EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
|
| MouseEvent::ResetLastClickForTest();
|
| }
|
|
|