Chromium Code Reviews| Index: ui/views/controls/label_unittest.cc |
| diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc |
| index e2ab5080acce68b819cc58bf0bbcd746d16d6d98..6174c9f1d2e4f7fc656b6a3938002733ca1371e3 100644 |
| --- a/ui/views/controls/label_unittest.cc |
| +++ b/ui/views/controls/label_unittest.cc |
| @@ -27,6 +27,12 @@ namespace { |
| // All text sizing measurements (width and height) should be greater than this. |
| const int kMinTextDimension = 4; |
| +#if defined(OS_MACOSX) |
| +const base::char16 kObscuredCharacter = 0x2022; |
|
sky
2016/10/21 15:06:41
Use the define in rendertext.
karandeepb
2016/10/24 12:09:54
Done.
|
| +#else |
| +const base::char16 kObscuredCharacter = '*'; |
| +#endif |
| + |
| using LabelTest = ViewsTestBase; |
| class LabelFocusTest : public FocusManagerTest { |
| @@ -197,12 +203,13 @@ TEST_F(LabelTest, ObscuredProperty) { |
| label.SetObscured(true); |
| label.SizeToPreferredSize(); |
| EXPECT_TRUE(label.obscured()); |
| - EXPECT_EQ(ASCIIToUTF16("*********"), label.GetDisplayTextForTesting()); |
| + EXPECT_EQ(base::string16(test_text.size(), kObscuredCharacter), |
| + label.GetDisplayTextForTesting()); |
| EXPECT_EQ(test_text, label.text()); |
| label.SetText(test_text + test_text); |
| label.SizeToPreferredSize(); |
| - EXPECT_EQ(ASCIIToUTF16("******************"), |
| + EXPECT_EQ(base::string16(test_text.size() * 2, kObscuredCharacter), |
| label.GetDisplayTextForTesting()); |
| EXPECT_EQ(test_text + test_text, label.text()); |
| @@ -221,7 +228,8 @@ TEST_F(LabelTest, ObscuredSurrogatePair) { |
| label.SetText(test_text); |
| label.SetObscured(true); |
| label.SizeToPreferredSize(); |
| - EXPECT_EQ(ASCIIToUTF16("*"), label.GetDisplayTextForTesting()); |
| + EXPECT_EQ(base::string16(1, kObscuredCharacter), |
| + label.GetDisplayTextForTesting()); |
| EXPECT_EQ(test_text, label.text()); |
| } |