summaryrefslogtreecommitdiffstats
path: root/printing/page_setup_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 19:43:48 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 19:43:48 +0000
commite0425ec4ef9ffc52bfdc6d2b810d252f3b60f9a2 (patch)
tree4aa2df38f93e318b9b8fb67e6a47d540b8a3ee15 /printing/page_setup_unittest.cc
parent5d6920cfd4067d4c70db3e28c398951f6a40cd72 (diff)
downloadchromium_src-e0425ec4ef9ffc52bfdc6d2b810d252f3b60f9a2.zip
chromium_src-e0425ec4ef9ffc52bfdc6d2b810d252f3b60f9a2.tar.gz
chromium_src-e0425ec4ef9ffc52bfdc6d2b810d252f3b60f9a2.tar.bz2
ui/gfx: Add ToString() function to Rect class.
So we don't need to override operator<< for Rect class. R=sky@chromium.org Review URL: http://codereview.chromium.org/8066006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/page_setup_unittest.cc')
-rw-r--r--printing/page_setup_unittest.cc41
1 files changed, 23 insertions, 18 deletions
diff --git a/printing/page_setup_unittest.cc b/printing/page_setup_unittest.cc
index be0e4b6..8d65e72 100644
--- a/printing/page_setup_unittest.cc
+++ b/printing/page_setup_unittest.cc
@@ -68,29 +68,32 @@ TEST(PageSetupTest, Random) {
// Test values.
EXPECT_EQ(page_size, setup.physical_size()) << seed << " " <<
- page_size.ToString() << " " << printable_area << " " << kTextHeight;
+ page_size.ToString() << " " << printable_area.ToString() <<
+ " " << kTextHeight;
EXPECT_EQ(overlay_area, setup.overlay_area()) << seed << " " <<
- page_size.ToString() << " " << printable_area << " " << kTextHeight;
+ page_size.ToString() << " " << printable_area.ToString() <<
+ " " << kTextHeight;
EXPECT_EQ(content_area, setup.content_area()) << seed << " " <<
- page_size.ToString() << " " << printable_area << " " << kTextHeight;
+ page_size.ToString() << " " << printable_area.ToString() <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
- seed << " " << page_size.ToString() << " " << printable_area <<
+ seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
- seed << " " << page_size.ToString() << " " << printable_area <<
+ seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.left, setup.effective_margins().left) << seed <<
- " " << page_size.ToString() << " " << printable_area <<
+ " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.top, setup.effective_margins().top) << seed <<
- " " << page_size.ToString() << " " << printable_area <<
+ " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.right, setup.effective_margins().right) << seed <<
- " " << page_size.ToString() << " " << printable_area <<
+ " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
- seed << " " << page_size.ToString() << " " << printable_area <<
+ seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
}
@@ -131,28 +134,30 @@ TEST(PageSetupTest, HardCoded) {
// Test values.
EXPECT_EQ(page_size, setup.physical_size()) << " " << page_size.ToString() <<
- " " << printable_area << " " << kTextHeight;
+ " " << printable_area.ToString() << " " << kTextHeight;
EXPECT_EQ(overlay_area, setup.overlay_area()) << " " <<
- page_size.ToString() << " " << printable_area << " " << kTextHeight;
+ page_size.ToString() << " " << printable_area.ToString() <<
+ " " << kTextHeight;
EXPECT_EQ(content_area, setup.content_area()) << " " <<
- page_size.ToString() << " " << printable_area << " " << kTextHeight;
+ page_size.ToString() << " " << printable_area.ToString() <<
+ " " << kTextHeight;
EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
" " << page_size.ToString() << " " <<
- printable_area << " " << kTextHeight;
+ printable_area.ToString() << " " << kTextHeight;
EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
- " " << page_size.ToString() << " " << printable_area <<
+ " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.left, setup.effective_margins().left) <<
- " " << page_size.ToString() << " " << printable_area <<
+ " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.top, setup.effective_margins().top) <<
- " " << page_size.ToString() << " " << printable_area <<
+ " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.right, setup.effective_margins().right) <<
- " " << page_size.ToString() << " " << printable_area <<
+ " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
- " " << page_size.ToString() << " " << printable_area <<
+ " " << page_size.ToString() << " " << printable_area.ToString() <<
" " << kTextHeight;
}