MacViews: Correctly handle character events when there's an active TextInputClient.

ui/views/controls/combobox/combobox_unittest.cc

 // Copyright 2013 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/combobox/combobox.h"
 
 #include <set>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/test/combobox_test_api.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using base::ASCIIToUTF16;
 
 namespace views {
 
 using test::ComboboxTestApi;
@@ skipping 168 matching lines @@
     if (separators)
       model_->SetSeparators(*separators);
 
     ASSERT_FALSE(combobox_);
     combobox_ = new TestCombobox(model_.get(), style);
     test_api_.reset(new ComboboxTestApi(combobox_));
     test_api_->InstallTestMenuRunner(&menu_show_count_);
     combobox_->set_id(1);
 
     widget_ = new Widget;
-    Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
+    Widget::InitParams params =
+        CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);

[karandeepb, 2017/01/11 08:16:20]

Did not look into it, but tests fail with the EventGenerator on using TYPE_POPUP
window on non-Mac platforms.

[tapted, 2017/01/11 14:54:20]

I think popups have can_activate = false by default during Widget::Init

[karandeepb, 2017/01/13 03:13:38]

Acknowledged.

     params.bounds = gfx::Rect(200, 200, 200, 200);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(combobox_);
     widget_->Show();
 
     combobox_->RequestFocus();
     combobox_->SizeToPreferredSize();
+
+    event_generator_.reset(

[tapted, 2017/01/11 14:54:20]

event_generator_ = base::MakeUnique<..EventGenerator>(..GetNativeWindow());  (
https://groups.google.com/a/chromium.org/d/msg/chromium-dev/iQgMedVA8-k/d5FFq...
)

[karandeepb, 2017/01/13 03:13:38]

Done.

+        new ui::test::EventGenerator(widget_->GetNativeWindow()));
+    event_generator_->set_target(ui::test::EventGenerator::Target::WINDOW);
   }
 
  protected:
-  void SendKeyEvent(ui::KeyboardCode key_code) {
-    SendKeyEventWithType(key_code, ui::ET_KEY_PRESSED);
+  void PressKey(ui::KeyboardCode key_code) {
+    event_generator_->PressKey(key_code, ui::EF_NONE);
   }
 
-  void SendKeyEventWithType(ui::KeyboardCode key_code, ui::EventType type) {
-    ui::KeyEvent event(type, key_code, ui::EF_NONE);
-    FocusManager* focus_manager = widget_->GetFocusManager();
-    widget_->OnKeyEvent(&event);
-    if (!event.handled() && focus_manager)
-      focus_manager->OnKeyEvent(event);
+  void ReleaseKey(ui::KeyboardCode key_code) {
+    event_generator_->ReleaseKey(key_code, ui::EF_NONE);
   }
 
   View* GetFocusedView() {
     return widget_->GetFocusManager()->GetFocusedView();
   }
 
   void PerformMousePress(const gfx::Point& point) {
     ui::MouseEvent pressed_event = ui::MouseEvent(
         ui::ET_MOUSE_PRESSED, point, point, ui::EventTimeForNow(),
         ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
@@ skipping 20 matching lines @@
   // |combobox_| will be allocated InitCombobox() and then owned by |widget_|.
   TestCombobox* combobox_;
   std::unique_ptr<ComboboxTestApi> test_api_;
 
   // Combobox does not take ownership of the model, hence it needs to be scoped.
   std::unique_ptr<TestComboboxModel> model_;
 
   // The current menu show count.
   int menu_show_count_;
 
+  std::unique_ptr<ui::test::EventGenerator> event_generator_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ComboboxTest);
 };
 
 TEST_F(ComboboxTest, KeyTest) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
-  SendKeyEvent(ui::VKEY_END);
+  PressKey(ui::VKEY_END);
   EXPECT_EQ(combobox_->selected_index() + 1, model_->GetItemCount());
-  SendKeyEvent(ui::VKEY_HOME);
+  PressKey(ui::VKEY_HOME);
   EXPECT_EQ(combobox_->selected_index(), 0);
-  SendKeyEvent(ui::VKEY_DOWN);
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(combobox_->selected_index(), 2);
-  SendKeyEvent(ui::VKEY_RIGHT);
+  PressKey(ui::VKEY_RIGHT);
   EXPECT_EQ(combobox_->selected_index(), 2);
-  SendKeyEvent(ui::VKEY_LEFT);
+  PressKey(ui::VKEY_LEFT);
   EXPECT_EQ(combobox_->selected_index(), 2);
-  SendKeyEvent(ui::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(combobox_->selected_index(), 1);
-  SendKeyEvent(ui::VKEY_PRIOR);
+  PressKey(ui::VKEY_PRIOR);
   EXPECT_EQ(combobox_->selected_index(), 0);
-  SendKeyEvent(ui::VKEY_NEXT);
+  PressKey(ui::VKEY_NEXT);
   EXPECT_EQ(combobox_->selected_index(), model_->GetItemCount() - 1);
 }
 
 // Check that if a combobox is disabled before it has a native wrapper, then the
 // native wrapper inherits the disabled state when it gets created.
 TEST_F(ComboboxTest, DisabilityTest) {
   model_.reset(new TestComboboxModel());
 
   ASSERT_FALSE(combobox_);
   combobox_ = new TestCombobox(model_.get(), Combobox::STYLE_NORMAL);
   combobox_->SetEnabled(false);
 
   widget_ = new Widget;
-  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
+  Widget::InitParams params =
+      CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.bounds = gfx::Rect(100, 100, 100, 100);
   widget_->Init(params);
   View* container = new View();
   widget_->SetContentsView(container);
   container->AddChildView(combobox_);
   EXPECT_FALSE(combobox_->enabled());
 }
 
 // Verifies that we don't select a separator line in combobox when navigating
 // through keyboard.
 TEST_F(ComboboxTest, SkipSeparatorSimple) {
   std::set<int> separators;
   separators.insert(2);
   InitCombobox(&separators, Combobox::STYLE_NORMAL);
   EXPECT_EQ(0, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(1, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(3, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(1, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_HOME);
+  PressKey(ui::VKEY_HOME);
   EXPECT_EQ(0, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_PRIOR);
+  PressKey(ui::VKEY_PRIOR);
   EXPECT_EQ(0, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_END);
+  PressKey(ui::VKEY_END);
   EXPECT_EQ(9, combobox_->selected_index());
 }
 
 // Verifies that we never select the separator that is in the beginning of the
 // combobox list when navigating through keyboard.
 TEST_F(ComboboxTest, SkipSeparatorBeginning) {
   std::set<int> separators;
   separators.insert(0);
   InitCombobox(&separators, Combobox::STYLE_NORMAL);
   EXPECT_EQ(1, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(2, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(3, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(2, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_HOME);
+  PressKey(ui::VKEY_HOME);
   EXPECT_EQ(1, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_PRIOR);
+  PressKey(ui::VKEY_PRIOR);
   EXPECT_EQ(1, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_END);
+  PressKey(ui::VKEY_END);
   EXPECT_EQ(9, combobox_->selected_index());
 }
 
 // Verifies that we never select the separator that is in the end of the
 // combobox list when navigating through keyboard.
 TEST_F(ComboboxTest, SkipSeparatorEnd) {
   std::set<int> separators;
   separators.insert(TestComboboxModel::kItemCount - 1);
   InitCombobox(&separators, Combobox::STYLE_NORMAL);
   combobox_->SetSelectedIndex(8);
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(8, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(7, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_END);
+  PressKey(ui::VKEY_END);
   EXPECT_EQ(8, combobox_->selected_index());
 }
 
 // Verifies that we never select any of the adjacent separators (multiple
 // consecutive) that appear in the beginning of the combobox list when
 // navigating through keyboard.
 TEST_F(ComboboxTest, SkipMultipleSeparatorsAtBeginning) {
   std::set<int> separators;
   separators.insert(0);
   separators.insert(1);
   separators.insert(2);
   InitCombobox(&separators, Combobox::STYLE_NORMAL);
   EXPECT_EQ(3, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(4, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(3, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_NEXT);
+  PressKey(ui::VKEY_NEXT);
   EXPECT_EQ(9, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_HOME);
+  PressKey(ui::VKEY_HOME);
   EXPECT_EQ(3, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_END);
+  PressKey(ui::VKEY_END);
   EXPECT_EQ(9, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_PRIOR);
+  PressKey(ui::VKEY_PRIOR);
   EXPECT_EQ(3, combobox_->selected_index());
 }
 
 // Verifies that we never select any of the adjacent separators (multiple
 // consecutive) that appear in the middle of the combobox list when navigating
 // through keyboard.
 TEST_F(ComboboxTest, SkipMultipleAdjacentSeparatorsAtMiddle) {
   std::set<int> separators;
   separators.insert(4);
   separators.insert(5);
   separators.insert(6);
   InitCombobox(&separators, Combobox::STYLE_NORMAL);
   combobox_->SetSelectedIndex(3);
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(7, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(3, combobox_->selected_index());
 }
 
 // Verifies that we never select any of the adjacent separators (multiple
 // consecutive) that appear in the end of the combobox list when navigating
 // through keyboard.
 TEST_F(ComboboxTest, SkipMultipleSeparatorsAtEnd) {
   std::set<int> separators;
   separators.insert(7);
   separators.insert(8);
   separators.insert(9);
   InitCombobox(&separators, Combobox::STYLE_NORMAL);
   combobox_->SetSelectedIndex(6);
-  SendKeyEvent(ui::VKEY_DOWN);
+  PressKey(ui::VKEY_DOWN);
   EXPECT_EQ(6, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_UP);
+  PressKey(ui::VKEY_UP);
   EXPECT_EQ(5, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_HOME);
+  PressKey(ui::VKEY_HOME);
   EXPECT_EQ(0, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_NEXT);
+  PressKey(ui::VKEY_NEXT);
   EXPECT_EQ(6, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_PRIOR);
+  PressKey(ui::VKEY_PRIOR);
   EXPECT_EQ(0, combobox_->selected_index());
-  SendKeyEvent(ui::VKEY_END);
+  PressKey(ui::VKEY_END);
   EXPECT_EQ(6, combobox_->selected_index());
 }
 
 TEST_F(ComboboxTest, GetTextForRowTest) {
   std::set<int> separators;
   separators.insert(0);
   separators.insert(1);
   separators.insert(9);
   InitCombobox(&separators, Combobox::STYLE_NORMAL);
   for (int i = 0; i < combobox_->GetRowCount(); ++i) {
@@ skipping 91 matching lines @@
   EXPECT_EQ(0, menu_show_count());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithReturnKey) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
   // With STYLE_NORMAL, the click event is ignored. Instead the menu is shown.
-  SendKeyEvent(ui::VKEY_RETURN);
+  PressKey(ui::VKEY_RETURN);
   EXPECT_EQ(1, menu_show_count());
   EXPECT_FALSE(listener.on_perform_action_called());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithReturnKeyActionStyle) {
   InitCombobox(nullptr, Combobox::STYLE_ACTION);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
   // With STYLE_ACTION, the click event is notified and the menu is not shown.
-  SendKeyEvent(ui::VKEY_RETURN);
+  PressKey(ui::VKEY_RETURN);
   EXPECT_EQ(0, menu_show_count());
   EXPECT_TRUE(listener.on_perform_action_called());
   EXPECT_EQ(0, listener.perform_action_index());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithSpaceKey) {
   InitCombobox(nullptr, Combobox::STYLE_NORMAL);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
   // With STYLE_NORMAL, the click event is ignored. Instead the menu is shwon.
-  SendKeyEvent(ui::VKEY_SPACE);
+  PressKey(ui::VKEY_SPACE);
   EXPECT_EQ(1, menu_show_count());
   EXPECT_FALSE(listener.on_perform_action_called());
 
-  SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
+  ReleaseKey(ui::VKEY_SPACE);
   EXPECT_EQ(1, menu_show_count());
   EXPECT_FALSE(listener.on_perform_action_called());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithSpaceKeyActionStyle) {
   InitCombobox(nullptr, Combobox::STYLE_ACTION);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
   // With STYLE_ACTION, the click event is notified after releasing and the menu
   // is not shown.
-  SendKeyEvent(ui::VKEY_SPACE);
+  PressKey(ui::VKEY_SPACE);
   EXPECT_EQ(0, menu_show_count());
   EXPECT_FALSE(listener.on_perform_action_called());
 
-  SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
+  ReleaseKey(ui::VKEY_SPACE);
   EXPECT_EQ(0, menu_show_count());
   EXPECT_TRUE(listener.on_perform_action_called());
   EXPECT_EQ(0, listener.perform_action_index());
 }
 
 TEST_F(ComboboxTest, NotifyOnClickWithMouse) {
   InitCombobox(nullptr, Combobox::STYLE_ACTION);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
@@ skipping 224 matching lines @@
   EXPECT_EQ(ui::MenuModel::TYPE_COMMAND, menu_model->GetTypeAt(0));
   EXPECT_EQ(ui::MenuModel::TYPE_COMMAND, menu_model->GetTypeAt(1));
 
   EXPECT_EQ(ASCIIToUTF16("PEANUT BUTTER"), menu_model->GetLabelAt(0));
   EXPECT_EQ(ASCIIToUTF16("JELLY"), menu_model->GetLabelAt(1));
   EXPECT_FALSE(menu_model->IsVisibleAt(0));
   EXPECT_TRUE(menu_model->IsVisibleAt(1));
 }
 
 }  // namespace views