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

Side by Side Diff: ui/events/mojo/struct_traits_unittest.cc

Issue 2752093004: Makes KeyEvent struct traits restore Event::time_stamp() field (Closed)
Patch Set: Created 3 years, 9 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 | « ui/events/mojo/event_struct_traits.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "mojo/public/cpp/bindings/binding_set.h" 6 #include "mojo/public/cpp/bindings/binding_set.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "ui/events/keycodes/dom/dom_code.h" 8 #include "ui/events/keycodes/dom/dom_code.h"
9 #include "ui/events/mojo/traits_test_service.mojom.h" 9 #include "ui/events/mojo/traits_test_service.mojom.h"
10 10
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 {ET_KEY_PRESSED, VKEY_RETURN, EF_CONTROL_DOWN}, 129 {ET_KEY_PRESSED, VKEY_RETURN, EF_CONTROL_DOWN},
130 {ET_KEY_PRESSED, VKEY_MENU, EF_ALT_DOWN}, 130 {ET_KEY_PRESSED, VKEY_MENU, EF_ALT_DOWN},
131 {ET_KEY_RELEASED, VKEY_SHIFT, EF_SHIFT_DOWN}, 131 {ET_KEY_RELEASED, VKEY_SHIFT, EF_SHIFT_DOWN},
132 {ET_KEY_RELEASED, VKEY_MENU, EF_ALT_DOWN}, 132 {ET_KEY_RELEASED, VKEY_MENU, EF_ALT_DOWN},
133 {ET_KEY_PRESSED, VKEY_A, ui::DomCode::US_A, EF_NONE}, 133 {ET_KEY_PRESSED, VKEY_A, ui::DomCode::US_A, EF_NONE},
134 {ET_KEY_PRESSED, VKEY_B, ui::DomCode::US_B, 134 {ET_KEY_PRESSED, VKEY_B, ui::DomCode::US_B,
135 EF_CONTROL_DOWN | EF_ALT_DOWN}, 135 EF_CONTROL_DOWN | EF_ALT_DOWN},
136 {'\x12', VKEY_2, EF_CONTROL_DOWN}, 136 {'\x12', VKEY_2, EF_CONTROL_DOWN},
137 {'Z', VKEY_Z, EF_CAPS_LOCK_ON}, 137 {'Z', VKEY_Z, EF_CAPS_LOCK_ON},
138 {'z', VKEY_Z, EF_NONE}, 138 {'z', VKEY_Z, EF_NONE},
139 {ET_KEY_PRESSED, VKEY_Z, EF_NONE,
140 base::TimeTicks::FromInternalValue(101)},
141 {'Z', VKEY_Z, EF_NONE, base::TimeTicks::FromInternalValue(102)},
139 }; 142 };
140 143
141 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy(); 144 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
142 for (size_t i = 0; i < arraysize(kTestData); i++) { 145 for (size_t i = 0; i < arraysize(kTestData); i++) {
143 std::unique_ptr<Event> output; 146 std::unique_ptr<Event> output;
144 proxy->EchoEvent(Event::Clone(kTestData[i]), &output); 147 proxy->EchoEvent(Event::Clone(kTestData[i]), &output);
145 EXPECT_TRUE(output->IsKeyEvent()); 148 EXPECT_TRUE(output->IsKeyEvent());
146 149
147 const KeyEvent* output_key_event = output->AsKeyEvent(); 150 const KeyEvent* output_key_event = output->AsKeyEvent();
148 EXPECT_EQ(kTestData[i].type(), output_key_event->type()); 151 EXPECT_EQ(kTestData[i].type(), output_key_event->type());
149 EXPECT_EQ(kTestData[i].flags(), output_key_event->flags()); 152 EXPECT_EQ(kTestData[i].flags(), output_key_event->flags());
150 EXPECT_EQ(kTestData[i].GetCharacter(), output_key_event->GetCharacter()); 153 EXPECT_EQ(kTestData[i].GetCharacter(), output_key_event->GetCharacter());
151 EXPECT_EQ(kTestData[i].GetUnmodifiedText(), 154 EXPECT_EQ(kTestData[i].GetUnmodifiedText(),
152 output_key_event->GetUnmodifiedText()); 155 output_key_event->GetUnmodifiedText());
153 EXPECT_EQ(kTestData[i].GetText(), output_key_event->GetText()); 156 EXPECT_EQ(kTestData[i].GetText(), output_key_event->GetText());
154 EXPECT_EQ(kTestData[i].is_char(), output_key_event->is_char()); 157 EXPECT_EQ(kTestData[i].is_char(), output_key_event->is_char());
155 EXPECT_EQ(kTestData[i].is_repeat(), output_key_event->is_repeat()); 158 EXPECT_EQ(kTestData[i].is_repeat(), output_key_event->is_repeat());
156 EXPECT_EQ(kTestData[i].GetConflatedWindowsKeyCode(), 159 EXPECT_EQ(kTestData[i].GetConflatedWindowsKeyCode(),
157 output_key_event->GetConflatedWindowsKeyCode()); 160 output_key_event->GetConflatedWindowsKeyCode());
158 EXPECT_EQ(kTestData[i].code(), output_key_event->code()); 161 EXPECT_EQ(kTestData[i].code(), output_key_event->code());
162 EXPECT_EQ(kTestData[i].time_stamp(), output_key_event->time_stamp());
159 } 163 }
160 } 164 }
161 165
162 TEST_F(StructTraitsTest, PointerEvent) { 166 TEST_F(StructTraitsTest, PointerEvent) {
163 PointerEvent kTestData[] = { 167 PointerEvent kTestData[] = {
164 // Mouse pointer events: 168 // Mouse pointer events:
165 {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 169 {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE,
166 PointerEvent::kMousePointerId, 0, 170 PointerEvent::kMousePointerId, 0,
167 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()}, 171 PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
168 {ET_POINTER_MOVED, gfx::Point(1, 5), gfx::Point(5, 1), 172 {ET_POINTER_MOVED, gfx::Point(1, 5), gfx::Point(5, 1),
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 EXPECT_EQ(kTestData[i].flags(), output_pointer_event->flags()); 234 EXPECT_EQ(kTestData[i].flags(), output_pointer_event->flags());
231 EXPECT_EQ(kTestData[i].location(), output_pointer_event->location()); 235 EXPECT_EQ(kTestData[i].location(), output_pointer_event->location());
232 EXPECT_EQ(kTestData[i].root_location(), 236 EXPECT_EQ(kTestData[i].root_location(),
233 output_pointer_event->root_location()); 237 output_pointer_event->root_location());
234 EXPECT_EQ(kTestData[i].offset(), 238 EXPECT_EQ(kTestData[i].offset(),
235 output_pointer_event->pointer_details().offset); 239 output_pointer_event->pointer_details().offset);
236 } 240 }
237 } 241 }
238 242
239 } // namespace ui 243 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/mojo/event_struct_traits.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698