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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/controls/label_unittest.cc

Issue 10695101: Remove code that forces text directionality. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge. Created 8 years, 5 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/views/controls/label.cc ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label_unittest.cc
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
index df7ac338d18082738fde935faa2b135b45352aa3..ad179030d35e7bc82a46013d33471247815859a8 100644
--- a/ui/views/controls/label_unittest.cc
+++ b/ui/views/controls/label_unittest.cc
@@ -64,23 +64,17 @@ TEST(LabelTest, ColorProperty) {
}
TEST(LabelTest, AlignmentProperty) {
- Label label;
- bool reverse_alignment = base::i18n::IsRTL();
-
+ // The label's alignment should be flipped for RTL text.
+ Label label(WideToUTF16(L"\x05d0\x05d1\x05d2"));
label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
- EXPECT_EQ(
- reverse_alignment ? Label::ALIGN_LEFT : Label::ALIGN_RIGHT,
- label.horizontal_alignment());
+ EXPECT_EQ(Label::ALIGN_LEFT, label.horizontal_alignment());
label.SetHorizontalAlignment(Label::ALIGN_LEFT);
- EXPECT_EQ(
- reverse_alignment ? Label::ALIGN_RIGHT : Label::ALIGN_LEFT,
- label.horizontal_alignment());
+ EXPECT_EQ(Label::ALIGN_RIGHT, label.horizontal_alignment());
label.SetHorizontalAlignment(Label::ALIGN_CENTER);
EXPECT_EQ(Label::ALIGN_CENTER, label.horizontal_alignment());
- // The label's alignment should not be flipped if the directionality mode is
- // AUTO_DETECT_DIRECTIONALITY.
- label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
+ // The label's alignment should not be flipped for LTR text.
+ label.SetText("abc");
label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
EXPECT_EQ(Label::ALIGN_RIGHT, label.horizontal_alignment());
label.SetHorizontalAlignment(Label::ALIGN_LEFT);
@@ -89,17 +83,6 @@ TEST(LabelTest, AlignmentProperty) {
EXPECT_EQ(Label::ALIGN_CENTER, label.horizontal_alignment());
}
-TEST(LabelTest, DirectionalityModeProperty) {
- Label label;
- EXPECT_EQ(Label::USE_UI_DIRECTIONALITY, label.directionality_mode());
-
- label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
- EXPECT_EQ(Label::AUTO_DETECT_DIRECTIONALITY, label.directionality_mode());
-
- label.set_directionality_mode(Label::USE_UI_DIRECTIONALITY);
- EXPECT_EQ(Label::USE_UI_DIRECTIONALITY, label.directionality_mode());
-}
-
TEST(LabelTest, MultiLineProperty) {
Label label;
EXPECT_FALSE(label.is_multi_line());
@@ -278,39 +261,6 @@ TEST(LabelTest, MultiLineSizing) {
required_size.width() + border.width());
}
-TEST(LabelTest, AutoDetectDirectionality) {
- Label label;
- label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
-
- // Test text starts with RTL character.
- string16 test_text(WideToUTF16(L" \x5d0\x5d1\x5d2 abc"));
- label.SetText(test_text);
- gfx::Size required_size(label.GetPreferredSize());
- gfx::Size extra(22, 8);
- label.SetBounds(0,
- 0,
- required_size.width() + extra.width(),
- required_size.height() + extra.height());
-
- string16 paint_text;
- gfx::Rect text_bounds;
- int flags;
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- EXPECT_EQ(gfx::Canvas::FORCE_RTL_DIRECTIONALITY, flags);
-
- // Test text starts with LTR character.
- test_text = (WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc"));
- label.SetText(test_text);
- required_size = label.GetPreferredSize();
- label.SetBounds(0,
- 0,
- required_size.width() + extra.width(),
- required_size.height() + extra.height());
-
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
-}
-
TEST(LabelTest, DrawSingleLineString) {
Label label;
label.set_focusable(false);
@@ -341,7 +291,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
+ EXPECT_EQ(0, flags);
// Left aligned text.
label.SetHorizontalAlignment(Label::ALIGN_LEFT);
@@ -354,7 +304,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
+ EXPECT_EQ(0, flags);
// Right aligned text.
label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
@@ -367,7 +317,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
+ EXPECT_EQ(0, flags);
// Test single line drawing with a border.
gfx::Insets border(39, 34, 8, 96);
@@ -397,7 +347,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
+ EXPECT_EQ(0, flags);
// Left aligned text with border.
label.SetHorizontalAlignment(Label::ALIGN_LEFT);
@@ -410,7 +360,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
+ EXPECT_EQ(0, flags);
// Right aligned text.
label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
@@ -423,7 +373,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
+ EXPECT_EQ(0, flags);
}
// On Linux the underlying pango routines require a max height in order to
@@ -457,9 +407,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
EXPECT_GT(text_bounds.height(), kMinTextDimension);
- int expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_CENTER |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+ int expected_flags = gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_CENTER;
#if defined(OS_WIN)
EXPECT_EQ(expected_flags, flags);
#else
@@ -476,9 +424,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
EXPECT_GT(text_bounds.height(), kMinTextDimension);
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_LEFT |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+ expected_flags = gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_LEFT;
#if defined(OS_WIN)
EXPECT_EQ(expected_flags, flags);
#else
@@ -494,9 +440,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
EXPECT_GT(text_bounds.height(), kMinTextDimension);
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_RIGHT |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+ expected_flags = gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_RIGHT;
#if defined(OS_WIN)
EXPECT_EQ(expected_flags, flags);
#else
@@ -524,9 +468,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
EXPECT_EQ(center_bounds.height(), text_bounds.height());
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_CENTER |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+ expected_flags = gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_CENTER;
#if defined(OS_WIN)
EXPECT_EQ(expected_flags, flags);
#else
@@ -542,9 +484,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
EXPECT_EQ(center_bounds.height(), text_bounds.height());
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_LEFT |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+ expected_flags = gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_LEFT;
#if defined(OS_WIN)
EXPECT_EQ(expected_flags, flags);
#else
@@ -560,9 +500,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
EXPECT_EQ(center_bounds.height(), text_bounds.height());
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_RIGHT |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+ expected_flags = gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_RIGHT;
#if defined(OS_WIN)
EXPECT_EQ(expected_flags, flags);
#else
« no previous file with comments | « ui/views/controls/label.cc ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698