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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: printing/page_setup_unittest.cc

Issue 8038024: ui/gfx: Add ToString() function to Size class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « chrome/browser/printing/printing_layout_uitest.cc ('k') | ui/gfx/rect.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/page_setup_unittest.cc
diff --git a/printing/page_setup_unittest.cc b/printing/page_setup_unittest.cc
index e2c68b91c189c999cf4f5d6d22fb91d176e66205..c4f9d43c5223bf512cb545935c5a1258a1aa5d70 100644
--- a/printing/page_setup_unittest.cc
+++ b/printing/page_setup_unittest.cc
@@ -67,25 +67,31 @@ TEST(PageSetupTest, Random) {
effective_margins.top);
// Test values.
- EXPECT_EQ(page_size, setup.physical_size()) << seed << " " << page_size <<
- " " << printable_area << " " << kTextHeight;
- EXPECT_EQ(overlay_area, setup.overlay_area()) << seed << " " << page_size <<
- " " << printable_area << " " << kTextHeight;
- EXPECT_EQ(content_area, setup.content_area()) << seed << " " << page_size <<
- " " << printable_area << " " << kTextHeight;
+ EXPECT_EQ(page_size, setup.physical_size()) << seed << " " <<
+ page_size.ToString() << " " << printable_area << " " << kTextHeight;
+ EXPECT_EQ(overlay_area, setup.overlay_area()) << seed << " " <<
+ page_size.ToString() << " " << printable_area << " " << kTextHeight;
+ EXPECT_EQ(content_area, setup.content_area()) << seed << " " <<
+ page_size.ToString() << " " << printable_area << " " << kTextHeight;
EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
- seed << " " << page_size << " " << printable_area << " " << kTextHeight;
+ seed << " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
- seed << " " << page_size << " " << printable_area << " " << kTextHeight;
+ seed << " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.left, setup.effective_margins().left) << seed <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.top, setup.effective_margins().top) << seed <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.right, setup.effective_margins().right) << seed <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
- seed << " " << page_size << " " << printable_area << " " << kTextHeight;
+ seed << " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
}
TEST(PageSetupTest, HardCoded) {
@@ -124,23 +130,29 @@ TEST(PageSetupTest, HardCoded) {
gfx::Rect content_area(4, 6, 92, 88);
// Test values.
- EXPECT_EQ(page_size, setup.physical_size()) << " " << page_size <<
- " " << printable_area << " " << kTextHeight;
- EXPECT_EQ(overlay_area, setup.overlay_area()) << " " << page_size <<
- " " << printable_area << " " << kTextHeight;
- EXPECT_EQ(content_area, setup.content_area()) << " " << page_size <<
+ EXPECT_EQ(page_size, setup.physical_size()) << " " << page_size.ToString() <<
" " << printable_area << " " << kTextHeight;
+ EXPECT_EQ(overlay_area, setup.overlay_area()) << " " <<
+ page_size.ToString() << " " << printable_area << " " << kTextHeight;
+ EXPECT_EQ(content_area, setup.content_area()) << " " <<
+ page_size.ToString() << " " << printable_area << " " << kTextHeight;
EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " <<
+ printable_area << " " << kTextHeight;
EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.left, setup.effective_margins().left) <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.top, setup.effective_margins().top) <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.right, setup.effective_margins().right) <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
- " " << page_size << " " << printable_area << " " << kTextHeight;
+ " " << page_size.ToString() << " " << printable_area <<
+ " " << kTextHeight;
}
« no previous file with comments | « chrome/browser/printing/printing_layout_uitest.cc ('k') | ui/gfx/rect.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698