MacViews: Change insertTextInternal to correctly handle IME character input.

ui/views/cocoa/bridged_native_widget_unittest.mm

 // 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.
 
 #import "ui/views/cocoa/bridged_native_widget.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 
 #import "base/mac/foundation_util.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "testing/gtest_mac.h"
 #import "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/ime/input_method.h"
+#include "ui/events/test/cocoa_test_event_utils.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #import "ui/gfx/test/ui_cocoa_test_helper.h"
 #import "ui/views/cocoa/bridged_content_view.h"
 #import "ui/views/cocoa/native_widget_mac_nswindow.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/native_widget_mac.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 265 matching lines @@
   void SetSelectionRange(NSRange range);
 
   // Perform command |sel| on |ns_view_| and |dummy_text_view_|.
   void PerformCommand(SEL sel);
 
   // Make selection from |start| to |end| on installed views::Textfield and
   // |dummy_text_view_|. If |start| > |end|, extend selection to left from
   // |start|.
   void MakeSelection(int start, int end);
 
+  // Helper method to set the private |keyDownEvent_| field on |ns_view_|.
+  void SetKeyDownEvent(NSEvent* event);
+
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
  protected:
   // Test delete to beginning of line or paragraph based on |sel|. |sel| can be
   // either deleteToBeginningOfLine: or deleteToBeginningOfParagraph:.
   void TestDeleteBeginning(SEL sel);
 
   // Test delete to end of line or paragraph based on |sel|. |sel| can be
@@ skipping 102 matching lines @@
   //|start| to |end|.
   [dummy_text_view_ setSelectedRange:NSMakeRange(start, 0)];
   SEL sel = start > end ? @selector(moveBackwardAndModifySelection:)
                         : @selector(moveForwardAndModifySelection:);
   size_t delta = std::abs(end - start);
 
   for (size_t i = 0; i < delta; i++)
     [dummy_text_view_ doCommandBySelector:sel];
 }
 
+void BridgedNativeWidgetTest::SetKeyDownEvent(NSEvent* event) {
+  [ns_view_ setValue:event forKey:@"keyDownEvent_"];
+}
+
 void BridgedNativeWidgetTest::SetUp() {
   BridgedNativeWidgetTestBase::SetUp();
 
   view_.reset(new views::internal::RootView(widget_.get()));
   base::scoped_nsobject<NSWindow> window([test_window() retain]);
 
   // BridgedNativeWidget expects to be initialized with a hidden (deferred)
   // window.
   [window orderOut:nil];
   EXPECT_FALSE([window delegate]);
@@ skipping 422 matching lines @@
   EXPECT_NSEQ_3(@"foo bar", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange([GetActualText() length], 0),
                     GetExpectedSelectionRange(), GetActualSelectionRange());
 }
 
 // Test IME composition for accented characters.
 TEST_F(BridgedNativeWidgetTest, TextInput_AccentedCharacter) {
   InstallTextField("abc");
 
   // Simulate action messages generated when the key 'a' is pressed repeatedly
-  // and leads to the showing of an IME candidate window.
+  // and leads to the showing of an IME candidate window. To simulate an event,
+  // set the private keyDownEvent field on the BridgedContentView.
 
   // First an insertText: message with key 'a' is generated.
+  SetKeyDownEvent(cocoa_test_event_utils::SynthesizeKeyEvent(
+      widget_->GetNativeWindow(), true, ui::VKEY_A, 0));
   [ns_view_ insertText:@"a" replacementRange:EmptyRange()];
   [dummy_text_view_ insertText:@"a" replacementRange:EmptyRange()];
   EXPECT_EQ_3(NO, [dummy_text_view_ hasMarkedText], [ns_view_ hasMarkedText]);
   EXPECT_NSEQ_3(@"abca", GetExpectedText(), GetActualText());
 
   // Next the IME popup appears. On selecting the accented character using arrow
   // keys, setMarkedText action message is generated which replaces the earlier
   // inserted 'a'.
+  SetKeyDownEvent(cocoa_test_event_utils::SynthesizeKeyEvent(
+      widget_->GetNativeWindow(), true, ui::VKEY_RIGHT, 0));
   [ns_view_ setMarkedText:@"à"
             selectedRange:NSMakeRange(0, 1)
          replacementRange:NSMakeRange(3, 1)];
   [dummy_text_view_ setMarkedText:@"à"
                     selectedRange:NSMakeRange(0, 1)
                  replacementRange:NSMakeRange(3, 1)];
   EXPECT_EQ_3(YES, [dummy_text_view_ hasMarkedText], [ns_view_ hasMarkedText]);
   EXPECT_EQ_RANGE_3(NSMakeRange(3, 1), [dummy_text_view_ markedRange],
                     [ns_view_ markedRange]);
   EXPECT_EQ_RANGE_3(NSMakeRange(3, 1), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
   EXPECT_NSEQ_3(@"abcà", GetExpectedText(), GetActualText());
+
+  // On pressing enter, the marked text is confirmed.
+  SetKeyDownEvent(cocoa_test_event_utils::SynthesizeKeyEvent(
+      widget_->GetNativeWindow(), true, ui::VKEY_RETURN, 0));
+  [ns_view_ insertText:@"à" replacementRange:EmptyRange()];
+  [dummy_text_view_ insertText:@"à" replacementRange:EmptyRange()];
+  EXPECT_EQ_3(NO, [dummy_text_view_ hasMarkedText], [ns_view_ hasMarkedText]);
+  EXPECT_EQ_RANGE_3(NSMakeRange(4, 0), GetExpectedSelectionRange(),
+                    GetActualSelectionRange());
+  EXPECT_NSEQ_3(@"abcà", GetExpectedText(), GetActualText());
 }
 
 // Test moving the caret left and right using text input protocol.
 TEST_F(BridgedNativeWidgetTest, TextInput_MoveLeftRight) {
   InstallTextField("foo");
   EXPECT_EQ_RANGE_3(NSMakeRange(3, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Move right not allowed, out of range.
   PerformCommand(@selector(moveRight:));
@@ skipping 322 matching lines @@
   [center postNotificationName:NSWindowDidExitFullScreenNotification
                         object:window];
   EXPECT_EQ(1, [window ignoredToggleFullScreenCount]);  // No change.
   EXPECT_FALSE(bridge()->target_fullscreen_state());
 
   widget_->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views