Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(576)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/render_text_unittest.cc

Issue 2439693002: MacViews: Use bullets for displaying obscured text. (Closed)
Patch Set: Fix tests. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/views/controls/label_unittest.cc » ('j') | ui/views/controls/label_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_unittest.cc
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index fec4fcb3ae91676cfd4ac5393c758c389ee42624..e3df229eedf73a67f5b67933b79d782e908600ba 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -124,6 +124,12 @@ class RenderTextTestApi {
namespace {
+#if defined(OS_MACOSX)
sky 2016/10/21 15:06:41 Move kPasswordReplacementChar to header so you are
karandeepb 2016/10/24 12:09:54 Done.
+const base::char16 kPasswordReplacementChar = 0x2022;
+#else
+const base::char16 kPasswordReplacementChar = '*';
+#endif
+
// An enum specifying the different RenderText implementations to be tested.
enum RenderTextBackend {
RENDER_TEXT_HARFBUZZ,
@@ -283,6 +289,21 @@ void VerifyDecoratedWordsAreEqual(const DecoratedText& expected,
}
}
+// Helper method to return an obscured string of the given |length|, with the
+// |reveal_index| filled with |reveal_char|.
+base::string16 GetObscuredString(size_t length,
+ int reveal_index,
+ base::char16 reveal_char) {
+ std::vector<base::char16> arr(length, kPasswordReplacementChar);
+ arr[reveal_index] = reveal_char;
+ return base::string16(arr.begin(), arr.end());
+}
+
+// Helper method to return an obscured string of the given |length|.
+base::string16 GetObscuredString(size_t length) {
+ return base::string16(length, kPasswordReplacementChar);
+}
+
// The class which records the drawing operations so that the test case can
// verify where exactly the glyphs are drawn.
class TestSkiaTextRenderer : public internal::SkiaTextRenderer {
@@ -735,10 +756,11 @@ void TestVisualCursorMotionInObscuredField(
// TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
TEST_P(RenderTextHarfBuzzTest, ObscuredText) {
const base::string16 seuss = ASCIIToUTF16("hop on pop");
- const base::string16 no_seuss = ASCIIToUTF16("**********");
+ const base::string16 no_seuss = GetObscuredString(seuss.length());
RenderText* render_text = GetRenderText();
- // GetLayoutText() returns asterisks when the obscured bit is set.
+ // GetDisplayText() returns a string filled with kPasswordReplacementChar when
+ // the obscured bit is set.
render_text->SetText(seuss);
render_text->SetObscured(true);
EXPECT_EQ(seuss, render_text->text());
@@ -752,10 +774,10 @@ TEST_P(RenderTextHarfBuzzTest, ObscuredText) {
// Surrogate pairs are counted as one code point.
const base::char16 invalid_surrogates[] = {0xDC00, 0xD800, 0};
render_text->SetText(invalid_surrogates);
- EXPECT_EQ(ASCIIToUTF16("**"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(2), render_text->GetDisplayText());
const base::char16 valid_surrogates[] = {0xD800, 0xDC00, 0};
render_text->SetText(valid_surrogates);
- EXPECT_EQ(ASCIIToUTF16("*"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(1), render_text->GetDisplayText());
EXPECT_EQ(0U, render_text->cursor_position());
render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
EXPECT_EQ(2U, render_text->cursor_position());
@@ -798,7 +820,7 @@ TEST_P(RenderTextHarfBuzzTest, ObscuredText) {
TEST_P(RenderTextTest, RevealObscuredText) {
const base::string16 seuss = ASCIIToUTF16("hop on pop");
- const base::string16 no_seuss = ASCIIToUTF16("**********");
+ const base::string16 no_seuss = GetObscuredString(seuss.length());
RenderText* render_text = GetRenderText();
render_text->SetText(seuss);
@@ -808,11 +830,14 @@ TEST_P(RenderTextTest, RevealObscuredText) {
// Valid reveal index and new revealed index clears previous one.
render_text->RenderText::SetObscuredRevealIndex(0);
- EXPECT_EQ(ASCIIToUTF16("h*********"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(seuss.length(), 0, 'h'),
+ render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(1);
- EXPECT_EQ(ASCIIToUTF16("*o********"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(seuss.length(), 1, 'o'),
+ render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(2);
- EXPECT_EQ(ASCIIToUTF16("**p*******"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(seuss.length(), 2, 'p'),
+ render_text->GetDisplayText());
// Invalid reveal index.
render_text->RenderText::SetObscuredRevealIndex(-1);
@@ -822,7 +847,8 @@ TEST_P(RenderTextTest, RevealObscuredText) {
// SetObscured clears the revealed index.
render_text->RenderText::SetObscuredRevealIndex(0);
- EXPECT_EQ(ASCIIToUTF16("h*********"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(seuss.length(), 0, 'h'),
+ render_text->GetDisplayText());
render_text->SetObscured(false);
EXPECT_EQ(seuss, render_text->GetDisplayText());
render_text->SetObscured(true);
@@ -830,41 +856,49 @@ TEST_P(RenderTextTest, RevealObscuredText) {
// SetText clears the revealed index.
render_text->SetText(ASCIIToUTF16("new"));
- EXPECT_EQ(ASCIIToUTF16("***"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(3), render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(2);
- EXPECT_EQ(ASCIIToUTF16("**w"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(3, 2, 'w'), render_text->GetDisplayText());
render_text->SetText(ASCIIToUTF16("new longer"));
- EXPECT_EQ(ASCIIToUTF16("**********"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(10), render_text->GetDisplayText());
// Text with invalid surrogates.
const base::char16 invalid_surrogates[] = {0xDC00, 0xD800, 'h', 'o', 'p', 0};
render_text->SetText(invalid_surrogates);
- EXPECT_EQ(ASCIIToUTF16("*****"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(5), render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(0);
- const base::char16 invalid_expect_0[] = {0xDC00, '*', '*', '*', '*', 0};
- EXPECT_EQ(invalid_expect_0, render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(5, 0, 0xDC00), render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(1);
- const base::char16 invalid_expect_1[] = {'*', 0xD800, '*', '*', '*', 0};
- EXPECT_EQ(invalid_expect_1, render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(5, 1, 0xD800), render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(2);
- EXPECT_EQ(ASCIIToUTF16("**h**"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(5, 2, 'h'), render_text->GetDisplayText());
// Text with valid surrogates before and after the reveal index.
const base::char16 valid_surrogates[] =
{0xD800, 0xDC00, 'h', 'o', 'p', 0xD800, 0xDC00, 0};
render_text->SetText(valid_surrogates);
- EXPECT_EQ(ASCIIToUTF16("*****"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(5), render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(0);
- const base::char16 valid_expect_0_and_1[] =
- {0xD800, 0xDC00, '*', '*', '*', '*', 0};
+ const base::char16 valid_expect_0_and_1[] = {0xD800,
+ 0xDC00,
+ kPasswordReplacementChar,
+ kPasswordReplacementChar,
+ kPasswordReplacementChar,
+ kPasswordReplacementChar,
+ 0};
EXPECT_EQ(valid_expect_0_and_1, render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(1);
EXPECT_EQ(valid_expect_0_and_1, render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(2);
- EXPECT_EQ(ASCIIToUTF16("*h***"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(5, 1, 'h'), render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(5);
- const base::char16 valid_expect_5_and_6[] =
- {'*', '*', '*', '*', 0xD800, 0xDC00, 0};
+ const base::char16 valid_expect_5_and_6[] = {kPasswordReplacementChar,
+ kPasswordReplacementChar,
+ kPasswordReplacementChar,
+ kPasswordReplacementChar,
+ 0xD800,
+ 0xDC00,
+ 0};
EXPECT_EQ(valid_expect_5_and_6, render_text->GetDisplayText());
render_text->RenderText::SetObscuredRevealIndex(6);
EXPECT_EQ(valid_expect_5_and_6, render_text->GetDisplayText());
@@ -1103,7 +1137,7 @@ TEST_P(RenderTextTest, TruncatedObscuredText) {
render_text->SetObscured(true);
render_text->SetText(WideToUTF16(L"abcdef"));
EXPECT_EQ(WideToUTF16(L"abcdef"), render_text->text());
- EXPECT_EQ(WideToUTF16(L"**\x2026"), render_text->GetDisplayText());
+ EXPECT_EQ(GetObscuredString(3, 2, 0x2026), render_text->GetDisplayText());
}
// TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/views/controls/label_unittest.cc » ('j') | ui/views/controls/label_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698