MacViews: Merge single-character edits, map (and validate) undo and redo

ui/views/controls/textfield/textfield_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/views/controls/textfield/textfield.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 1051 matching lines @@
   // Drop "ello" after "w".
   const gfx::Point kDropPoint(GetCursorPositionX(7), 0);
   EXPECT_TRUE(textfield_->CanDrop(data));
   ui::DropTargetEvent drop_a(data, kDropPoint, kDropPoint, operations);
   EXPECT_EQ(ui::DragDropTypes::DRAG_MOVE, textfield_->OnDragUpdated(drop_a));
   EXPECT_EQ(ui::DragDropTypes::DRAG_MOVE, textfield_->OnPerformDrop(drop_a));
   EXPECT_STR_EQ("h welloorld", textfield_->text());
   textfield_->OnDragDone();
 
   // Undo/Redo the drag&drop change.
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  bool shift = false;

[msw, 2015/02/19 02:56:21]

nit: I vastly prefer inline true/false to adding |shift| local bools.

[tapted, 2015/02/19 03:19:10]

Done.

+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("hello world", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  shift = true;  // Use Ctrl+Shift+Z for Redo.
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("hello world", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("h welloorld", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("h welloorld", textfield_->text());
 }
 
 TEST_F(TextfieldTest, DragAndDrop_ToTheLeft) {
   InitTextfield();
   textfield_->SetText(ASCIIToUTF16("hello world"));
 
   base::string16 string;
   ui::OSExchangeData data;
   int formats = 0;
@@ skipping 22 matching lines @@
   // Drop " worl" after "h".
   EXPECT_TRUE(textfield_->CanDrop(data));
   gfx::Point drop_point(GetCursorPositionX(1), 0);
   ui::DropTargetEvent drop_a(data, drop_point, drop_point, operations);
   EXPECT_EQ(ui::DragDropTypes::DRAG_MOVE, textfield_->OnDragUpdated(drop_a));
   EXPECT_EQ(ui::DragDropTypes::DRAG_MOVE, textfield_->OnPerformDrop(drop_a));
   EXPECT_STR_EQ("h worlellod", textfield_->text());
   textfield_->OnDragDone();
 
   // Undo/Redo the drag&drop change.
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  bool shift = false;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("hello world", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  shift = true;  // Use Ctrl+Shift+Z for Redo.
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("hello world", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("h worlellod", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("h worlellod", textfield_->text());
 }
 
 TEST_F(TextfieldTest, DragAndDrop_Canceled) {
   InitTextfield();
   textfield_->SetText(ASCIIToUTF16("hello world"));
 
   // Start dragging "worl".
   textfield_->SelectRange(gfx::Range(6, 10));
   gfx::Point point(GetCursorPositionX(8), 0);
@@ skipping 192 matching lines @@
   input_method_->Clear();
   textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
   EXPECT_TRUE(input_method_->text_input_type_changed());
   EXPECT_TRUE(textfield_->GetTextInputClient());
 }
 
 TEST_F(TextfieldTest, UndoRedoTest) {
   InitTextfield();
   SendKeyEvent(ui::VKEY_A);
   EXPECT_STR_EQ("a", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+
+  bool shift = false;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  shift = true;  // Use Ctrl+Shift+Z for Redo.
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("a", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("a", textfield_->text());
+  shift = false;
 
   // AppendText
   textfield_->AppendText(ASCIIToUTF16("b"));
   last_contents_.clear();  // AppendText doesn't call ContentsChanged.
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("a", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  shift = true;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("ab", textfield_->text());
+  shift = false;
 
   // SetText
   SendKeyEvent(ui::VKEY_C);
   // Undo'ing append moves the cursor to the end for now.
   // A no-op SetText won't add a new edit; see TextfieldModel::SetText.
   EXPECT_STR_EQ("abc", textfield_->text());
   textfield_->SetText(ASCIIToUTF16("abc"));
   EXPECT_STR_EQ("abc", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  shift = true;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("abc", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("abc", textfield_->text());
+  shift = false;
+
   textfield_->SetText(ASCIIToUTF16("123"));
   textfield_->SetText(ASCIIToUTF16("123"));
   EXPECT_STR_EQ("123", textfield_->text());
-  SendKeyEvent(ui::VKEY_END, false, false);
-  SendKeyEvent(ui::VKEY_4, false, false);
+  SendKeyEvent(ui::VKEY_END, shift, false);
+  SendKeyEvent(ui::VKEY_4, shift, false);
   EXPECT_STR_EQ("1234", textfield_->text());
   last_contents_.clear();
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("123", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   // the insert edit "c" and set edit "123" are merged to single edit,
   // so text becomes "ab" after undo.
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("a", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  shift = true;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("123", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("1234", textfield_->text());
+  shift = false;
 
   // Undoing to the same text shouldn't call ContentsChanged.
-  SendKeyEvent(ui::VKEY_A, false, true);  // select all
+  SendKeyEvent(ui::VKEY_A, shift, true);  // select all
   SendKeyEvent(ui::VKEY_A);
   EXPECT_STR_EQ("a", textfield_->text());
   SendKeyEvent(ui::VKEY_B);
   SendKeyEvent(ui::VKEY_C);
   EXPECT_STR_EQ("abc", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("1234", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  shift = true;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("abc", textfield_->text());
+  shift = false;
 
   // Delete/Backspace
   SendKeyEvent(ui::VKEY_BACK);
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_HOME);
+  SendHomeEvent(shift);
   SendKeyEvent(ui::VKEY_DELETE);
   EXPECT_STR_EQ("b", textfield_->text());
-  SendKeyEvent(ui::VKEY_A, false, true);
+  SendKeyEvent(ui::VKEY_A, shift, true);
   SendKeyEvent(ui::VKEY_DELETE);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("b", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Z, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("abc", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  shift = true;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("b", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendKeyEvent(ui::VKEY_Z, shift, true);
   EXPECT_STR_EQ("", textfield_->text());
 }
 
+// Most platforms support Ctrl+Y as an alternative to Ctrl+Shift+Z, but on Mac
+// that is bound to "Show full history", so is not mapped as an editing
+// command. So, on Mac, send Cmd+Shift+Z.
+#if defined(OS_MACOSX)

[msw, 2015/02/19 02:56:22]

nit: I'd just put the test in a !OS_MACOSX block instead.

[tapted, 2015/02/19 03:19:10]

Done.

+#define MAYBE_RedoWithCtrlY DISABLED_RedoWithCtrlY
+#else
+#define MAYBE_RedoWithCtrlY RedoWithCtrlY
+#endif
+
+// Test that Ctrl+Y works for Redo, as well as Ctrl+Shift+Z.
+TEST_F(TextfieldTest, MAYBE_RedoWithCtrlY) {
+  InitTextfield();
+  SendKeyEvent(ui::VKEY_A);
+  EXPECT_STR_EQ("a", textfield_->text());
+  bool shift = false;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
+  EXPECT_STR_EQ("", textfield_->text());
+  SendKeyEvent(ui::VKEY_Y, shift, true);
+  EXPECT_STR_EQ("a", textfield_->text());
+  SendKeyEvent(ui::VKEY_Z, shift, true);
+  EXPECT_STR_EQ("", textfield_->text());
+  shift = true;
+  SendKeyEvent(ui::VKEY_Z, shift, true);
+  EXPECT_STR_EQ("a", textfield_->text());
+}
+
 TEST_F(TextfieldTest, CutCopyPaste) {
   InitTextfield();
 
   // Ensure IDS_APP_CUT cuts.
   textfield_->SetText(ASCIIToUTF16("123"));
   textfield_->SelectAll(false);
   EXPECT_TRUE(textfield_->IsCommandIdEnabled(IDS_APP_CUT));
   textfield_->ExecuteCommand(IDS_APP_CUT, 0);
   EXPECT_STR_EQ("123", GetClipboardText(ui::CLIPBOARD_TYPE_COPY_PASTE));
   EXPECT_STR_EQ("", textfield_->text());
@@ skipping 808 matching lines @@
 
   textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
   ui::AXViewState state_protected;
   textfield_->GetAccessibleState(&state_protected);
   EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, state_protected.role);
   EXPECT_EQ(ASCIIToUTF16("********"), state_protected.value);
   EXPECT_TRUE(state_protected.HasStateFlag(ui::AX_STATE_PROTECTED));
 }
 
 }  // namespace views