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

Unified Diff: components/mus/ws/window_manager_client_apptest.cc

Issue 1560063003: mus: Fix activation cycle direction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot.merge Created 4 years, 11 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 | « components/mus/ws/focus_controller_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_manager_client_apptest.cc
diff --git a/components/mus/ws/window_manager_client_apptest.cc b/components/mus/ws/window_manager_client_apptest.cc
index 2d5802765b0bfe3d824cdea5826b2169b1363363..2e65f715b7ffe56fbe202021df08f684d018fc7b 100644
--- a/components/mus/ws/window_manager_client_apptest.cc
+++ b/components/mus/ws/window_manager_client_apptest.cc
@@ -816,15 +816,13 @@ TEST_F(WindowServerTest, ActivationNext) {
Window* child31 = NewVisibleWindow(GetFirstRoot(embedded3), embedded3);
WaitForTreeSizeToMatch(parent, 7);
- Window* expecteds[] = { child1, child2, child3, child1, nullptr };
- Window* focused[] = { child11, child21, child31, child11, nullptr };
+ Window* expecteds[] = { child3, child2, child1, child3, nullptr };
+ Window* focused[] = { child31, child21, child11, child31, nullptr };
for (size_t index = 0; expecteds[index]; ++index) {
host()->ActivateNextWindow();
- ASSERT_TRUE(WaitForOrderChange(window_manager(), expecteds[index]))
- << " Failure at " << index;
-
WaitForWindowToHaveFocus(focused[index]);
EXPECT_TRUE(focused[index]->HasFocus());
+ EXPECT_EQ(parent->children().back(), expecteds[index]);
}
}
« no previous file with comments | « components/mus/ws/focus_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698