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

Side by Side Diff: ui/events/gesture_detection/motion_event_generic_unittest.cc

Issue 567783002: Add modifier flags to MotionEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove MotionEvent modifiers Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 #include "ui/events/event_constants.h"
6 #include "ui/events/gesture_detection/motion_event_generic.h" 7 #include "ui/events/gesture_detection/motion_event_generic.h"
7 8
8 namespace ui { 9 namespace ui {
9 10
10 TEST(MotionEventGenericTest, Basic) { 11 TEST(MotionEventGenericTest, Basic) {
11 base::TimeTicks event_time = base::TimeTicks::Now(); 12 base::TimeTicks event_time = base::TimeTicks::Now();
12 MotionEventGeneric event( 13 MotionEventGeneric event(
13 MotionEvent::ACTION_DOWN, event_time, PointerProperties()); 14 MotionEvent::ACTION_DOWN, event_time, PointerProperties());
14 EXPECT_EQ(1U, event.GetPointerCount()); 15 EXPECT_EQ(1U, event.GetPointerCount());
15 EXPECT_EQ(0U, event.GetHistorySize()); 16 EXPECT_EQ(0U, event.GetHistorySize());
(...skipping 15 matching lines...) Expand all
31 event.set_action(MotionEvent::ACTION_POINTER_DOWN); 32 event.set_action(MotionEvent::ACTION_POINTER_DOWN);
32 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction()); 33 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
33 34
34 event_time += base::TimeDelta::FromMilliseconds(5); 35 event_time += base::TimeDelta::FromMilliseconds(5);
35 event.set_event_time(event_time); 36 event.set_event_time(event_time);
36 EXPECT_EQ(event_time, event.GetEventTime()); 37 EXPECT_EQ(event_time, event.GetEventTime());
37 38
38 event.set_button_state(MotionEvent::BUTTON_PRIMARY); 39 event.set_button_state(MotionEvent::BUTTON_PRIMARY);
39 EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState()); 40 EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState());
40 41
42 event.set_flags(EF_ALT_DOWN | EF_SHIFT_DOWN);
43 EXPECT_EQ(EF_ALT_DOWN | EF_SHIFT_DOWN, event.GetFlags());
44
41 event.set_action_index(1); 45 event.set_action_index(1);
42 EXPECT_EQ(1, event.GetActionIndex()); 46 EXPECT_EQ(1, event.GetActionIndex());
43 } 47 }
44 48
45 TEST(MotionEventGenericTest, Clone) { 49 TEST(MotionEventGenericTest, Clone) {
46 MotionEventGeneric event(MotionEvent::ACTION_DOWN, 50 MotionEventGeneric event(MotionEvent::ACTION_DOWN,
47 base::TimeTicks::Now(), 51 base::TimeTicks::Now(),
48 PointerProperties(8.3f, 4.7f)); 52 PointerProperties(8.3f, 4.7f));
49 event.set_id(1); 53 event.set_id(1);
50 event.set_button_state(MotionEvent::BUTTON_PRIMARY); 54 event.set_button_state(MotionEvent::BUTTON_PRIMARY);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 pointer.id = 3; 92 pointer.id = 3;
89 event2.PushPointer(pointer); 93 event2.PushPointer(pointer);
90 EXPECT_EQ(0, event2.FindPointerIndexOfId(0)); 94 EXPECT_EQ(0, event2.FindPointerIndexOfId(0));
91 EXPECT_EQ(1, event2.FindPointerIndexOfId(7)); 95 EXPECT_EQ(1, event2.FindPointerIndexOfId(7));
92 EXPECT_EQ(2, event2.FindPointerIndexOfId(3)); 96 EXPECT_EQ(2, event2.FindPointerIndexOfId(3));
93 EXPECT_EQ(-1, event2.FindPointerIndexOfId(1)); 97 EXPECT_EQ(-1, event2.FindPointerIndexOfId(1));
94 EXPECT_EQ(-1, event2.FindPointerIndexOfId(2)); 98 EXPECT_EQ(-1, event2.FindPointerIndexOfId(2));
95 } 99 }
96 100
97 } // namespace ui 101 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/gesture_detection/motion_event_generic.cc ('k') | ui/events/gesture_detection/touch_disposition_gesture_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698