views::Textfield: Implement yank editing command.

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 95 matching lines @@
   @"moveToRightEndOfLineAndModifySelection:"
 ];
 
 NSArray* const kDeleteActions = @[
   @"deleteForward:", @"deleteBackward:", @"deleteWordForward:",
   @"deleteWordBackward:", @"deleteToBeginningOfLine:", @"deleteToEndOfLine:",
   @"deleteToBeginningOfParagraph:", @"deleteToEndOfParagraph:"
 ];
 
 NSArray* const kMiscActions =
-    @[ @"insertText:", @"cancelOperation:", @"transpose:" ];
+    @[ @"insertText:", @"cancelOperation:", @"transpose:", @"yank:" ];
 
 // Empty range shortcut for readibility.
 NSRange EmptyRange() {
   return NSMakeRange(NSNotFound, 0);
 }
 
 // Sets |composition_text| as the composition text with caret placed at
 // |caret_pos| and updates |caret_range|.
 void SetCompositionText(ui::TextInputClient* client,
                         const base::string16& composition_text,
@@ skipping 349 matching lines @@
   EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Make a selection as- " bar |baz|".
   SetSelectionRange(NSMakeRange(5, 3));
   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(5, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
+
+  // Verify yanking inserts the deleted text.
+  PerformCommand(@selector(yank:));
+  EXPECT_NSEQ_3(@" bar baz", GetExpectedText(), GetActualText());
+  EXPECT_EQ_RANGE_3(NSMakeRange(8, 0), GetExpectedSelectionRange(),
+                    GetActualSelectionRange());
 }
 
 void BridgedNativeWidgetTest::TestDeleteEnd(SEL sel) {
   InstallTextField("foo bar baz");
   EXPECT_EQ_RANGE_3(NSMakeRange(11, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Caret is at the end of the line. Verify no deletion takes place.
   PerformCommand(sel);
   EXPECT_NSEQ_3(@"foo bar baz", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(11, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Move the caret as- "foo bar| baz".
   SetSelectionRange(NSMakeRange(7, 0));
   PerformCommand(sel);
   // Verify state is "foo bar|".
   EXPECT_NSEQ_3(@"foo bar", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(7, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // 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());
+
+  // Verify yanking inserts the deleted text.
+  PerformCommand(@selector(yank:));
+  EXPECT_NSEQ_3(@"foo bar", GetExpectedText(), GetActualText());
+  EXPECT_EQ_RANGE_3(NSMakeRange(4, 0), GetExpectedSelectionRange(),
+                    GetActualSelectionRange());
 }
 
 void BridgedNativeWidgetTest::TestEditingCommands(NSArray* selectors) {
   const base::string16 test_strings[] = {
       base::WideToUTF16(L"ab c"),
       base::WideToUTF16(L"\x0634\x0632 \x064A")  // RTL string.
   };
 
   for (const base::string16& test_string : test_strings) {
     for (NSString* selector_string in selectors) {
@@ skipping 366 matching lines @@
   InstallTextField("a");
   EXPECT_EQ_RANGE_3(NSMakeRange(1, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Delete one character.
   PerformCommand(@selector(deleteBackward:));
   EXPECT_NSEQ_3(nil, GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
+  // Verify that deletion did not modify the kill buffer.
+  PerformCommand(@selector(yank:));
+  EXPECT_NSEQ_3(nil, GetExpectedText(), GetActualText());

[tapted, 2016/07/06 01:46:37]

I think this will be flaky depending on the order that the tests are run --
global state isn't cleared out, so if a test that puts something in the kill
buffer runs first, then yanking here could paste it. Same below.

[karandeepb, 2016/07/19 07:04:40]

Using ViewsDelegate for storing yanked text should clear the global state.

+  EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
+                    GetActualSelectionRange());
+
   // Try to delete again on an empty string.
   PerformCommand(@selector(deleteBackward:));
   EXPECT_NSEQ_3(nil, GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 }
 
 // Test forward delete using text input protocol.
 TEST_F(BridgedNativeWidgetTest, TextInput_DeleteForward) {
   InstallTextField("a");
   EXPECT_EQ_RANGE_3(NSMakeRange(1, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // At the end of the string, can't delete forward.
   PerformCommand(@selector(deleteForward:));
   EXPECT_NSEQ_3(@"a", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(1, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Should succeed after moving left first.
   PerformCommand(@selector(moveLeft:));
   PerformCommand(@selector(deleteForward:));
   EXPECT_NSEQ_3(nil, GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
+
+  // Verify that deletion did not modify the kill buffer.
+  PerformCommand(@selector(yank:));
+  EXPECT_NSEQ_3(nil, GetExpectedText(), GetActualText());
+  EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
+                    GetActualSelectionRange());
 }
 
 // Test forward word deletion using text input protocol.
 TEST_F(BridgedNativeWidgetTest, TextInput_DeleteWordForward) {
   InstallTextField("foo bar baz");
   EXPECT_EQ_RANGE_3(NSMakeRange(11, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Caret is at the end of the line. Verify no deletion takes place.
   PerformCommand(@selector(deleteWordForward:));
   EXPECT_NSEQ_3(@"foo bar baz", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(11, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Move the caret as- "foo b|ar baz".
   SetSelectionRange(NSMakeRange(5, 0));
   PerformCommand(@selector(deleteWordForward:));
   // Verify state is "foo b| baz"
   EXPECT_NSEQ_3(@"foo b baz", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(5, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Make a selection as- "|fo|o b baz".
   SetSelectionRange(NSMakeRange(0, 2));
   PerformCommand(@selector(deleteWordForward:));
   // Verify only the selection is deleted and state is "|o b baz".
   EXPECT_NSEQ_3(@"o b baz", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
+
+  // Verify that deletion did not modify the kill buffer.
+  PerformCommand(@selector(yank:));
+  EXPECT_NSEQ_3(@"o b baz", GetExpectedText(), GetActualText());
+  EXPECT_EQ_RANGE_3(NSMakeRange(0, 0), GetExpectedSelectionRange(),
+                    GetActualSelectionRange());
 }
 
 // Test backward word deletion using text input protocol.
 TEST_F(BridgedNativeWidgetTest, TextInput_DeleteWordBackward) {
   InstallTextField("foo bar baz");
   EXPECT_EQ_RANGE_3(NSMakeRange(11, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Move the caret to the beginning of the line.
   SetSelectionRange(NSMakeRange(0, 0));
@@ skipping 11 matching lines @@
   EXPECT_EQ_RANGE_3(NSMakeRange(4, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
 
   // Make a selection as- "f|oo r b|az".
   SetSelectionRange(NSMakeRange(1, 6));
   PerformCommand(@selector(deleteWordBackward:));
   // Verify only the selection is deleted and state is "f|az"
   EXPECT_NSEQ_3(@"faz", GetExpectedText(), GetActualText());
   EXPECT_EQ_RANGE_3(NSMakeRange(1, 0), GetExpectedSelectionRange(),
                     GetActualSelectionRange());
+
+  // Verify that deletion did not modify the kill buffer.
+  PerformCommand(@selector(yank:));
+  EXPECT_NSEQ_3(@"faz", GetExpectedText(), GetActualText());
+  EXPECT_EQ_RANGE_3(NSMakeRange(1, 0), GetExpectedSelectionRange(),
+                    GetActualSelectionRange());
 }
 
 // Test deleting to beginning/end of line/paragraph using text input protocol.
 
 TEST_F(BridgedNativeWidgetTest, TextInput_DeleteToBeginningOfLine) {
   TestDeleteBeginning(@selector(deleteToBeginningOfLine:));
 }
 
 TEST_F(BridgedNativeWidgetTest, TextInput_DeleteToEndOfLine) {
   TestDeleteEnd(@selector(deleteToEndOfLine:));
@@ skipping 201 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