Commit 3b3ec56a authored by Eliot Courtney's avatar Eliot Courtney Committed by Commit Bot

Don't use ToString() for gfx::Rect in PipWindowResizerTest.

Bug: 841886
Bug: b/115291749
Test: ash_unittests
Change-Id: Ibfd54d17fa035d432fbb0570ab5eee922b1a8856
Reviewed-on: https://chromium-review.googlesource.com/c/1300819Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Commit-Queue: Eliot Courtney <edcourtney@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603006}
parent 1f4d7735
...@@ -127,7 +127,7 @@ TEST_F(PipWindowResizerTest, PipWindowCanDrag) { ...@@ -127,7 +127,7 @@ TEST_F(PipWindowResizerTest, PipWindowCanDrag) {
ASSERT_TRUE(resizer.get()); ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0); resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0);
EXPECT_EQ("200,210 100x100", test_state()->last_bounds().ToString()); EXPECT_EQ(gfx::Rect(200, 210, 100, 100), test_state()->last_bounds());
} }
TEST_F(PipWindowResizerTest, PipWindowCanResize) { TEST_F(PipWindowResizerTest, PipWindowCanResize) {
...@@ -136,7 +136,7 @@ TEST_F(PipWindowResizerTest, PipWindowCanResize) { ...@@ -136,7 +136,7 @@ TEST_F(PipWindowResizerTest, PipWindowCanResize) {
ASSERT_TRUE(resizer.get()); ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0); resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0);
EXPECT_EQ("200,200 100x110", test_state()->last_bounds().ToString()); EXPECT_EQ(gfx::Rect(200, 200, 100, 110), test_state()->last_bounds());
} }
TEST_F(PipWindowResizerTest, PipWindowDragIsRestrictedToWorkArea) { TEST_F(PipWindowResizerTest, PipWindowDragIsRestrictedToWorkArea) {
...@@ -146,19 +146,19 @@ TEST_F(PipWindowResizerTest, PipWindowDragIsRestrictedToWorkArea) { ...@@ -146,19 +146,19 @@ TEST_F(PipWindowResizerTest, PipWindowDragIsRestrictedToWorkArea) {
// Drag to the right. // Drag to the right.
resizer->Drag(CalculateDragPoint(*resizer, 800, 0), 0); resizer->Drag(CalculateDragPoint(*resizer, 800, 0), 0);
EXPECT_EQ("292,200 100x100", test_state()->last_bounds().ToString()); EXPECT_EQ(gfx::Rect(292, 200, 100, 100), test_state()->last_bounds());
// Drag down. // Drag down.
resizer->Drag(CalculateDragPoint(*resizer, 0, 800), 0); resizer->Drag(CalculateDragPoint(*resizer, 0, 800), 0);
EXPECT_EQ("200,292 100x100", test_state()->last_bounds().ToString()); EXPECT_EQ(gfx::Rect(200, 292, 100, 100), test_state()->last_bounds());
// Drag to the left. // Drag to the left.
resizer->Drag(CalculateDragPoint(*resizer, -800, 0), 0); resizer->Drag(CalculateDragPoint(*resizer, -800, 0), 0);
EXPECT_EQ("8,200 100x100", test_state()->last_bounds().ToString()); EXPECT_EQ(gfx::Rect(8, 200, 100, 100), test_state()->last_bounds());
// Drag up. // Drag up.
resizer->Drag(CalculateDragPoint(*resizer, 0, -800), 0); resizer->Drag(CalculateDragPoint(*resizer, 0, -800), 0);
EXPECT_EQ("200,8 100x100", test_state()->last_bounds().ToString()); EXPECT_EQ(gfx::Rect(200, 8, 100, 100), test_state()->last_bounds());
} }
TEST_F(PipWindowResizerTest, PipWindowCanBeDraggedInTabletMode) { TEST_F(PipWindowResizerTest, PipWindowCanBeDraggedInTabletMode) {
...@@ -169,7 +169,7 @@ TEST_F(PipWindowResizerTest, PipWindowCanBeDraggedInTabletMode) { ...@@ -169,7 +169,7 @@ TEST_F(PipWindowResizerTest, PipWindowCanBeDraggedInTabletMode) {
ASSERT_TRUE(resizer.get()); ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0); resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0);
EXPECT_EQ("200,210 100x100", test_state()->last_bounds().ToString()); EXPECT_EQ(gfx::Rect(200, 210, 100, 100), test_state()->last_bounds());
} }
TEST_F(PipWindowResizerTest, PipWindowCanBeResizedInTabletMode) { TEST_F(PipWindowResizerTest, PipWindowCanBeResizedInTabletMode) {
...@@ -180,7 +180,7 @@ TEST_F(PipWindowResizerTest, PipWindowCanBeResizedInTabletMode) { ...@@ -180,7 +180,7 @@ TEST_F(PipWindowResizerTest, PipWindowCanBeResizedInTabletMode) {
ASSERT_TRUE(resizer.get()); ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0); resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0);
EXPECT_EQ("200,200 100x110", test_state()->last_bounds().ToString()); EXPECT_EQ(gfx::Rect(200, 200, 100, 110), test_state()->last_bounds());
} }
} // namespace wm } // namespace wm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment