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

Unified Diff: ash/wm/dock/docked_window_resizer_unittest.cc

Issue 173133006: [wip] ash: Update expectations in dock window test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dock/docked_window_resizer_unittest.cc
diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc
index 2e51b2004bc732b450e782dd9145f9b25c3e223b..6a3a244dc8420ef14d7bdab3777de90b59c19d76 100644
--- a/ash/wm/dock/docked_window_resizer_unittest.cc
+++ b/ash/wm/dock/docked_window_resizer_unittest.cc
@@ -552,8 +552,8 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindows) {
DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w2.get(), 50);
// Both windows should be docked at the right edge.
- EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
- w1->GetBoundsInScreen().right());
+ wm::WindowState* window_state = wm::GetWindowState(w1.get());
+ EXPECT_TRUE(window_state->IsMinimized());
EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right(),
@@ -569,8 +569,7 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindows) {
DragEnd();
// The first window should be still docked.
- EXPECT_EQ(w1->GetRootWindow()->GetBoundsInScreen().right(),
- w1->GetBoundsInScreen().right());
+ EXPECT_TRUE(window_state->IsMinimized());
EXPECT_EQ(internal::kShellWindowId_DockedContainer, w1->parent()->id());
// The window should be floating on the desktop again and moved to the left.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698