Force U.S. English keyboard layout for TextfieldTest.KeysWithModifiersTest

ui/views/controls/textfield/textfield_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/textfield/textfield.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 18 matching lines @@
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/test/event_generator.h"
+#include "ui/events/test/keyboard_layout.h"
 #include "ui/gfx/render_text.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/textfield/textfield_model.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/test/widget_test.h"
@@ skipping 709 matching lines @@
   SendKeyEvent(ui::VKEY_1, false, true,  false, true);
   SendKeyEvent(ui::VKEY_1, false, false, false, true);
 
   // On Mac, Caps+Shift remains uppercase.
   if (TestingNativeMac())
     EXPECT_STR_EQ("TeXT!1!1", textfield_->text());
   else
     EXPECT_STR_EQ("TexT!1!1", textfield_->text());
 }
 
-TEST_F(TextfieldTest, KeysWithModifiersTest) {
+#if defined(OS_WIN) || defined(OS_MACOSX)
+#define MAYBE_KeysWithModifiersTest KeysWithModifiersTest
+#else
+// TODO(crbug.com/633136): Test can fail with some keyboard layouts. Disable
+// test for platforms where changing keyboard layout is not implemented (thus
+// U.S. English layout cannot be forced).

[Peter Kasting, 2016/09/01 20:16:29]

Nit: Hmm, this TODO says what's currently happening rather than what's TODO. 
Seems like it should be more like

TODO(...): Implement keyboard layout changing for other platforms.

And are you going to leave bug 633136 as the bug on doing this implementation? 
Or will that bug effectively be "fixed" because either the problem is solved or
the test is disabled, so we'll end up with a different bug just about
implementing this on other platforms?

[Tomasz Moniuszko, 2016/09/08 14:44:41]

I reported https://bugs.chromium.org/p/chromium/issues/detail?id=633136 for
other platforms.

+#define MAYBE_KeysWithModifiersTest DISABLED_KeysWithModifiersTest
+#endif
+
+TEST_F(TextfieldTest, MAYBE_KeysWithModifiersTest) {
+  // Activate U.S. English keyboard layout. Modifier keys in other layouts may
+  // change the text inserted into a texfield and cause this test to fail.
+  ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US);
+
   InitTextfield();
   const int ctrl = ui::EF_CONTROL_DOWN;
   const int alt = ui::EF_ALT_DOWN;
   const int command = ui::EF_COMMAND_DOWN;
   const int altgr = ui::EF_ALTGR_DOWN;
   const int shift = ui::EF_SHIFT_DOWN;
 
   SendKeyPress(ui::VKEY_T, shift | alt | altgr);
   SendKeyPress(ui::VKEY_H, alt);
   SendKeyPress(ui::VKEY_E, altgr);
@@ skipping 2156 matching lines @@
 
   textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
   ui::AXViewState state_protected;
   textfield_->GetAccessibleState(&state_protected);
   EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, state_protected.role);
   EXPECT_EQ(ASCIIToUTF16("********"), state_protected.value);
   EXPECT_TRUE(state_protected.HasStateFlag(ui::AX_STATE_PROTECTED));
 }
 
 }  // namespace views