diff options
| author | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 08:43:06 +0000 |
|---|---|---|
| committer | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 08:43:06 +0000 |
| commit | 2fb2657edf859b1b31c41f5a44cfb9a91dc79840 (patch) | |
| tree | 1f49fb44649c1e2bf38a3971250e4e6cce46306c /ui/gfx/render_text_unittest.cc | |
| parent | 65b5b4a4152e18547fdd7ec689336cd4db72c65b (diff) | |
| download | chromium_src-2fb2657edf859b1b31c41f5a44cfb9a91dc79840.zip chromium_src-2fb2657edf859b1b31c41f5a44cfb9a91dc79840.tar.gz chromium_src-2fb2657edf859b1b31c41f5a44cfb9a91dc79840.tar.bz2 | |
Enables font-related unittests again.
Enables the unittests which got disabled because Symbol font was missing on trybots.
See http://crrev.com/67523002
Symbol font has been installed on trybots. See http://crbug.com/320391
BUG=316955
TEST=none
Review URL: https://codereview.chromium.org/79263004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/render_text_unittest.cc')
| -rw-r--r-- | ui/gfx/render_text_unittest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc index ffa1917..c8c50d4 100644 --- a/ui/gfx/render_text_unittest.cc +++ b/ui/gfx/render_text_unittest.cc @@ -8,6 +8,7 @@ #include "base/format_macros.h" #include "base/memory/scoped_ptr.h" +#include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -1156,11 +1157,14 @@ TEST_F(RenderTextTest, StringSizeEmptyString) { } #endif // !defined(OS_MACOSX) -// Disabled. http://crbug.com/316955 -TEST_F(RenderTextTest, DISABLED_StringSizeRespectsFontListMetrics) { +TEST_F(RenderTextTest, StringSizeRespectsFontListMetrics) { // Check that Arial and Symbol have different font metrics. Font arial_font("Arial", 16); + ASSERT_EQ("arial", + StringToLowerASCII(arial_font.GetActualFontNameForTesting())); Font symbol_font("Symbol", 16); + ASSERT_EQ("symbol", + StringToLowerASCII(symbol_font.GetActualFontNameForTesting())); EXPECT_NE(arial_font.GetHeight(), symbol_font.GetHeight()); EXPECT_NE(arial_font.GetBaseline(), symbol_font.GetBaseline()); // "a" should be rendered with Arial, not with Symbol. @@ -1213,8 +1217,7 @@ TEST_F(RenderTextTest, SetFont) { EXPECT_EQ(12, render_text->GetPrimaryFont().GetFontSize()); } -// Disabled. http://crbug.com/316955 -TEST_F(RenderTextTest, DISABLED_SetFontList) { +TEST_F(RenderTextTest, SetFontList) { scoped_ptr<RenderText> render_text(RenderText::CreateInstance()); render_text->SetFontList(FontList("Arial,Symbol, 13px")); const std::vector<Font>& fonts = render_text->font_list().GetFonts(); |