Reintroduce password support to NativeTextfieldViews

ui/views/controls/textfield/textfield_views_model_unittest.cc

 // Copyright (c) 2011 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 <vector>
 
 #include "base/auto_reset.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
@@ skipping 226 matching lines @@
 #endif
   EXPECT_TRUE(model.Backspace());
   EXPECT_EQ(WideToUTF16(L"\x002C\x0020\x05D1\x05BC\x05B7\x05E9"),
             model.GetText());
 }
 
 TEST_F(TextfieldViewsModelTest, EmptyString) {
   TextfieldViewsModel model(NULL);
   EXPECT_EQ(string16(), model.GetText());
   EXPECT_EQ(string16(), model.GetSelectedText());
-  EXPECT_EQ(string16(), model.GetVisibleText());
 
   model.MoveCursorLeft(gfx::CHARACTER_BREAK, true);
   EXPECT_EQ(0U, model.GetCursorPosition());
   model.MoveCursorRight(gfx::CHARACTER_BREAK, true);
   EXPECT_EQ(0U, model.GetCursorPosition());
 
   EXPECT_EQ(string16(), model.GetSelectedText());
 
   EXPECT_FALSE(model.Delete());
   EXPECT_FALSE(model.Backspace());
@@ skipping 149 matching lines @@
   model.MoveCursorRight(gfx::CHARACTER_BREAK, true);  // select "H"
   model.ReplaceChar('B');
   EXPECT_STR_EQ("BELL", model.GetText());
   model.MoveCursorRight(gfx::LINE_BREAK, false);
   model.MoveCursorLeft(gfx::CHARACTER_BREAK, true);
   model.MoveCursorLeft(gfx::CHARACTER_BREAK, true);  // select "ELL"
   model.ReplaceChar('E');
   EXPECT_STR_EQ("BEE", model.GetText());
 }
 
-TEST_F(TextfieldViewsModelTest, Password) {
-  TextfieldViewsModel model(NULL);
-  model.set_is_password(true);
-  model.Append(ASCIIToUTF16("HELLO"));
-  EXPECT_STR_EQ("*****", model.GetVisibleText());
-  EXPECT_STR_EQ("HELLO", model.GetText());
-  EXPECT_TRUE(model.Delete());
-
-  EXPECT_STR_EQ("****", model.GetVisibleText());
-  EXPECT_STR_EQ("ELLO", model.GetText());
-  EXPECT_EQ(0U, model.GetCursorPosition());
-
-  model.SelectAll();
-  EXPECT_STR_EQ("ELLO", model.GetSelectedText());
-  EXPECT_EQ(4U, model.GetCursorPosition());
-
-  model.InsertChar('X');
-  EXPECT_STR_EQ("*", model.GetVisibleText());
-  EXPECT_STR_EQ("X", model.GetText());
-}
-
 TEST_F(TextfieldViewsModelTest, Word) {
   TextfieldViewsModel model(NULL);
   model.Append(
       ASCIIToUTF16("The answer to Life, the Universe, and Everything"));
   model.MoveCursorRight(gfx::WORD_BREAK, false);
   EXPECT_EQ(3U, model.GetCursorPosition());
   model.MoveCursorRight(gfx::WORD_BREAK, false);
   EXPECT_EQ(10U, model.GetCursorPosition());
   model.MoveCursorRight(gfx::WORD_BREAK, false);
   model.MoveCursorRight(gfx::WORD_BREAK, false);
@@ skipping 24 matching lines @@
   EXPECT_STR_EQ("to Life", model.GetSelectedText());
   model.MoveCursorLeft(gfx::WORD_BREAK, true);
   model.MoveCursorLeft(gfx::WORD_BREAK, true);
   model.MoveCursorLeft(gfx::WORD_BREAK, true);  // Select to the begining.
   EXPECT_STR_EQ("The answer to Life", model.GetSelectedText());
   // Should be safe to go pervious word at the begining.
   model.MoveCursorLeft(gfx::WORD_BREAK, true);
   EXPECT_STR_EQ("The answer to Life", model.GetSelectedText());
   model.ReplaceChar('4');
   EXPECT_EQ(string16(), model.GetSelectedText());
-  EXPECT_STR_EQ("42", model.GetVisibleText());
+  EXPECT_STR_EQ("42", model.GetText());
 }
 
 TEST_F(TextfieldViewsModelTest, SetText) {
   TextfieldViewsModel model(NULL);
   model.Append(ASCIIToUTF16("HELLO"));
   model.MoveCursorRight(gfx::LINE_BREAK, false);
   model.SetText(ASCIIToUTF16("GOODBYE"));
   EXPECT_STR_EQ("GOODBYE", model.GetText());
   // SetText won't reset the cursor posistion.
   EXPECT_EQ(5U, model.GetCursorPosition());
@@ skipping 34 matching lines @@
   EXPECT_EQ(11U, model.GetCursorPosition());
 
   // Test for cut: Non-empty selection.
   model.MoveCursorLeft(gfx::WORD_BREAK, true);
   EXPECT_TRUE(model.Cut());
   clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
   EXPECT_STR_EQ("WORLD", clipboard_text);
   EXPECT_STR_EQ("HELLO ", model.GetText());
   EXPECT_EQ(6U, model.GetCursorPosition());
 
+  // Test for cut: Password field.
+  model.render_text()->SetIsPassword(true);
+  model.SelectAll();
+  EXPECT_FALSE(model.Cut());
+  model.MoveCursorRight(gfx::WORD_BREAK, false);

[msw, 2011/12/03 00:22:40]

Do we care to test the cursor movement in a password field (make sure surrogate
pairs, move-by-word, etc. are handled as expected?)

[benrg, 2011/12/08 21:40:55]

Presumably yes, but not until it works.

+  model.render_text()->SetIsPassword(false);
+
   // Test for copy: Empty selection.
   model.Copy();
   clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
   EXPECT_STR_EQ("WORLD", clipboard_text);
   EXPECT_STR_EQ("HELLO ", model.GetText());
   EXPECT_EQ(6U, model.GetCursorPosition());
 
   // Test for copy: Non-empty selection.
   model.Append(ASCIIToUTF16("HELLO WORLD"));
   model.SelectAll();
   model.Copy();
   clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
   EXPECT_STR_EQ("HELLO HELLO WORLD", clipboard_text);
   EXPECT_STR_EQ("HELLO HELLO WORLD", model.GetText());
   EXPECT_EQ(17U, model.GetCursorPosition());
 
-  // Test for paste.
+  // Test for copy: Password field.
+  model.render_text()->SetIsPassword(true);
+  model.MoveCursorLeft(gfx::WORD_BREAK, true);
+  model.Copy();
+  clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
+  EXPECT_STR_EQ("HELLO HELLO WORLD", clipboard_text);

[msw, 2011/12/03 00:22:40]

Shouldn't this fail? Why is the password text copied successfully?

[benrg, 2011/12/06 17:21:30]

That was the text left in the clipboard from the previous copy. But you're
right, these tests are broken since selecting words doesn't work any more when
the password/obscured bit is set. I rewrote the whole thing in the latest
update. It could still be broken.

+
+  // Test for paste (should ignore password bit).
   model.ClearSelection();
   model.MoveCursorRight(gfx::LINE_BREAK, false);
   model.MoveCursorLeft(gfx::WORD_BREAK, true);
   EXPECT_TRUE(model.Paste());
   clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_text);
   EXPECT_STR_EQ("HELLO HELLO WORLD", clipboard_text);
   EXPECT_STR_EQ("HELLO HELLO HELLO HELLO WORLD", model.GetText());
   EXPECT_EQ(29U, model.GetCursorPosition());
 }
 
@@ skipping 963 matching lines @@
   EXPECT_TRUE(model.Undo());
   EXPECT_STR_EQ("ABCDE", model.GetText());
   EXPECT_TRUE(model.Redo());
   EXPECT_STR_EQ("1234", model.GetText());
   EXPECT_FALSE(model.Redo());
 
   // TODO(oshima): We need MockInputMethod to test the behavior with IME.
 }
 
 }  // namespace views