Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/gfx/render_text.h" | 5 #include "ui/gfx/render_text.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 274 EXPECT_EQ(ui::Range(0, 3), render_text->style_ranges()[0].range); | 274 EXPECT_EQ(ui::Range(0, 3), render_text->style_ranges()[0].range); |
| 275 | 275 |
| 276 SetTextWith2ExtraStyles(render_text.get()); | 276 SetTextWith2ExtraStyles(render_text.get()); |
| 277 EXPECT_EQ(3U, render_text->style_ranges().size()); | 277 EXPECT_EQ(3U, render_text->style_ranges().size()); |
| 278 | 278 |
| 279 render_text->SetText(ASCIIToUTF16("a")); | 279 render_text->SetText(ASCIIToUTF16("a")); |
| 280 EXPECT_EQ(1U, render_text->style_ranges().size()); | 280 EXPECT_EQ(1U, render_text->style_ranges().size()); |
| 281 EXPECT_EQ(ui::Range(0, 1), render_text->style_ranges()[0].range); | 281 EXPECT_EQ(ui::Range(0, 1), render_text->style_ranges()[0].range); |
| 282 } | 282 } |
| 283 | 283 |
| 284 TEST_F(RenderTextTest, PasswordCensorship) { | |
|
msw
2012/02/22 00:33:26
Also test more complex text, like RTL, BiDi, and s
benrg
2012/02/24 19:07:44
Done.
| |
| 285 const string16 seuss = ASCIIToUTF16("hop on pop"); | |
| 286 const string16 no_seuss = ASCIIToUTF16("**********"); | |
| 287 scoped_ptr<RenderText> render_text(RenderText::CreateRenderText()); | |
| 288 | |
| 289 // GetObscuredText should return asterisks when the obscured bit is set. | |
| 290 render_text->SetText(seuss); | |
| 291 render_text->SetObscured(true); | |
| 292 EXPECT_EQ(seuss, render_text->text()); | |
| 293 EXPECT_EQ(no_seuss, render_text->GetDisplayText()); | |
| 294 render_text->SetObscured(false); | |
| 295 EXPECT_EQ(seuss, render_text->text()); | |
| 296 EXPECT_EQ(seuss, render_text->GetDisplayText()); | |
| 297 } | |
| 298 | |
| 284 void RunMoveCursorLeftRightTest(RenderText* render_text, | 299 void RunMoveCursorLeftRightTest(RenderText* render_text, |
| 285 const std::vector<SelectionModel>& expected, | 300 const std::vector<SelectionModel>& expected, |
| 286 bool move_right) { | 301 bool move_right) { |
| 287 for (int i = 0; i < static_cast<int>(expected.size()); ++i) { | 302 for (int i = 0; i < static_cast<int>(expected.size()); ++i) { |
| 288 SelectionModel sel = expected[i]; | 303 SelectionModel sel = expected[i]; |
| 289 EXPECT_TRUE(render_text->selection_model().Equals(sel)); | 304 EXPECT_TRUE(render_text->selection_model().Equals(sel)); |
| 290 if (move_right) | 305 if (move_right) |
| 291 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, false); | 306 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, false); |
| 292 else | 307 else |
| 293 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, false); | 308 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, false); |
| (...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1021 // Ensure that a sufficiently large display rectangle shows all the text. | 1036 // Ensure that a sufficiently large display rectangle shows all the text. |
| 1022 render_text->SetDisplayRect(Rect(width + 10, 1)); | 1037 render_text->SetDisplayRect(Rect(width + 10, 1)); |
| 1023 EXPECT_EQ(render_text->display_rect().width() - width - 1, | 1038 EXPECT_EQ(render_text->display_rect().width() - width - 1, |
| 1024 render_text->GetUpdatedCursorBounds().x()); | 1039 render_text->GetUpdatedCursorBounds().x()); |
| 1025 | 1040 |
| 1026 // Reset locale. | 1041 // Reset locale. |
| 1027 base::i18n::SetICUDefaultLocale(locale); | 1042 base::i18n::SetICUDefaultLocale(locale); |
| 1028 } | 1043 } |
| 1029 | 1044 |
| 1030 } // namespace gfx | 1045 } // namespace gfx |
| OLD | NEW |