Chromium Code Reviews| Index: ui/views/controls/label_unittest.cc |
| =================================================================== |
| --- ui/views/controls/label_unittest.cc (revision 133692) |
| +++ ui/views/controls/label_unittest.cc (working copy) |
| @@ -16,18 +16,15 @@ |
| // All text sizing measurements (width and height) should be greater than this. |
| const int kMinTextDimension = 4; |
| -#if defined(OS_WIN) |
| -// Courier is failing on linux because it's non scalable. |
| TEST(LabelTest, FontPropertyCourier) { |
| Label label; |
| std::string font_name("courier"); |
| - gfx::Font font(font_name, 30); |
| + gfx::Font font(font_name, 26); |
|
msw
2012/04/26 21:04:42
Is this test fragile wrt the font size? If so, ple
Alexei Svitkine (slow)
2012/04/26 21:45:56
Done. It also turns out that the Linux failure was
|
| label.SetFont(font); |
| gfx::Font font_used = label.font(); |
| EXPECT_EQ(font_name, font_used.GetFontName()); |
| - EXPECT_EQ(30, font_used.GetFontSize()); |
| + EXPECT_EQ(26, font_used.GetFontSize()); |
| } |
| -#endif |
| TEST(LabelTest, FontPropertyArial) { |
| Label label; |