InputMethod should stop TextInputClient::InsertChar/InsertText calls when the event is stopped prop…

ui/base/ime/input_method_chromeos_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/base/ime/input_method_chromeos.h"
 
 #include <X11/Xlib.h>
 #undef Bool
 #undef FocusIn
 #undef FocusOut
@@ skipping 180 matching lines @@
   const uint32 expected_anchor_position_;
 
   DISALLOW_COPY_AND_ASSIGN(SetSurroundingTextVerifier);
 };
 
 class InputMethodChromeOSTest : public internal::InputMethodDelegate,
                                 public testing::Test,
                                 public DummyTextInputClient {
  public:
   InputMethodChromeOSTest()
-      : dispatched_key_event_(ui::ET_UNKNOWN, ui::VKEY_UNKNOWN, ui::EF_NONE) {
+      : dispatched_key_event_(ui::ET_UNKNOWN, ui::VKEY_UNKNOWN, ui::EF_NONE),
+        stop_propagation_post_ime(false) {
     ResetFlags();
   }
 
   ~InputMethodChromeOSTest() override {}
 
   void SetUp() override {
     chromeos::IMEBridge::Initialize();
 
     mock_ime_engine_handler_.reset(
         new chromeos::MockIMEEngineHandler());
@@ skipping 18 matching lines @@
     mock_ime_engine_handler_.reset();
     mock_ime_candidate_window_handler_.reset();
     chromeos::IMEBridge::Shutdown();
 
     ResetFlags();
   }
 
   // Overridden from ui::internal::InputMethodDelegate:
   bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override {
     dispatched_key_event_ = event;
-    return false;
+    return stop_propagation_post_ime;
   }
 
   // Overridden from ui::TextInputClient:
   void SetCompositionText(const CompositionText& composition) override {
     composition_text_ = composition;
   }
   void ConfirmCompositionText() override {
     confirmed_text_ = composition_text_;
     composition_text_.Clear();
   }
@@ skipping 71 matching lines @@
   bool can_compose_inline_;
   gfx::Rect caret_bounds_;
   gfx::Range text_range_;
   gfx::Range selection_range_;
   base::string16 surrounding_text_;
 
   scoped_ptr<chromeos::MockIMEEngineHandler> mock_ime_engine_handler_;
   scoped_ptr<chromeos::MockIMECandidateWindowHandler>
       mock_ime_candidate_window_handler_;
 
+  bool stop_propagation_post_ime;

[yukawa, 2015/06/26 06:30:23]

nit: bool stop_propagation_post_ime_;

[Shu Chen, 2015/06/26 06:37:41]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(InputMethodChromeOSTest);
 };
 
 // Tests public APIs in ui::InputMethod first.
 
 TEST_F(InputMethodChromeOSTest, GetInputLocale) {
   // ui::InputMethodChromeOS does not support the API.
   ime_->OnFocus();
   EXPECT_EQ("", ime_->GetInputLocale());
 }
@@ skipping 632 matching lines @@
   // Check the results for second key event.
   EXPECT_EQ(2, ime_->process_key_event_post_ime_call_count());
   stored_event = ime_->process_key_event_post_ime_args().event;
   EXPECT_EQ(ui::VKEY_C, stored_event->key_code());
   EXPECT_EQ(kFlags, stored_event->flags());
   EXPECT_FALSE(ime_->process_key_event_post_ime_args().handled);
 
   EXPECT_EQ(L'C', inserted_char_);
 }
 
-// TODO(nona): Introduce ProcessKeyEventPostIME tests(crbug.com/156593).
+TEST_F(InputMethodChromeOSKeyEventTest, StopPropagationTest) {
+  // Preparation
+  input_type_ = TEXT_INPUT_TYPE_TEXT;
+  ime_->OnTextInputTypeChanged(this);
+
+  // Do key event with event being stopped propagation.
+  stop_propagation_post_ime = true;
+  ui::KeyEvent eventA(ui::ET_KEY_PRESSED, ui::VKEY_A, EF_NONE);
+  eventA.set_character(L'A');
+  ime_->DispatchKeyEvent(eventA);
+  mock_ime_engine_handler_->last_passed_callback().Run(false);
+
+  const ui::KeyEvent* key_event =
+      mock_ime_engine_handler_->last_processed_key_event();
+  EXPECT_EQ(ui::VKEY_A, key_event->key_code());
+  EXPECT_EQ(0, inserted_char_);
+
+  // Do key event with event not being stopped propagation.
+  stop_propagation_post_ime = false;
+  ime_->DispatchKeyEvent(eventA);
+  mock_ime_engine_handler_->last_passed_callback().Run(false);
+
+  key_event = mock_ime_engine_handler_->last_processed_key_event();
+  EXPECT_EQ(ui::VKEY_A, key_event->key_code());
+  EXPECT_EQ(L'A', inserted_char_);
+}
 
 }  // namespace ui