MacViews: Correct behavior of move and select commands when selection direction changes.

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>
 
@@ skipping 243 matching lines @@
   // 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
   // either deleteToEndOfLine: or deleteToEndOfParagraph:.
   void TestDeleteEnd(SEL sel);
 
   // Test editing commands in |selectors| against the expectations set by
   // |dummy_text_view_|. This is done by selecting every substring within a set
-  // of test strings (both RTL and non-RTL) and performing every selector on
-  // both the NSTextView and the BridgedContentView hosting a focused
-  // views::TextField to ensure the resulting text and selection ranges match.
-  // |selectors| is an NSArray of NSStrings.
-  void TestEditingCommands(NSArray* selectors);
+  // of test strings and performing every selector on both the NSTextView and
+  // the BridgedContentView hosting a focused views::TextField to ensure the
+  // resulting text and selection ranges match. |selectors| is an NSArray of
+  // NSStrings. If |test_rtl| is false, no RTL test string is used for testing.
+  void TestEditingCommands(NSArray* selectors, bool test_rtl);
 
   std::unique_ptr<views::View> view_;
 
   // Weak. Owned by bridge().
   BridgedContentView* ns_view_;
 
   // An NSTextView which helps set the expectations for our tests.
   base::scoped_nsobject<NSTextView> dummy_text_view_;
 
   base::MessageLoopForUI message_loop_;
@@ skipping 167 matching lines @@
 
   // Make a selection as- "|foo |bar".
   SetSelectionRange(NSMakeRange(0, 4));
   PerformCommand(sel);
   // Verify only the selection is deleted so that the state is "|bar".
   EXPECT_NSEQ_3(@"bar", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 }
 
-void BridgedNativeWidgetTest::TestEditingCommands(NSArray* selectors) {
-  const base::string16 test_strings[] = {
+void BridgedNativeWidgetTest::TestEditingCommands(NSArray* selectors,
+                                                  bool test_rtl) {
+  std::vector<base::string16> test_strings = {
       base::WideToUTF16(L"ab c"),
-      base::WideToUTF16(L"\x0634\x0632 \x064A")  // RTL string.
   };
 
+  if (test_rtl)
+    test_strings.push_back(base::WideToUTF16(L"\x0634\x0632 \x064A"));
+
   for (const base::string16& test_string : test_strings) {
     for (NSString* selector_string in selectors) {
       SEL sel = NSSelectorFromString(selector_string);
       const int len = test_string.length();
       for (int i = 0; i <= len; i++) {
         for (int j = 0; j <= len; j++) {
           SCOPED_TRACE(base::StringPrintf(
               "Testing range [%d-%d] for case %s and selector %s\n", i, j,
               base::UTF16ToUTF8(test_string).c_str(),
               base::SysNSStringToUTF8(selector_string).c_str()));
@@ skipping 487 matching lines @@
     @"moveToEndOfParagraph:",
     @"moveToEndOfDocument:",
     @"moveToBeginningOfDocument:",
     @"pageDown:",
     @"pageUp:",
     @"moveWordRight:",
     @"moveWordLeft:",
     @"moveToLeftEndOfLine:",
     @"moveToRightEndOfLine:"
   ];
-  TestEditingCommands(selectors);
+  TestEditingCommands(selectors, true);
 }
 
-// Todo(karandeepb): Enable this test once the behavior of all move and select
-// commands are fixed.
 // Test move and select commands against expectations set by |dummy_text_view_|.
-TEST_F(BridgedNativeWidgetTest,
-       TextInput_MoveAndSelectEditingCommands_DISABLED) {
+TEST_F(BridgedNativeWidgetTest, TextInput_MoveAndSelectEditingCommands_1) {
   NSArray* selectors = @[
     @"moveBackwardAndModifySelection:",
     @"moveForwardAndModifySelection:",
     @"moveWordForwardAndModifySelection:",
     @"moveWordBackwardAndModifySelection:",
     @"moveUpAndModifySelection:",
     @"moveDownAndModifySelection:",
     @"moveToBeginningOfLineAndModifySelection:",
     @"moveToEndOfLineAndModifySelection:",
     @"moveToBeginningOfParagraphAndModifySelection:",
     @"moveToEndOfParagraphAndModifySelection:",
     @"moveToEndOfDocumentAndModifySelection:",
     @"moveToBeginningOfDocumentAndModifySelection:",
     @"pageDownAndModifySelection:",
     @"pageUpAndModifySelection:",
     @"moveParagraphForwardAndModifySelection:",
     @"moveParagraphBackwardAndModifySelection:",
-    @"moveRightAndModifySelection:",
-    @"moveLeftAndModifySelection:",
-    @"moveWordRightAndModifySelection:",
-    @"moveWordLeftAndModifySelection:",
+  ];
+  TestEditingCommands(selectors, true);
+}
+
+// Test move and select commands against expectations set by |dummy_text_view_|.
+TEST_F(BridgedNativeWidgetTest, TextInput_MoveAndSelectEditingCommands_2) {
+  NSArray* selectors = @[
+    @"moveRightAndModifySelection:", @"moveLeftAndModifySelection:",
+    @"moveWordRightAndModifySelection:", @"moveWordLeftAndModifySelection:",
     @"moveToLeftEndOfLineAndModifySelection:",
     @"moveToRightEndOfLineAndModifySelection:"
   ];
-  TestEditingCommands(selectors);
+
+  // The behavior of move and select commands with visual direction on
+  // NSTextView is a bit buggy for RTL text and is not consistent with LTR
+  // behavior  Hence don't test RTL string.
+  TestEditingCommands(selectors, false);
 }
 
 // Test delete commands against expectations set by |dummy_text_view_|.
 TEST_F(BridgedNativeWidgetTest, TextInput_DeleteCommands) {
   NSArray* selectors = @[
     @"deleteForward:", @"deleteBackward:", @"deleteWordForward:",
     @"deleteWordBackward:", @"deleteToBeginningOfLine:", @"deleteToEndOfLine:",
     @"deleteToBeginningOfParagraph:", @"deleteToEndOfParagraph:"
   ];
-  TestEditingCommands(selectors);
+  TestEditingCommands(selectors, true);
 }
 
 // Test firstRectForCharacterRange:actualRange for cases where query range is
 // empty or outside composition range.
 TEST_F(BridgedNativeWidgetTest, TextInput_FirstRectForCharacterRange_Caret) {
   InstallTextField("");
   ui::TextInputClient* client = [ns_view_ textInputClient];
 
   // No composition. Ensure bounds and range corresponding to the current caret
   // position are returned.
@@ skipping 146 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