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

Side by Side Diff: chrome/test/chromedriver/key_converter_unittest.cc

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <list> 5 #include <list>
6 #include <string> 6 #include <string>
7 7
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/test/chromedriver/chrome/status.h" 10 #include "chrome/test/chromedriver/chrome/status.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 CreateKeyUpEvent(ui::VKEY_Y, 0)}; 129 CreateKeyUpEvent(ui::VKEY_Y, 0)};
130 CheckEventsReleaseModifiers("hey", event_array, arraysize(event_array)); 130 CheckEventsReleaseModifiers("hey", event_array, arraysize(event_array));
131 } 131 }
132 132
133 TEST(KeyConverter, WebDriverSpecialChar) { 133 TEST(KeyConverter, WebDriverSpecialChar) {
134 KeyEvent event_array[] = { 134 KeyEvent event_array[] = {
135 CreateKeyDownEvent(ui::VKEY_SPACE, 0), 135 CreateKeyDownEvent(ui::VKEY_SPACE, 0),
136 CreateCharEvent(" ", " ", 0), 136 CreateCharEvent(" ", " ", 0),
137 CreateKeyUpEvent(ui::VKEY_SPACE, 0)}; 137 CreateKeyUpEvent(ui::VKEY_SPACE, 0)};
138 base::string16 keys; 138 base::string16 keys;
139 keys.push_back(static_cast<char16>(0xE00DU)); 139 keys.push_back(static_cast<base::char16>(0xE00DU));
140 CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array)); 140 CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
141 } 141 }
142 142
143 TEST(KeyConverter, WebDriverSpecialNonCharKey) { 143 TEST(KeyConverter, WebDriverSpecialNonCharKey) {
144 KeyEvent event_array[] = { 144 KeyEvent event_array[] = {
145 CreateKeyDownEvent(ui::VKEY_F1, 0), 145 CreateKeyDownEvent(ui::VKEY_F1, 0),
146 CreateKeyUpEvent(ui::VKEY_F1, 0)}; 146 CreateKeyUpEvent(ui::VKEY_F1, 0)};
147 base::string16 keys; 147 base::string16 keys;
148 keys.push_back(static_cast<char16>(0xE031U)); 148 keys.push_back(static_cast<base::char16>(0xE031U));
149 CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array)); 149 CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
150 } 150 }
151 151
152 TEST(KeyConverter, FrenchKeyOnEnglishLayout) { 152 TEST(KeyConverter, FrenchKeyOnEnglishLayout) {
153 KeyEvent event_array[] = { 153 KeyEvent event_array[] = {
154 CreateKeyDownEvent(ui::VKEY_UNKNOWN, 0), 154 CreateKeyDownEvent(ui::VKEY_UNKNOWN, 0),
155 CreateCharEvent(base::WideToUTF8(L"\u00E9"), 155 CreateCharEvent(base::WideToUTF8(L"\u00E9"),
156 base::WideToUTF8(L"\u00E9"), 0), 156 base::WideToUTF8(L"\u00E9"), 0),
157 CreateKeyUpEvent(ui::VKEY_UNKNOWN, 0)}; 157 CreateKeyUpEvent(ui::VKEY_UNKNOWN, 0)};
158 CheckEventsReleaseModifiers(base::WideToUTF16(L"\u00E9"), 158 CheckEventsReleaseModifiers(base::WideToUTF16(L"\u00E9"),
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 CreateCharEvent("a", "A", kShiftKeyModifierMask), 203 CreateCharEvent("a", "A", kShiftKeyModifierMask),
204 CreateKeyUpEvent(ui::VKEY_A, kShiftKeyModifierMask), 204 CreateKeyUpEvent(ui::VKEY_A, kShiftKeyModifierMask),
205 CreateKeyDownEvent(ui::VKEY_B, kShiftKeyModifierMask), 205 CreateKeyDownEvent(ui::VKEY_B, kShiftKeyModifierMask),
206 CreateCharEvent("b", "B", kShiftKeyModifierMask), 206 CreateCharEvent("b", "B", kShiftKeyModifierMask),
207 CreateKeyUpEvent(ui::VKEY_B, kShiftKeyModifierMask), 207 CreateKeyUpEvent(ui::VKEY_B, kShiftKeyModifierMask),
208 CreateKeyDownEvent(ui::VKEY_C, kShiftKeyModifierMask), 208 CreateKeyDownEvent(ui::VKEY_C, kShiftKeyModifierMask),
209 CreateCharEvent("c", "C", kShiftKeyModifierMask), 209 CreateCharEvent("c", "C", kShiftKeyModifierMask),
210 CreateKeyUpEvent(ui::VKEY_C, kShiftKeyModifierMask), 210 CreateKeyUpEvent(ui::VKEY_C, kShiftKeyModifierMask),
211 CreateKeyUpEvent(ui::VKEY_SHIFT, 0)}; 211 CreateKeyUpEvent(ui::VKEY_SHIFT, 0)};
212 base::string16 keys; 212 base::string16 keys;
213 keys.push_back(static_cast<char16>(0xE008U)); 213 keys.push_back(static_cast<base::char16>(0xE008U));
214 keys.append(base::UTF8ToUTF16("aBc")); 214 keys.append(base::UTF8ToUTF16("aBc"));
215 CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array)); 215 CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
216 } 216 }
217 217
218 TEST(KeyConverter, ToggleModifiers) { 218 TEST(KeyConverter, ToggleModifiers) {
219 KeyEvent event_array[] = { 219 KeyEvent event_array[] = {
220 CreateKeyDownEvent(ui::VKEY_SHIFT, kShiftKeyModifierMask), 220 CreateKeyDownEvent(ui::VKEY_SHIFT, kShiftKeyModifierMask),
221 CreateKeyUpEvent(ui::VKEY_SHIFT, 0), 221 CreateKeyUpEvent(ui::VKEY_SHIFT, 0),
222 CreateKeyDownEvent(ui::VKEY_CONTROL, kControlKeyModifierMask), 222 CreateKeyDownEvent(ui::VKEY_CONTROL, kControlKeyModifierMask),
223 CreateKeyUpEvent(ui::VKEY_CONTROL, 0), 223 CreateKeyUpEvent(ui::VKEY_CONTROL, 0),
224 CreateKeyDownEvent(ui::VKEY_MENU, kAltKeyModifierMask), 224 CreateKeyDownEvent(ui::VKEY_MENU, kAltKeyModifierMask),
225 CreateKeyUpEvent(ui::VKEY_MENU, 0), 225 CreateKeyUpEvent(ui::VKEY_MENU, 0),
226 CreateKeyDownEvent(ui::VKEY_COMMAND, kMetaKeyModifierMask), 226 CreateKeyDownEvent(ui::VKEY_COMMAND, kMetaKeyModifierMask),
227 CreateKeyUpEvent(ui::VKEY_COMMAND, 0)}; 227 CreateKeyUpEvent(ui::VKEY_COMMAND, 0)};
228 base::string16 keys; 228 base::string16 keys;
229 keys.push_back(static_cast<char16>(0xE008U)); 229 keys.push_back(static_cast<base::char16>(0xE008U));
230 keys.push_back(static_cast<char16>(0xE008U)); 230 keys.push_back(static_cast<base::char16>(0xE008U));
231 keys.push_back(static_cast<char16>(0xE009U)); 231 keys.push_back(static_cast<base::char16>(0xE009U));
232 keys.push_back(static_cast<char16>(0xE009U)); 232 keys.push_back(static_cast<base::char16>(0xE009U));
233 keys.push_back(static_cast<char16>(0xE00AU)); 233 keys.push_back(static_cast<base::char16>(0xE00AU));
234 keys.push_back(static_cast<char16>(0xE00AU)); 234 keys.push_back(static_cast<base::char16>(0xE00AU));
235 keys.push_back(static_cast<char16>(0xE03DU)); 235 keys.push_back(static_cast<base::char16>(0xE03DU));
236 keys.push_back(static_cast<char16>(0xE03DU)); 236 keys.push_back(static_cast<base::char16>(0xE03DU));
237 CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array)); 237 CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
238 } 238 }
239 239
240 #if defined(OS_WIN) 240 #if defined(OS_WIN)
241 // https://code.google.com/p/chromedriver/issues/detail?id=546 241 // https://code.google.com/p/chromedriver/issues/detail?id=546
242 #define MAYBE_AllShorthandKeys DISABLED_AllShorthandKeys 242 #define MAYBE_AllShorthandKeys DISABLED_AllShorthandKeys
243 #else 243 #else
244 #define MAYBE_AllShorthandKeys AllShorthandKeys 244 #define MAYBE_AllShorthandKeys AllShorthandKeys
245 #endif 245 #endif
246 246
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 int shift_key_modifier = kShiftKeyModifierMask; 380 int shift_key_modifier = kShiftKeyModifierMask;
381 int control_key_modifier = shift_key_modifier | kControlKeyModifierMask; 381 int control_key_modifier = shift_key_modifier | kControlKeyModifierMask;
382 int alt_key_modifier = control_key_modifier | kAltKeyModifierMask; 382 int alt_key_modifier = control_key_modifier | kAltKeyModifierMask;
383 int meta_key_modifier = alt_key_modifier | kMetaKeyModifierMask; 383 int meta_key_modifier = alt_key_modifier | kMetaKeyModifierMask;
384 KeyEvent event_array[] = { 384 KeyEvent event_array[] = {
385 CreateKeyDownEvent(ui::VKEY_SHIFT, shift_key_modifier), 385 CreateKeyDownEvent(ui::VKEY_SHIFT, shift_key_modifier),
386 CreateKeyDownEvent(ui::VKEY_CONTROL, control_key_modifier), 386 CreateKeyDownEvent(ui::VKEY_CONTROL, control_key_modifier),
387 CreateKeyDownEvent(ui::VKEY_MENU, alt_key_modifier), 387 CreateKeyDownEvent(ui::VKEY_MENU, alt_key_modifier),
388 CreateKeyDownEvent(ui::VKEY_COMMAND, meta_key_modifier)}; 388 CreateKeyDownEvent(ui::VKEY_COMMAND, meta_key_modifier)};
389 base::string16 keys; 389 base::string16 keys;
390 keys.push_back(static_cast<char16>(0xE008U)); 390 keys.push_back(static_cast<base::char16>(0xE008U));
391 keys.push_back(static_cast<char16>(0xE009U)); 391 keys.push_back(static_cast<base::char16>(0xE009U));
392 keys.push_back(static_cast<char16>(0xE00AU)); 392 keys.push_back(static_cast<base::char16>(0xE00AU));
393 keys.push_back(static_cast<char16>(0xE03DU)); 393 keys.push_back(static_cast<base::char16>(0xE03DU));
394 394
395 CheckEvents(keys, event_array, false /* release_modifiers */, 395 CheckEvents(keys, event_array, false /* release_modifiers */,
396 arraysize(event_array), meta_key_modifier); 396 arraysize(event_array), meta_key_modifier);
397 } 397 }
398 398
399 TEST(KeyConverter, ReleaseModifiers) { 399 TEST(KeyConverter, ReleaseModifiers) {
400 KeyEvent event_array[] = { 400 KeyEvent event_array[] = {
401 CreateKeyDownEvent(ui::VKEY_SHIFT, kShiftKeyModifierMask), 401 CreateKeyDownEvent(ui::VKEY_SHIFT, kShiftKeyModifierMask),
402 CreateKeyDownEvent(ui::VKEY_CONTROL, 402 CreateKeyDownEvent(ui::VKEY_CONTROL,
403 kShiftKeyModifierMask | kControlKeyModifierMask), 403 kShiftKeyModifierMask | kControlKeyModifierMask),
404 CreateKeyUpEvent(ui::VKEY_SHIFT, 0), 404 CreateKeyUpEvent(ui::VKEY_SHIFT, 0),
405 CreateKeyUpEvent(ui::VKEY_CONTROL, 0)}; 405 CreateKeyUpEvent(ui::VKEY_CONTROL, 0)};
406 base::string16 keys; 406 base::string16 keys;
407 keys.push_back(static_cast<char16>(0xE008U)); 407 keys.push_back(static_cast<base::char16>(0xE008U));
408 keys.push_back(static_cast<char16>(0xE009U)); 408 keys.push_back(static_cast<base::char16>(0xE009U));
409 409
410 CheckEvents(keys, event_array, true /* release_modifiers */, 410 CheckEvents(keys, event_array, true /* release_modifiers */,
411 arraysize(event_array), 0); 411 arraysize(event_array), 0);
412 } 412 }
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/key_converter.cc ('k') | chrome/test/chromedriver/keycode_text_conversion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698