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

Side by Side Diff: remoting/client/normalizing_input_filter_mac_unittest.cc

Issue 1908683002: Replace OS_LEFT/RIGHT with META_LEFT/RIGHT (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « remoting/client/normalizing_input_filter_mac.cc ('k') | remoting/host/input_injector_x11.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "remoting/client/normalizing_input_filter_mac.h" 5 #include "remoting/client/normalizing_input_filter_mac.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "remoting/proto/event.pb.h" 9 #include "remoting/proto/event.pb.h"
10 #include "remoting/protocol/protocol_mock_objects.h" 10 #include "remoting/protocol/protocol_mock_objects.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 TEST(NormalizingInputFilterMacTest, CmdKey) { 78 TEST(NormalizingInputFilterMacTest, CmdKey) {
79 MockInputStub stub; 79 MockInputStub stub;
80 std::unique_ptr<protocol::InputFilter> processor( 80 std::unique_ptr<protocol::InputFilter> processor(
81 new NormalizingInputFilterMac(&stub)); 81 new NormalizingInputFilterMac(&stub));
82 82
83 { 83 {
84 InSequence s; 84 InSequence s;
85 85
86 // Left command key. 86 // Left command key.
87 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 87 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
88 ui::DomCode::OS_LEFT, true))); 88 ui::DomCode::META_LEFT, true)));
89 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 89 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
90 ui::DomCode::US_C, true))); 90 ui::DomCode::US_C, true)));
91 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 91 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
92 ui::DomCode::US_C, false))); 92 ui::DomCode::US_C, false)));
93 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 93 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
94 ui::DomCode::OS_LEFT, false))); 94 ui::DomCode::META_LEFT, false)));
95 95
96 // Right command key. 96 // Right command key.
97 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 97 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
98 ui::DomCode::OS_RIGHT, true))); 98 ui::DomCode::META_RIGHT, true)));
99 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 99 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
100 ui::DomCode::US_C, true))); 100 ui::DomCode::US_C, true)));
101 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 101 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
102 ui::DomCode::US_C, false))); 102 ui::DomCode::US_C, false)));
103 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 103 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
104 ui::DomCode::OS_RIGHT, false))); 104 ui::DomCode::META_RIGHT, false)));
105 105
106 // More than one keys after CMD. 106 // More than one keys after CMD.
107 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 107 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
108 ui::DomCode::OS_RIGHT, true))); 108 ui::DomCode::META_RIGHT, true)));
109 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 109 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
110 ui::DomCode::US_C, true))); 110 ui::DomCode::US_C, true)));
111 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 111 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
112 ui::DomCode::US_V, true))); 112 ui::DomCode::US_V, true)));
113 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 113 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
114 ui::DomCode::US_C, false))); 114 ui::DomCode::US_C, false)));
115 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 115 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
116 ui::DomCode::US_V, false))); 116 ui::DomCode::US_V, false)));
117 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 117 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
118 ui::DomCode::OS_RIGHT, false))); 118 ui::DomCode::META_RIGHT, false)));
119 } 119 }
120 120
121 // Left command key. 121 // Left command key.
122 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true)); 122 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, true));
123 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true)); 123 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
124 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false)); 124 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, false));
125 125
126 // Right command key. 126 // Right command key.
127 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true)); 127 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, true));
128 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true)); 128 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
129 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false)); 129 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, false));
130 130
131 // More than one keys after CMD. 131 // More than one keys after CMD.
132 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true)); 132 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, true));
133 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true)); 133 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
134 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_V, true)); 134 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_V, true));
135 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false)); 135 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, false));
136 } 136 }
137 137
138 // Test pressing command and special keys. 138 // Test pressing command and special keys.
139 TEST(NormalizingInputFilterMacTest, SpecialKeys) { 139 TEST(NormalizingInputFilterMacTest, SpecialKeys) {
140 MockInputStub stub; 140 MockInputStub stub;
141 std::unique_ptr<protocol::InputFilter> processor( 141 std::unique_ptr<protocol::InputFilter> processor(
142 new NormalizingInputFilterMac(&stub)); 142 new NormalizingInputFilterMac(&stub));
143 143
144 { 144 {
145 InSequence s; 145 InSequence s;
146 146
147 // Command + Shift. 147 // Command + Shift.
148 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 148 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
149 ui::DomCode::OS_LEFT, true))); 149 ui::DomCode::META_LEFT, true)));
150 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 150 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
151 ui::DomCode::SHIFT_LEFT, true))); 151 ui::DomCode::SHIFT_LEFT, true)));
152 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 152 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
153 ui::DomCode::OS_LEFT, false))); 153 ui::DomCode::META_LEFT, false)));
154 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 154 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
155 ui::DomCode::SHIFT_LEFT, false))); 155 ui::DomCode::SHIFT_LEFT, false)));
156 156
157 // Command + Option. 157 // Command + Option.
158 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 158 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
159 ui::DomCode::OS_LEFT, true))); 159 ui::DomCode::META_LEFT, true)));
160 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 160 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
161 ui::DomCode::ALT_LEFT, true))); 161 ui::DomCode::ALT_LEFT, true)));
162 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 162 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
163 ui::DomCode::OS_LEFT, false))); 163 ui::DomCode::META_LEFT, false)));
164 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 164 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
165 ui::DomCode::ALT_LEFT, false))); 165 ui::DomCode::ALT_LEFT, false)));
166 } 166 }
167 167
168 // Command + Shift. 168 // Command + Shift.
169 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true)); 169 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, true));
170 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::SHIFT_LEFT, true)); 170 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::SHIFT_LEFT, true));
171 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false)); 171 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, false));
172 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::SHIFT_LEFT, false)); 172 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::SHIFT_LEFT, false));
173 173
174 // Command + Option. 174 // Command + Option.
175 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true)); 175 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, true));
176 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::ALT_LEFT, true)); 176 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::ALT_LEFT, true));
177 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false)); 177 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, false));
178 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::ALT_LEFT, false)); 178 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::ALT_LEFT, false));
179 } 179 }
180 180
181 // Test pressing multiple command keys. 181 // Test pressing multiple command keys.
182 TEST(NormalizingInputFilterMacTest, MultipleCmdKeys) { 182 TEST(NormalizingInputFilterMacTest, MultipleCmdKeys) {
183 MockInputStub stub; 183 MockInputStub stub;
184 std::unique_ptr<protocol::InputFilter> processor( 184 std::unique_ptr<protocol::InputFilter> processor(
185 new NormalizingInputFilterMac(&stub)); 185 new NormalizingInputFilterMac(&stub));
186 186
187 { 187 {
188 InSequence s; 188 InSequence s;
189 189
190 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 190 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
191 ui::DomCode::OS_LEFT, true))); 191 ui::DomCode::META_LEFT, true)));
192 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 192 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
193 ui::DomCode::US_C, true))); 193 ui::DomCode::US_C, true)));
194 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 194 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
195 ui::DomCode::OS_RIGHT, true))); 195 ui::DomCode::META_RIGHT, true)));
196 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 196 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
197 ui::DomCode::US_C, false))); 197 ui::DomCode::US_C, false)));
198 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 198 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
199 ui::DomCode::OS_LEFT, false))); 199 ui::DomCode::META_LEFT, false)));
200 } 200 }
201 201
202 // Test multiple CMD keys at the same time. 202 // Test multiple CMD keys at the same time.
203 // L CMD Down, C Down, R CMD Down, L CMD Up. 203 // L CMD Down, C Down, R CMD Down, L CMD Up.
204 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true)); 204 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, true));
205 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true)); 205 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
206 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true)); 206 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, true));
207 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false)); 207 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_LEFT, false));
208 } 208 }
209 209
210 // Test press C key before command key. 210 // Test press C key before command key.
211 TEST(NormalizingInputFilterMacTest, BeforeCmdKey) { 211 TEST(NormalizingInputFilterMacTest, BeforeCmdKey) {
212 MockInputStub stub; 212 MockInputStub stub;
213 std::unique_ptr<protocol::InputFilter> processor( 213 std::unique_ptr<protocol::InputFilter> processor(
214 new NormalizingInputFilterMac(&stub)); 214 new NormalizingInputFilterMac(&stub));
215 215
216 { 216 {
217 InSequence s; 217 InSequence s;
218 218
219 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 219 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
220 ui::DomCode::US_C, true))); 220 ui::DomCode::US_C, true)));
221 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 221 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
222 ui::DomCode::OS_RIGHT, true))); 222 ui::DomCode::META_RIGHT, true)));
223 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 223 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
224 ui::DomCode::US_C, false))); 224 ui::DomCode::US_C, false)));
225 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 225 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
226 ui::DomCode::OS_RIGHT, false))); 226 ui::DomCode::META_RIGHT, false)));
227 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock( 227 EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
228 ui::DomCode::US_C, false))); 228 ui::DomCode::US_C, false)));
229 } 229 }
230 230
231 // Press C before command key. 231 // Press C before command key.
232 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true)); 232 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
233 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true)); 233 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, true));
234 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false)); 234 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::META_RIGHT, false));
235 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, false)); 235 processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, false));
236 } 236 }
237 237
238 } // namespace remoting 238 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/normalizing_input_filter_mac.cc ('k') | remoting/host/input_injector_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698