Reintroduce password support to NativeTextfieldViews

ui/gfx/render_text_unittest.cc

 // Copyright (c) 2012 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/gfx/render_text.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 263 matching lines @@
   EXPECT_EQ(ui::Range(0, 3), render_text->style_ranges()[0].range);
 
   SetTextWith2ExtraStyles(render_text.get());
   EXPECT_EQ(3U, render_text->style_ranges().size());
 
   render_text->SetText(ASCIIToUTF16("a"));
   EXPECT_EQ(1U, render_text->style_ranges().size());
   EXPECT_EQ(ui::Range(0, 1), render_text->style_ranges()[0].range);
 }
 
+TEST_F(RenderTextTest, PasswordCensorship) {
+  const string16 seuss = ASCIIToUTF16("hop on pop");
+  const string16 no_seuss = ASCIIToUTF16("**********");
+  scoped_ptr<RenderText> render_text(RenderText::CreateRenderText());
+
+  // GetObscuredText returns asterisks when the obscured bit is set.
+  render_text->SetText(seuss);
+  render_text->SetObscured(true);
+  EXPECT_EQ(seuss, render_text->text());
+  EXPECT_EQ(no_seuss, render_text->GetDisplayText());
+  render_text->SetObscured(false);
+  EXPECT_EQ(seuss, render_text->text());
+  EXPECT_EQ(seuss, render_text->GetDisplayText());
+
+  render_text->SetObscured(true);
+
+  // Surrogate pairs are counted as one code point.
+  const char16 invalid_surrogates[] = {0xDC00, 0xD800, 0};
+  render_text->SetText(invalid_surrogates);
+  EXPECT_EQ(ASCIIToUTF16("**"), render_text->GetDisplayText());
+  const char16 valid_surrogates[] = {0xD800, 0xDC00, 0};
+  render_text->SetText(valid_surrogates);
+  EXPECT_EQ(ASCIIToUTF16("*"), render_text->GetDisplayText());
+  EXPECT_EQ(0U, render_text->GetCursorPosition());
+  render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, false);
+  EXPECT_EQ(2U, render_text->GetCursorPosition());
+
+  // Cursoring is independent of the underlying characters when the text is
+  // obscured.
+  const wchar_t* const texts[] = {
+    L"hop on pop",           // word boundaries
+    L"ab \x5D0\x5D1" L"12",  // bidi embedding level of 2
+    L"\x5D0\x5D1" L"12",     // RTL paragraph direction on Linux
+    L"\x5D0\x5D1"            // pure RTL
+  };
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(texts); ++i) {
+    string16 text = WideToUTF16(texts[i]);
+    render_text->SetText(text);
+    int len = text.length();
+    for (int s = 0; s <= 1; ++s) {

[xji, 2012/02/25 00:06:14]

maybe make it a function and call it with |select| as 'true' and 'false' instead
of using for (s = 0; s <= 1; ..) for better readability.

[benrg, 2012/03/01 17:18:00]

Done.

+      bool select = s != 0;
+      render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, select);
+      EXPECT_TRUE(render_text->selection_model().Equals(SelectionModel(
+          select ? 0 : len, len, len - 1, SelectionModel::TRAILING)));
+      render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, select);
+      EXPECT_TRUE(render_text->selection_model().Equals(SelectionModel(
+          0, 0, SelectionModel::LEADING)));
+      for (int j = 1; j <= len; ++j) {
+        render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, select);
+        EXPECT_TRUE(render_text->selection_model().Equals(SelectionModel(
+            select ? 0 : j, j, j - 1, SelectionModel::TRAILING)));
+      }
+      for (int j = len - 1; j >= 0; --j) {
+        render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, select);
+        EXPECT_TRUE(render_text->selection_model().Equals(SelectionModel(
+            select ? 0 : j, j, j, SelectionModel::LEADING)));
+      }
+      render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, select);
+      EXPECT_TRUE(render_text->selection_model().Equals(SelectionModel(
+          select ? 0 : len, len, len - 1, SelectionModel::TRAILING)));
+      render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, select);
+      EXPECT_TRUE(render_text->selection_model().Equals(SelectionModel(
+          0, 0, SelectionModel::LEADING)));
+    }
+  }

[xji, 2012/02/25 00:06:14]

since you are testing the visual operations here. How about test logical
operation (such as delete/backspace) in upper layer to check that they are
operating to the underlying text.

[benrg, 2012/03/01 17:18:00]

Not done yet.

[xji, 2012/03/01 19:33:49]

pls. add it in follow-up CL. And you can also check for delete/backspace on
surrogate since you fixed that part.

+}
+
 void RunMoveCursorLeftRightTest(RenderText* render_text,
     const std::vector<SelectionModel>& expected,
     bool move_right) {
   for (int i = 0; i < static_cast<int>(expected.size()); ++i) {
     SelectionModel sel = expected[i];
     EXPECT_TRUE(render_text->selection_model().Equals(sel));
     if (move_right)
       render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, false);
     else
       render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, false);
@@ skipping 727 matching lines @@
   // Ensure that a sufficiently large display rectangle shows all the text.
   render_text->SetDisplayRect(Rect(width + 10, 1));
   EXPECT_EQ(render_text->display_rect().width() - width - 1,
             render_text->GetUpdatedCursorBounds().x());
 
   // Reset locale.
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace gfx