Make StyledLabel wrap long words

ui/views/controls/styled_label_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 106 matching lines @@
       0,
       styled()->GetInsets().width() + label_preferred_size.width(),
       styled()->GetInsets().height() + 2 * label_preferred_size.height());
   styled()->Layout();
   ASSERT_EQ(2, styled()->child_count());
   EXPECT_EQ(3, styled()->child_at(0)->x());
   EXPECT_EQ(3, styled()->child_at(0)->y());
   EXPECT_EQ(styled()->height() - 3, styled()->child_at(1)->bounds().bottom());
 }
 
+TEST_F(StyledLabelTest, WrapLongWords) {
+  const std::string text("Thisistextasasingleword");

[msw, 2015/05/13 23:05:39]

nit: camel case words :)

[tbarzic, 2015/05/14 00:02:28]

Done.

+  InitStyledLabel(text);
+  Label label(ASCIIToUTF16(text.substr(0, text.size() * 2 / 3)));
+  gfx::Size label_preferred_size = label.GetPreferredSize();
+  EXPECT_EQ(label_preferred_size.height() * 2,
+            StyledLabelContentHeightForWidth(label_preferred_size.width()));
+
+  styled()->SetBorder(Border::CreateEmptyBorder(3, 3, 3, 3));

[msw, 2015/05/13 23:05:40]

Is this 3px border necessary? Would no border simplify the test?

[tbarzic, 2015/05/14 00:02:28]

wouldn't really simplify it, but it's not essential either.

+  styled()->SetBounds(
+      0, 0, styled()->GetInsets().width() + label_preferred_size.width(),
+      styled()->GetInsets().height() + 2 * label_preferred_size.height());
+  styled()->Layout();
+  ASSERT_EQ(2, styled()->child_count());
+  EXPECT_EQ(3, styled()->child_at(0)->x());

[msw, 2015/05/13 23:05:40]

nit: check if the origin is equal to gfx::Point()

[tbarzic, 2015/05/14 00:02:28]

Done.

+  EXPECT_EQ(3, styled()->child_at(0)->y());
+  EXPECT_EQ(styled()->height() - 3, styled()->child_at(1)->bounds().bottom());
+  EXPECT_FALSE(static_cast<Label*>(styled()->child_at(0))->text().empty());
+  EXPECT_FALSE(static_cast<Label*>(styled()->child_at(1))->text().empty());
+  EXPECT_EQ(ASCIIToUTF16(text),
+            static_cast<Label*>(styled()->child_at(0))->text() +
+                static_cast<Label*>(styled()->child_at(1))->text());
+}
+
 TEST_F(StyledLabelTest, CreateLinks) {
   const std::string text("This is a test block of text.");
   InitStyledLabel(text);
 
   // Without links, there should be no focus border.
   EXPECT_TRUE(styled()->GetInsets().empty());
 
   // Now let's add some links.
   styled()->AddStyleRange(gfx::Range(0, 1),
                           StyledLabel::RangeStyleInfo::CreateForLink());
@@ skipping 323 matching lines @@
   // all controls should be recreated
   styled()->SetText(another_text);
   int updated_height = styled()->GetHeightForWidth(styled()->width());
   EXPECT_NE(updated_height, real_height);
   View* first_child_after_text_update = styled()->has_children() ?
       styled()->child_at(0) : nullptr;
   EXPECT_NE(first_child_after_text_update, first_child_after_layout);
 }
 
 }  // namespace views