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

Side by Side Diff: ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc

Issue 661353006: ozone: evdev: Dispatch events in task (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 6 years, 2 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/ozone/evdev/event_factory_evdev.cc ('k') | ui/events/ozone/evdev/keyboard_evdev.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <linux/input.h> 5 #include <linux/input.h>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 close(events_in_); 65 close(events_in_);
66 close(events_out_); 66 close(events_out_);
67 } 67 }
68 68
69 ui::MockKeyEventConverterEvdev* device() { return device_.get(); } 69 ui::MockKeyEventConverterEvdev* device() { return device_.get(); }
70 ui::EventModifiersEvdev* modifiers() { return modifiers_.get(); } 70 ui::EventModifiersEvdev* modifiers() { return modifiers_.get(); }
71 71
72 unsigned size() { return dispatched_events_.size(); } 72 unsigned size() { return dispatched_events_.size(); }
73 ui::KeyEvent* dispatched_event(unsigned index) { 73 ui::KeyEvent* dispatched_event(unsigned index) {
74 DCHECK_GT(dispatched_events_.size(), index); 74 DCHECK_GT(dispatched_events_.size(), index);
75 return dispatched_events_[index]; 75 ui::Event* ev = dispatched_events_[index];
76 DCHECK(ev->IsKeyEvent());
77 return static_cast<ui::KeyEvent*>(ev);
76 } 78 }
77 79
78 private: 80 private:
79 void DispatchEventForTest(ui::Event* event) { 81 void DispatchEventForTest(scoped_ptr<ui::Event> event) {
80 dispatched_events_.push_back( 82 dispatched_events_.push_back(event.release());
81 new ui::KeyEvent(*static_cast<ui::KeyEvent*>(event)));
82 } 83 }
83 84
84 base::MessageLoopForUI ui_loop_; 85 base::MessageLoopForUI ui_loop_;
85 86
86 scoped_ptr<ui::EventModifiersEvdev> modifiers_; 87 scoped_ptr<ui::EventModifiersEvdev> modifiers_;
87 scoped_ptr<ui::KeyboardEvdev> keyboard_; 88 scoped_ptr<ui::KeyboardEvdev> keyboard_;
88 scoped_ptr<ui::MockKeyEventConverterEvdev> device_; 89 scoped_ptr<ui::MockKeyEventConverterEvdev> device_;
89 90
90 ScopedVector<ui::KeyEvent> dispatched_events_; 91 ScopedVector<ui::Event> dispatched_events_;
91 92
92 int events_out_; 93 int events_out_;
93 int events_in_; 94 int events_in_;
94 95
95 DISALLOW_COPY_AND_ASSIGN(KeyEventConverterEvdevTest); 96 DISALLOW_COPY_AND_ASSIGN(KeyEventConverterEvdevTest);
96 }; 97 };
97 98
98 TEST_F(KeyEventConverterEvdevTest, KeyPress) { 99 TEST_F(KeyEventConverterEvdevTest, KeyPress) {
99 ui::MockKeyEventConverterEvdev* dev = device(); 100 ui::MockKeyEventConverterEvdev* dev = device();
100 101
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 event = dispatched_event(4); 347 event = dispatched_event(4);
347 EXPECT_EQ(ui::ET_KEY_PRESSED, event->type()); 348 EXPECT_EQ(ui::ET_KEY_PRESSED, event->type());
348 EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code()); 349 EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code());
349 EXPECT_EQ(0, event->flags()); 350 EXPECT_EQ(0, event->flags());
350 351
351 event = dispatched_event(5); 352 event = dispatched_event(5);
352 EXPECT_EQ(ui::ET_KEY_RELEASED, event->type()); 353 EXPECT_EQ(ui::ET_KEY_RELEASED, event->type());
353 EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code()); 354 EXPECT_EQ(ui::VKEY_CAPITAL, event->key_code());
354 EXPECT_EQ(0, event->flags()); 355 EXPECT_EQ(0, event->flags());
355 } 356 }
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/event_factory_evdev.cc ('k') | ui/events/ozone/evdev/keyboard_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698