Views: Don't add insets for views::Link focus rings under MD.

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 "ui/views/controls/styled_label.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using base::ASCIIToUTF16;
 
 namespace views {
+namespace {
+
+enum class SecondaryUiMode { NON_MD, MD };
+
+std::string SecondaryUiModeToString(
+    const ::testing::TestParamInfo<SecondaryUiMode>& info) {
+  return info.param == SecondaryUiMode::MD ? "MD" : "NonMD";
+}
+}  // namespace
 
 class StyledLabelTest : public ViewsTestBase, public StyledLabelListener {
  public:
   StyledLabelTest() {}
   ~StyledLabelTest() override {}
 
   // StyledLabelListener implementation.
   void StyledLabelLinkClicked(StyledLabel* label,
                               const gfx::Range& range,
                               int event_flags) override {}
 
  protected:
   StyledLabel* styled() { return styled_.get(); }
 
   void InitStyledLabel(const std::string& ascii_text) {
     styled_.reset(new StyledLabel(ASCIIToUTF16(ascii_text), this));
     styled_->set_owned_by_client();
   }
 
   int StyledLabelContentHeightForWidth(int w) {
     return styled_->GetHeightForWidth(w) - styled_->GetInsets().height();
   }
 
  private:
   std::unique_ptr<StyledLabel> styled_;
 
   DISALLOW_COPY_AND_ASSIGN(StyledLabelTest);
 };
 
+// StyledLabelTest harness that runs both with and without secondary UI set to
+// MD.
+class MDStyledLabelTest
+    : public StyledLabelTest,
+      public ::testing::WithParamInterface<SecondaryUiMode> {
+ public:
+  MDStyledLabelTest()
+      : md_test_api_(ui::MaterialDesignController::Mode::MATERIAL_NORMAL) {}
+
+  // StyledLabelTest:
+  void SetUp() override {
+    // This works while StyledLabelTest has no SetUp() of its own. Otherwise the
+    // mode should be set after ViewsTestBase::SetUp(), but before the rest of
+    // StyledLabelTest::SetUp(), so that StyledLabelTest::SetUp() obeys the MD
+    // setting.
+    StyledLabelTest::SetUp();
+    md_test_api_.SetSecondaryUiMaterial(GetParam() == SecondaryUiMode::MD);
+  }
+
+ private:
+  ui::test::MaterialDesignControllerTestAPI md_test_api_;
+
+  DISALLOW_COPY_AND_ASSIGN(MDStyledLabelTest);
+};
+
 TEST_F(StyledLabelTest, NoWrapping) {
   const std::string text("This is a test block of text");
   InitStyledLabel(text);
   Label label(ASCIIToUTF16(text));
   const gfx::Size label_preferred_size = label.GetPreferredSize();
   EXPECT_EQ(label_preferred_size.height(),
             StyledLabelContentHeightForWidth(label_preferred_size.width() * 2));
 }
 
 TEST_F(StyledLabelTest, TrailingWhitespaceiIgnored) {
@@ skipping 132 matching lines @@
   EXPECT_EQ(gfx::Point(0, styled()->height() / 2),
             styled()->child_at(1)->origin());
 
   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) {
+TEST_P(MDStyledLabelTest, 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().IsEmpty());
 
   // Now let's add some links.
   styled()->AddStyleRange(gfx::Range(0, 1),
                           StyledLabel::RangeStyleInfo::CreateForLink());
   styled()->AddStyleRange(gfx::Range(1, 2),
                           StyledLabel::RangeStyleInfo::CreateForLink());
   styled()->AddStyleRange(gfx::Range(10, 11),
                           StyledLabel::RangeStyleInfo::CreateForLink());
   styled()->AddStyleRange(gfx::Range(12, 13),
                           StyledLabel::RangeStyleInfo::CreateForLink());
 
-  // Now there should be a focus border because there are non-empty Links.
-  EXPECT_FALSE(styled()->GetInsets().IsEmpty());
+  if (GetParam() == SecondaryUiMode::MD) {
+    // Insets shouldn't change under MD when links are added, since the links
+    // indicate focus by adding an underline instead.
+    EXPECT_TRUE(styled()->GetInsets().IsEmpty());
+  } else {
+    // Now there should be a focus border because there are non-empty Links.
+    EXPECT_FALSE(styled()->GetInsets().IsEmpty());
+  }
 
   // Verify layout creates the right number of children.
   styled()->SetBounds(0, 0, 1000, 1000);
   styled()->Layout();
   EXPECT_EQ(7, styled()->child_count());
 }
 
-TEST_F(StyledLabelTest, DontBreakLinks) {
+TEST_P(MDStyledLabelTest, DontBreakLinks) {
   const std::string text("This is a test block of text, ");
   const std::string link_text("and this should be a link");
   InitStyledLabel(text + link_text);
   styled()->AddStyleRange(
       gfx::Range(static_cast<uint32_t>(text.size()),
                  static_cast<uint32_t>(text.size() + link_text.size())),
       StyledLabel::RangeStyleInfo::CreateForLink());
 
   Label label(ASCIIToUTF16(text + link_text.substr(0, link_text.size() / 2)));
   gfx::Size label_preferred_size = label.GetPreferredSize();
   int pref_height = styled()->GetHeightForWidth(label_preferred_size.width());
   EXPECT_EQ(label_preferred_size.height() * 2,
             pref_height - styled()->GetInsets().height());
 
   styled()->SetBounds(0, 0, label_preferred_size.width(), pref_height);
   styled()->Layout();
   ASSERT_EQ(2, styled()->child_count());
-  // The label has no focus border while the link (and thus overall styled
-  // label) does, so the label should be inset by the width of the focus border.
-  EXPECT_EQ(Label::kFocusBorderPadding, styled()->child_at(0)->x());
+
+  if (GetParam() == SecondaryUiMode::MD) {
+    // No additional insets should be added under MD.
+    EXPECT_EQ(0, styled()->child_at(0)->x());
+  } else {
+    // The label has no focus border while, when non-MD, the link (and thus
+    // overall styled label) does, so the label should be inset by the width of
+    // the focus border.
+    EXPECT_EQ(Link::kFocusBorderPadding, styled()->child_at(0)->x());
+  }
+  // The Link shouldn't be offset (it grows in size under non-MD instead).
   EXPECT_EQ(0, styled()->child_at(1)->x());
 }
 
 TEST_F(StyledLabelTest, StyledRangeWithDisabledLineWrapping) {
   const std::string text("This is a test block of text, ");
   const std::string unbreakable_text("and this should not be broken");
   InitStyledLabel(text + unbreakable_text);
   StyledLabel::RangeStyleInfo style_info;
   style_info.disable_line_wrapping = true;
   styled()->AddStyleRange(
@@ skipping 156 matching lines @@
   label->SetBackgroundColor(SK_ColorBLACK);
 
   const SkColor kAdjustedTextColor = label->enabled_color();
   EXPECT_NE(kAdjustedTextColor, kDefaultTextColor);
   EXPECT_EQ(kAdjustedTextColor,
             static_cast<Label*>(styled()->child_at(2))->enabled_color());
 
   widget->CloseNow();
 }
 
-TEST_F(StyledLabelTest, StyledRangeWithTooltip) {
+TEST_P(MDStyledLabelTest, StyledRangeWithTooltip) {
   const std::string text("This is a test block of text, ");
   const std::string tooltip_text("this should have a tooltip,");
   const std::string normal_text(" this should not have a tooltip, ");
   const std::string link_text("and this should be a link");
 
   const size_t tooltip_start = text.size();
   const size_t link_start =
       text.size() + tooltip_text.size() + normal_text.size();
 
   InitStyledLabel(text + tooltip_text + normal_text + link_text);
@@ skipping 15 matching lines @@
   int pref_height = styled()->GetHeightForWidth(label_preferred_size.width());
   EXPECT_EQ(label_preferred_size.height() * 3,
             pref_height - styled()->GetInsets().height());
 
   styled()->SetBounds(0, 0, label_preferred_size.width(), pref_height);
   styled()->Layout();
 
   EXPECT_EQ(label_preferred_size.width(), styled()->width());
 
   ASSERT_EQ(5, styled()->child_count());
-  // The labels have no focus border while the link (and thus overall styled
-  // label) does, so the labels should be inset by the width of the focus
-  // border.
-  EXPECT_EQ(Label::kFocusBorderPadding, styled()->child_at(0)->x());
+
+  if (GetParam() == SecondaryUiMode::MD) {
+    // In MD, the labels shouldn't be offset to cater for focus rings.
+    EXPECT_EQ(0, styled()->child_at(0)->x());
+    EXPECT_EQ(0, styled()->child_at(2)->x());
+  } else {
+    // The labels have no focus border while the link (and thus overall styled
+    // label) does, so the labels should be inset by the width of the focus
+    // border.
+    EXPECT_EQ(Link::kFocusBorderPadding, styled()->child_at(0)->x());
+    EXPECT_EQ(Link::kFocusBorderPadding, styled()->child_at(2)->x());
+  }
+
   EXPECT_EQ(styled()->child_at(0)->bounds().right(),
             styled()->child_at(1)->x());
-  EXPECT_EQ(Label::kFocusBorderPadding, styled()->child_at(2)->x());
   EXPECT_EQ(styled()->child_at(2)->bounds().right(),
             styled()->child_at(3)->x());
   EXPECT_EQ(0, styled()->child_at(4)->x());
 
   base::string16 tooltip;
   EXPECT_TRUE(
       styled()->child_at(1)->GetTooltipText(gfx::Point(1, 1), &tooltip));
   EXPECT_EQ(ASCIIToUTF16("tooltip"), tooltip);
   EXPECT_TRUE(
       styled()->child_at(2)->GetTooltipText(gfx::Point(1, 1), &tooltip));
@@ skipping 89 matching lines @@
   styled()->SetBounds(0, 0, 1000, 0);
   styled()->Layout();
   EXPECT_EQ(
       label_preferred_size.height() + 5 /*top border*/ + 6 /*bottom border*/,
       styled()->GetPreferredSize().height());
   EXPECT_EQ(
       label_preferred_size.width() + 10 /*left border*/ + 20 /*right border*/,
       styled()->GetPreferredSize().width());
 }
 
+INSTANTIATE_TEST_CASE_P(,
+                        MDStyledLabelTest,
+                        ::testing::Values(SecondaryUiMode::MD,
+                                          SecondaryUiMode::NON_MD),
+                        &SecondaryUiModeToString);
+
 }  // namespace views