Skip to content

GitLab

T
tangled
Commit 4c8bcd01 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot
Browse files
Options

window-service: test cleanup 

Remove '2' from a bunch of test names. This was necessary as ws1 had similar
test names. Now that ws1 has been removed, the names no longer need '2' in them.
Also fixes minor misspelling in event.h.

BUG=none
TEST=test only/documentation changes

Change-Id: Id8133edf1d1f398157a3fb00279bc1418f58b036
Reviewed-on: https://chromium-review.googlesource.com/1159469Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580046}
parent 2634272e
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 98 deletions
services/ui/ws2/window_tree_client_unittest.cc
View file @ 4c8bcd01
...@@ -488,11 +488,11 @@ class WindowTreeClientFactory { ...@@ -488,11 +488,11 @@ class WindowTreeClientFactory {
} // namespace } // namespace
class WindowTreeClientTest2 : public WindowServerServiceTestBase { class WindowTreeClientTest : public WindowServerServiceTestBase {
public: public:
WindowTreeClientTest2() : root_window_id_(0) {} WindowTreeClientTest() : root_window_id_(0) {}
~WindowTreeClientTest2() override {} ~WindowTreeClientTest() override {}
protected: protected:
// Returns the changes from the various clients. // Returns the changes from the various clients.
...@@ -647,11 +647,11 @@ class WindowTreeClientTest2 : public WindowServerServiceTestBase { ...@@ -647,11 +647,11 @@ class WindowTreeClientTest2 : public WindowServerServiceTestBase {
Id root_window_id_; Id root_window_id_;
service_manager::BinderRegistry registry_; service_manager::BinderRegistry registry_;
DISALLOW_COPY_AND_ASSIGN(WindowTreeClientTest2); DISALLOW_COPY_AND_ASSIGN(WindowTreeClientTest);
}; };
// Verifies two clients get different ids. // Verifies two clients get different ids.
TEST_F(WindowTreeClientTest2, TwoClientsGetDifferentClientIds) { TEST_F(WindowTreeClientTest, TwoClientsGetDifferentClientIds) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
ASSERT_EQ(1u, changes2()->size()); ASSERT_EQ(1u, changes2()->size());
...@@ -659,7 +659,7 @@ TEST_F(WindowTreeClientTest2, TwoClientsGetDifferentClientIds) { ...@@ -659,7 +659,7 @@ TEST_F(WindowTreeClientTest2, TwoClientsGetDifferentClientIds) {
} }
// Verifies when Embed() is invoked any child windows are removed. // Verifies when Embed() is invoked any child windows are removed.
TEST_F(WindowTreeClientTest2, WindowsRemovedWhenEmbedding) { TEST_F(WindowTreeClientTest, WindowsRemovedWhenEmbedding) {
// Two windows 1 and 2. 2 is parented to 1. // Two windows 1 and 2. 2 is parented to 1.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
ASSERT_TRUE(window_1_1); ASSERT_TRUE(window_1_1);
...@@ -732,7 +732,7 @@ TEST_F(WindowTreeClientTest2, WindowsRemovedWhenEmbedding) { ...@@ -732,7 +732,7 @@ TEST_F(WindowTreeClientTest2, WindowsRemovedWhenEmbedding) {
// Verifies once Embed() has been invoked the parent client can't see any // Verifies once Embed() has been invoked the parent client can't see any
// children. // children.
TEST_F(WindowTreeClientTest2, CantAccessChildrenOfEmbeddedWindow) { TEST_F(WindowTreeClientTest, CantAccessChildrenOfEmbeddedWindow) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -776,7 +776,7 @@ TEST_F(WindowTreeClientTest2, CantAccessChildrenOfEmbeddedWindow) { ...@@ -776,7 +776,7 @@ TEST_F(WindowTreeClientTest2, CantAccessChildrenOfEmbeddedWindow) {
} }
// Verifies once Embed() has been invoked the parent can't mutate the children. // Verifies once Embed() has been invoked the parent can't mutate the children.
TEST_F(WindowTreeClientTest2, CantModifyChildrenOfEmbeddedWindow) { TEST_F(WindowTreeClientTest, CantModifyChildrenOfEmbeddedWindow) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -805,7 +805,7 @@ TEST_F(WindowTreeClientTest2, CantModifyChildrenOfEmbeddedWindow) { ...@@ -805,7 +805,7 @@ TEST_F(WindowTreeClientTest2, CantModifyChildrenOfEmbeddedWindow) {
} }
// Verifies client gets a valid id. // Verifies client gets a valid id.
TEST_F(WindowTreeClientTest2, NewWindow) { TEST_F(WindowTreeClientTest, NewWindow) {
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
ASSERT_TRUE(window_1_1); ASSERT_TRUE(window_1_1);
EXPECT_TRUE(changes1()->empty()); EXPECT_TRUE(changes1()->empty());
...@@ -821,7 +821,7 @@ TEST_F(WindowTreeClientTest2, NewWindow) { ...@@ -821,7 +821,7 @@ TEST_F(WindowTreeClientTest2, NewWindow) {
} }
// Verifies AddWindow fails when window is already in position. // Verifies AddWindow fails when window is already in position.
TEST_F(WindowTreeClientTest2, AddWindowWithNoChange) { TEST_F(WindowTreeClientTest, AddWindowWithNoChange) {
// Create the embed point now so that the ids line up. // Create the embed point now so that the ids line up.
ASSERT_TRUE(wt_client1()->NewWindow(1)); ASSERT_TRUE(wt_client1()->NewWindow(1));
Id window_1_21 = wt_client1()->NewWindow(21); Id window_1_21 = wt_client1()->NewWindow(21);
...@@ -839,7 +839,7 @@ TEST_F(WindowTreeClientTest2, AddWindowWithNoChange) { ...@@ -839,7 +839,7 @@ TEST_F(WindowTreeClientTest2, AddWindowWithNoChange) {
} }
// Verifies AddWindow fails when window is already in position. // Verifies AddWindow fails when window is already in position.
TEST_F(WindowTreeClientTest2, AddAncestorFails) { TEST_F(WindowTreeClientTest, AddAncestorFails) {
// Create the embed point now so that the ids line up. // Create the embed point now so that the ids line up.
ASSERT_TRUE(wt_client1()->NewWindow(1)); ASSERT_TRUE(wt_client1()->NewWindow(1));
Id window_1_21 = wt_client1()->NewWindow(21); Id window_1_21 = wt_client1()->NewWindow(21);
...@@ -857,7 +857,7 @@ TEST_F(WindowTreeClientTest2, AddAncestorFails) { ...@@ -857,7 +857,7 @@ TEST_F(WindowTreeClientTest2, AddAncestorFails) {
} }
// Assertions around adding windows to the root. // Assertions around adding windows to the root.
TEST_F(WindowTreeClientTest2, AddToRoot) { TEST_F(WindowTreeClientTest, AddToRoot) {
// Create the embed point now so that the ids line up. // Create the embed point now so that the ids line up.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
ASSERT_TRUE(window_1_1); ASSERT_TRUE(window_1_1);
...@@ -876,7 +876,7 @@ TEST_F(WindowTreeClientTest2, AddToRoot) { ...@@ -876,7 +876,7 @@ TEST_F(WindowTreeClientTest2, AddToRoot) {
EXPECT_FALSE(wt_client1()->AddWindow(window_1_1, window_1_21)); EXPECT_FALSE(wt_client1()->AddWindow(window_1_1, window_1_21));
} }
TEST_F(WindowTreeClientTest2, TEST_F(WindowTreeClientTest,
DISABLED_WindowHierarchyChangedAddingKnownToUnknown) { DISABLED_WindowHierarchyChangedAddingKnownToUnknown) {
// Create the following structure: root -> 1 -> 11 and 2->21 (2 has no // Create the following structure: root -> 1 -> 11 and 2->21 (2 has no
// parent). // parent).
...@@ -932,7 +932,7 @@ TEST_F(WindowTreeClientTest2, ...@@ -932,7 +932,7 @@ TEST_F(WindowTreeClientTest2,
} }
} }
TEST_F(WindowTreeClientTest2, DISABLED_ReorderWindow) { TEST_F(WindowTreeClientTest, DISABLED_ReorderWindow) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_2_1 = wt_client2()->NewWindow(1); Id window_2_1 = wt_client2()->NewWindow(1);
...@@ -1017,7 +1017,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_ReorderWindow) { ...@@ -1017,7 +1017,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_ReorderWindow) {
} }
// Verifies DeleteWindow works. // Verifies DeleteWindow works.
TEST_F(WindowTreeClientTest2, DISABLED_DeleteWindow) { TEST_F(WindowTreeClientTest, DISABLED_DeleteWindow) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
Id window_2_1 = wt_client2()->NewWindow(1); Id window_2_1 = wt_client2()->NewWindow(1);
...@@ -1052,7 +1052,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_DeleteWindow) { ...@@ -1052,7 +1052,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_DeleteWindow) {
} }
// Verifies DeleteWindow() on the root suceeds. // Verifies DeleteWindow() on the root suceeds.
TEST_F(WindowTreeClientTest2, DeleteRoot) { TEST_F(WindowTreeClientTest, DeleteRoot) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
EXPECT_TRUE(wt_client2()->DeleteWindow(window_1_1)); EXPECT_TRUE(wt_client2()->DeleteWindow(window_1_1));
...@@ -1072,7 +1072,7 @@ TEST_F(WindowTreeClientTest2, DeleteRoot) { ...@@ -1072,7 +1072,7 @@ TEST_F(WindowTreeClientTest2, DeleteRoot) {
} }
// Verifies DeleteWindow() on the root suceeds. // Verifies DeleteWindow() on the root suceeds.
TEST_F(WindowTreeClientTest2, DeleteRootWithChildren) { TEST_F(WindowTreeClientTest, DeleteRootWithChildren) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
Id window_2_1 = wt_client2()->NewWindow(1); Id window_2_1 = wt_client2()->NewWindow(1);
...@@ -1090,7 +1090,7 @@ TEST_F(WindowTreeClientTest2, DeleteRootWithChildren) { ...@@ -1090,7 +1090,7 @@ TEST_F(WindowTreeClientTest2, DeleteRootWithChildren) {
} }
// Verifies DeleteWindow isn't allowed from a separate client. // Verifies DeleteWindow isn't allowed from a separate client.
TEST_F(WindowTreeClientTest2, DeleteWindowFromAnotherClientDisallowed) { TEST_F(WindowTreeClientTest, DeleteWindowFromAnotherClientDisallowed) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
// This id is unknown, so deletion should fail. // This id is unknown, so deletion should fail.
EXPECT_FALSE(wt_client2()->DeleteWindow(BuildWindowId(client_id_1(), 2))); EXPECT_FALSE(wt_client2()->DeleteWindow(BuildWindowId(client_id_1(), 2)));
...@@ -1098,7 +1098,7 @@ TEST_F(WindowTreeClientTest2, DeleteWindowFromAnotherClientDisallowed) { ...@@ -1098,7 +1098,7 @@ TEST_F(WindowTreeClientTest2, DeleteWindowFromAnotherClientDisallowed) {
// Verifies if a window was deleted and then reused that other clients are // Verifies if a window was deleted and then reused that other clients are
// properly notified. // properly notified.
TEST_F(WindowTreeClientTest2, DISABLED_ReuseDeletedWindowId) { TEST_F(WindowTreeClientTest, DISABLED_ReuseDeletedWindowId) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
Id window_2_1 = wt_client2()->NewWindow(1); Id window_2_1 = wt_client2()->NewWindow(1);
...@@ -1152,7 +1152,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_ReuseDeletedWindowId) { ...@@ -1152,7 +1152,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_ReuseDeletedWindowId) {
} }
// Assertions for GetWindowTree. // Assertions for GetWindowTree.
TEST_F(WindowTreeClientTest2, DISABLED_GetWindowTree) { TEST_F(WindowTreeClientTest, DISABLED_GetWindowTree) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -1218,7 +1218,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_GetWindowTree) { ...@@ -1218,7 +1218,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_GetWindowTree) {
} }
} }
TEST_F(WindowTreeClientTest2, DISABLED_SetWindowBounds) { TEST_F(WindowTreeClientTest, DISABLED_SetWindowBounds) {
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
ASSERT_TRUE(window_1_1); ASSERT_TRUE(window_1_1);
ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1)); ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
...@@ -1252,7 +1252,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowBounds) { ...@@ -1252,7 +1252,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowBounds) {
} }
// Verify AddWindow fails when trying to manipulate windows in other roots. // Verify AddWindow fails when trying to manipulate windows in other roots.
TEST_F(WindowTreeClientTest2, CantMoveWindowsFromOtherRoot) { TEST_F(WindowTreeClientTest, CantMoveWindowsFromOtherRoot) {
// Create 1 and 2 in the first client. // Create 1 and 2 in the first client.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
Id window_1_2 = wt_client1()->NewWindow(2); Id window_1_2 = wt_client1()->NewWindow(2);
...@@ -1272,7 +1272,7 @@ TEST_F(WindowTreeClientTest2, CantMoveWindowsFromOtherRoot) { ...@@ -1272,7 +1272,7 @@ TEST_F(WindowTreeClientTest2, CantMoveWindowsFromOtherRoot) {
// Verify RemoveWindowFromParent fails for windows that are descendants of the // Verify RemoveWindowFromParent fails for windows that are descendants of the
// roots. // roots.
TEST_F(WindowTreeClientTest2, CantRemoveWindowsInOtherRoots) { TEST_F(WindowTreeClientTest, CantRemoveWindowsInOtherRoots) {
// Create 1 and 2 in the first client and parent both to the root. // Create 1 and 2 in the first client and parent both to the root.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
Id window_1_2 = wt_client1()->NewWindow(2); Id window_1_2 = wt_client1()->NewWindow(2);
...@@ -1315,7 +1315,7 @@ TEST_F(WindowTreeClientTest2, CantRemoveWindowsInOtherRoots) { ...@@ -1315,7 +1315,7 @@ TEST_F(WindowTreeClientTest2, CantRemoveWindowsInOtherRoots) {
} }
// Verify GetWindowTree fails for windows that are not descendants of the roots. // Verify GetWindowTree fails for windows that are not descendants of the roots.
TEST_F(WindowTreeClientTest2, CantGetWindowTreeOfOtherRoots) { TEST_F(WindowTreeClientTest, CantGetWindowTreeOfOtherRoots) {
// Create 1 and 2 in the first client and parent both to the root. // Create 1 and 2 in the first client and parent both to the root.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
Id window_1_2 = wt_client1()->NewWindow(2); Id window_1_2 = wt_client1()->NewWindow(2);
...@@ -1346,7 +1346,7 @@ TEST_F(WindowTreeClientTest2, CantGetWindowTreeOfOtherRoots) { ...@@ -1346,7 +1346,7 @@ TEST_F(WindowTreeClientTest2, CantGetWindowTreeOfOtherRoots) {
windows[0].ToString()); windows[0].ToString());
} }
TEST_F(WindowTreeClientTest2, DISABLED_EmbedWithSameWindowId) { TEST_F(WindowTreeClientTest, DISABLED_EmbedWithSameWindowId) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
changes2()->clear(); changes2()->clear();
...@@ -1370,7 +1370,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedWithSameWindowId) { ...@@ -1370,7 +1370,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedWithSameWindowId) {
} }
} }
TEST_F(WindowTreeClientTest2, DISABLED_EmbedWithSameWindowId2) { TEST_F(WindowTreeClientTest, DISABLED_EmbedWithSameWindowId2) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
changes2()->clear(); changes2()->clear();
...@@ -1452,7 +1452,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedWithSameWindowId2) { ...@@ -1452,7 +1452,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedWithSameWindowId2) {
} }
// Assertions for SetWindowVisibility. // Assertions for SetWindowVisibility.
TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibility) { TEST_F(WindowTreeClientTest, DISABLED_SetWindowVisibility) {
// Create 1 and 2 in the first client and parent both to the root. // Create 1 and 2 in the first client and parent both to the root.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
Id window_1_2 = wt_client1()->NewWindow(2); Id window_1_2 = wt_client1()->NewWindow(2);
...@@ -1526,7 +1526,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibility) { ...@@ -1526,7 +1526,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibility) {
} }
// Test that we hear the cursor change in other clients. // Test that we hear the cursor change in other clients.
TEST_F(WindowTreeClientTest2, DISABLED_SetCursor) { TEST_F(WindowTreeClientTest, DISABLED_SetCursor) {
// Get a second client to listen in. // Get a second client to listen in.
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -1541,7 +1541,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetCursor) { ...@@ -1541,7 +1541,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetCursor) {
} }
// Assertions for SetWindowVisibility sending notifications. // Assertions for SetWindowVisibility sending notifications.
TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications) { TEST_F(WindowTreeClientTest, DISABLED_SetWindowVisibilityNotifications) {
// Create client_id_1(),1 and client_id_1(),2. client_id_1(),2 is made a child // Create client_id_1(),1 and client_id_1(),2. client_id_1(),2 is made a child
// of client_id_1(),1 and client_id_1(),1 a child of the root. // of client_id_1(),1 and client_id_1(),1 a child of the root.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
...@@ -1646,7 +1646,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications) { ...@@ -1646,7 +1646,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications) {
} }
// Assertions for SetWindowVisibility sending notifications. // Assertions for SetWindowVisibility sending notifications.
TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications2) { TEST_F(WindowTreeClientTest, DISABLED_SetWindowVisibilityNotifications2) {
// Create client_id_1(),1 and client_id_1(),2. client_id_1(),2 is made a child // Create client_id_1(),1 and client_id_1(),2. client_id_1(),2 is made a child
// of client_id_1(),1 and client_id_1(),1 a child of the root. // of client_id_1(),1 and client_id_1(),1 a child of the root.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
...@@ -1676,7 +1676,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications2) { ...@@ -1676,7 +1676,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications2) {
} }
// Assertions for SetWindowVisibility sending notifications. // Assertions for SetWindowVisibility sending notifications.
TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications3) { TEST_F(WindowTreeClientTest, DISABLED_SetWindowVisibilityNotifications3) {
// Create client_id_1(),1 and client_id_1(),2. client_id_1(),2 is made a child // Create client_id_1(),1 and client_id_1(),2. client_id_1(),2 is made a child
// of client_id_1(),1 and client_id_1(),1 a child of the root. // of client_id_1(),1 and client_id_1(),1 a child of the root.
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
...@@ -1721,7 +1721,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications3) { ...@@ -1721,7 +1721,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowVisibilityNotifications3) {
// Tests that when opacity is set on a window, that the calling client is not // Tests that when opacity is set on a window, that the calling client is not
// notified, however children are. Also that setting the same opacity is // notified, however children are. Also that setting the same opacity is
// rejected and no one is notified. // rejected and no one is notified.
TEST_F(WindowTreeClientTest2, DISABLED_SetOpacityNotifications) { TEST_F(WindowTreeClientTest, DISABLED_SetOpacityNotifications) {
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
ASSERT_TRUE(window_1_1); ASSERT_TRUE(window_1_1);
...@@ -1753,7 +1753,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetOpacityNotifications) { ...@@ -1753,7 +1753,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetOpacityNotifications) {
EXPECT_TRUE(changes2()->empty()); EXPECT_TRUE(changes2()->empty());
} }
TEST_F(WindowTreeClientTest2, DISABLED_SetWindowProperty) { TEST_F(WindowTreeClientTest, DISABLED_SetWindowProperty) {
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
ASSERT_TRUE(window_1_1); ASSERT_TRUE(window_1_1);
...@@ -1804,7 +1804,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowProperty) { ...@@ -1804,7 +1804,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SetWindowProperty) {
} }
} }
TEST_F(WindowTreeClientTest2, DISABLED_OnEmbeddedAppDisconnected) { TEST_F(WindowTreeClientTest, DISABLED_OnEmbeddedAppDisconnected) {
// Create client 2 and 3. // Create client 2 and 3.
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -1833,7 +1833,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_OnEmbeddedAppDisconnected) { ...@@ -1833,7 +1833,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_OnEmbeddedAppDisconnected) {
// Verifies when the parent of an Embed() is destroyed the embedded app gets // Verifies when the parent of an Embed() is destroyed the embedded app gets
// a WindowDeleted (and doesn't trigger a DCHECK). // a WindowDeleted (and doesn't trigger a DCHECK).
TEST_F(WindowTreeClientTest2, DISABLED_OnParentOfEmbedDisconnects) { TEST_F(WindowTreeClientTest, DISABLED_OnParentOfEmbedDisconnects) {
// Create client 2 and 3. // Create client 2 and 3.
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -1860,7 +1860,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_OnParentOfEmbedDisconnects) { ...@@ -1860,7 +1860,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_OnParentOfEmbedDisconnects) {
// Verifies WindowTreeImpl doesn't incorrectly erase from its internal // Verifies WindowTreeImpl doesn't incorrectly erase from its internal
// map when a window from another client with the same window_id is removed. // map when a window from another client with the same window_id is removed.
TEST_F(WindowTreeClientTest2, DISABLED_DontCleanMapOnDestroy) { TEST_F(WindowTreeClientTest, DISABLED_DontCleanMapOnDestroy) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
ASSERT_TRUE(wt_client2()->NewWindow(1)); ASSERT_TRUE(wt_client2()->NewWindow(1));
...@@ -1877,7 +1877,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_DontCleanMapOnDestroy) { ...@@ -1877,7 +1877,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_DontCleanMapOnDestroy) {
} }
// Verifies Embed() works when supplying a WindowTreeClient. // Verifies Embed() works when supplying a WindowTreeClient.
TEST_F(WindowTreeClientTest2, EmbedSupplyingWindowTreeClient) { TEST_F(WindowTreeClientTest, EmbedSupplyingWindowTreeClient) {
ASSERT_TRUE(wt_client1()->NewWindow(1)); ASSERT_TRUE(wt_client1()->NewWindow(1));
TestWindowTreeClient2 client2; TestWindowTreeClient2 client2;
...@@ -1891,7 +1891,7 @@ TEST_F(WindowTreeClientTest2, EmbedSupplyingWindowTreeClient) { ...@@ -1891,7 +1891,7 @@ TEST_F(WindowTreeClientTest2, EmbedSupplyingWindowTreeClient) {
SingleChangeToDescription(*client2.tracker()->changes())); SingleChangeToDescription(*client2.tracker()->changes()));
} }
TEST_F(WindowTreeClientTest2, DISABLED_EmbedUsingToken) { TEST_F(WindowTreeClientTest, DISABLED_EmbedUsingToken) {
// Embed client2. // Embed client2.
ASSERT_TRUE(wt_client1()->NewWindow(1)); ASSERT_TRUE(wt_client1()->NewWindow(1));
TestWindowTreeClient2 client2; TestWindowTreeClient2 client2;
...@@ -1931,7 +1931,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedUsingToken) { ...@@ -1931,7 +1931,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedUsingToken) {
base::UnguessableToken::Create())); base::UnguessableToken::Create()));
} }
TEST_F(WindowTreeClientTest2, DISABLED_EmbedUsingTokenFailsWithInvalidWindow) { TEST_F(WindowTreeClientTest, DISABLED_EmbedUsingTokenFailsWithInvalidWindow) {
// Embed client2. // Embed client2.
ASSERT_TRUE(wt_client1()->NewWindow(1)); ASSERT_TRUE(wt_client1()->NewWindow(1));
TestWindowTreeClient2 client2; TestWindowTreeClient2 client2;
...@@ -1957,7 +1957,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedUsingTokenFailsWithInvalidWindow) { ...@@ -1957,7 +1957,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedUsingTokenFailsWithInvalidWindow) {
BuildWindowId(client_id_2(), 121), token)); BuildWindowId(client_id_2(), 121), token));
} }
TEST_F(WindowTreeClientTest2, EmbedFailsFromOtherClient) { TEST_F(WindowTreeClientTest, EmbedFailsFromOtherClient) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -1980,7 +1980,7 @@ TEST_F(WindowTreeClientTest2, EmbedFailsFromOtherClient) { ...@@ -1980,7 +1980,7 @@ TEST_F(WindowTreeClientTest2, EmbedFailsFromOtherClient) {
} }
// Verifies Embed() from window manager on another clients window works. // Verifies Embed() from window manager on another clients window works.
TEST_F(WindowTreeClientTest2, DISABLED_EmbedFromOtherClient) { TEST_F(WindowTreeClientTest, DISABLED_EmbedFromOtherClient) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -2000,7 +2000,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedFromOtherClient) { ...@@ -2000,7 +2000,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_EmbedFromOtherClient) {
EXPECT_EQ(std::string(), SingleChangeToDescription(*changes2())); EXPECT_EQ(std::string(), SingleChangeToDescription(*changes2()));
} }
TEST_F(WindowTreeClientTest2, DISABLED_CantEmbedFromClientRoot) { TEST_F(WindowTreeClientTest, DISABLED_CantEmbedFromClientRoot) {
// Shouldn't be able to embed into the root. // Shouldn't be able to embed into the root.
ASSERT_FALSE(EmbedUrl(connector(), wt1(), test_name(), root_window_id())); ASSERT_FALSE(EmbedUrl(connector(), wt1(), test_name(), root_window_id()));
...@@ -2031,7 +2031,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_CantEmbedFromClientRoot) { ...@@ -2031,7 +2031,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_CantEmbedFromClientRoot) {
} }
// Verifies that a transient window tracks its parent's lifetime. // Verifies that a transient window tracks its parent's lifetime.
TEST_F(WindowTreeClientTest2, TEST_F(WindowTreeClientTest,
DISABLED_TransientWindowTracksTransientParentLifetime) { DISABLED_TransientWindowTracksTransientParentLifetime) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true)); ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
Id window_1_1 = BuildWindowId(client_id_1(), 1); Id window_1_1 = BuildWindowId(client_id_1(), 1);
...@@ -2085,7 +2085,7 @@ TEST_F(WindowTreeClientTest2, ...@@ -2085,7 +2085,7 @@ TEST_F(WindowTreeClientTest2,
ChangesToDescription1(*changes1())[1]); ChangesToDescription1(*changes1())[1]);
} }
TEST_F(WindowTreeClientTest2, DISABLED_Ids) { TEST_F(WindowTreeClientTest, DISABLED_Ids) {
const Id window_1_100 = wt_client1()->NewWindow(100); const Id window_1_100 = wt_client1()->NewWindow(100);
ASSERT_TRUE(window_1_100); ASSERT_TRUE(window_1_100);
ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_100)); ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_100));
...@@ -2132,7 +2132,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_Ids) { ...@@ -2132,7 +2132,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_Ids) {
// Tests that setting capture fails when no input event has occurred, and there // Tests that setting capture fails when no input event has occurred, and there
// is no notification of lost capture. // is no notification of lost capture.
TEST_F(WindowTreeClientTest2, ExplicitCaptureWithoutInput) { TEST_F(WindowTreeClientTest, ExplicitCaptureWithoutInput) {
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
// Add the window to the root, so that they have a Display to handle input // Add the window to the root, so that they have a Display to handle input
...@@ -2154,7 +2154,7 @@ TEST_F(WindowTreeClientTest2, ExplicitCaptureWithoutInput) { ...@@ -2154,7 +2154,7 @@ TEST_F(WindowTreeClientTest2, ExplicitCaptureWithoutInput) {
// TODO(jonross): Enable this once apptests can send input events to the server. // TODO(jonross): Enable this once apptests can send input events to the server.
// Enabling capture requires that the client be processing events. // Enabling capture requires that the client be processing events.
TEST_F(WindowTreeClientTest2, DISABLED_ExplicitCapturePropagation) { TEST_F(WindowTreeClientTest, DISABLED_ExplicitCapturePropagation) {
Id window_1_1 = wt_client1()->NewWindow(1); Id window_1_1 = wt_client1()->NewWindow(1);
Id window_1_2 = wt_client1()->NewWindow(2); Id window_1_2 = wt_client1()->NewWindow(2);
...@@ -2181,7 +2181,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_ExplicitCapturePropagation) { ...@@ -2181,7 +2181,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_ExplicitCapturePropagation) {
EXPECT_TRUE(changes1()->empty()); EXPECT_TRUE(changes1()->empty());
} }
TEST_F(WindowTreeClientTest2, DISABLED_SurfaceIdPropagation) { TEST_F(WindowTreeClientTest, DISABLED_SurfaceIdPropagation) {
const Id window_1_100 = wt_client1()->NewWindow(100); const Id window_1_100 = wt_client1()->NewWindow(100);
ASSERT_TRUE(window_1_100); ASSERT_TRUE(window_1_100);
ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_100)); ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_100));
...@@ -2269,7 +2269,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SurfaceIdPropagation) { ...@@ -2269,7 +2269,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_SurfaceIdPropagation) {
// Verifies when an unknown window with a known child is added to a hierarchy // Verifies when an unknown window with a known child is added to a hierarchy
// the known child is identified in the WindowData. // the known child is identified in the WindowData.
TEST_F(WindowTreeClientTest2, DISABLED_AddUnknownWindowKnownParent) { TEST_F(WindowTreeClientTest, DISABLED_AddUnknownWindowKnownParent) {
const Id window_1_100 = wt_client1()->NewWindow(100); const Id window_1_100 = wt_client1()->NewWindow(100);
ASSERT_TRUE(window_1_100); ASSERT_TRUE(window_1_100);
ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_100)); ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_100));
...@@ -2300,7 +2300,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_AddUnknownWindowKnownParent) { ...@@ -2300,7 +2300,7 @@ TEST_F(WindowTreeClientTest2, DISABLED_AddUnknownWindowKnownParent) {
ChangeWindowDescription(*changes1())); ChangeWindowDescription(*changes1()));
} }
TEST_F(WindowTreeClientTest2, DISABLED_Transform) { TEST_F(WindowTreeClientTest, DISABLED_Transform) {
const Id window1 = wt_client1()->NewWindow(100); const Id window1 = wt_client1()->NewWindow(100);
ASSERT_TRUE(window1); ASSERT_TRUE(window1);
ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window1)); ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window1));
......
services/ui/ws2/window_tree_unittest.cc
View file @ 4c8bcd01
...@@ -84,7 +84,7 @@ void EmbedUsingTokenCallback(bool* was_called, ...@@ -84,7 +84,7 @@ void EmbedUsingTokenCallback(bool* was_called,
*result_value = actual_result; *result_value = actual_result;
} }
TEST(WindowTreeTest2, NewWindow) { TEST(WindowTreeTest, NewWindow) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
EXPECT_TRUE(setup.changes()->empty()); EXPECT_TRUE(setup.changes()->empty());
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
...@@ -93,7 +93,7 @@ TEST(WindowTreeTest2, NewWindow) { ...@@ -93,7 +93,7 @@ TEST(WindowTreeTest2, NewWindow) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, NewWindowWithProperties) { TEST(WindowTreeTest, NewWindowWithProperties) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
EXPECT_TRUE(setup.changes()->empty()); EXPECT_TRUE(setup.changes()->empty());
aura::PropertyConverter::PrimitiveType value = true; aura::PropertyConverter::PrimitiveType value = true;
...@@ -106,7 +106,7 @@ TEST(WindowTreeTest2, NewWindowWithProperties) { ...@@ -106,7 +106,7 @@ TEST(WindowTreeTest2, NewWindowWithProperties) {
EXPECT_TRUE(window->GetProperty(aura::client::kAlwaysOnTopKey)); EXPECT_TRUE(window->GetProperty(aura::client::kAlwaysOnTopKey));
} }
TEST(WindowTreeTest2, NewTopLevelWindow) { TEST(WindowTreeTest, NewTopLevelWindow) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
EXPECT_TRUE(setup.changes()->empty()); EXPECT_TRUE(setup.changes()->empty());
aura::Window* top_level = aura::Window* top_level =
...@@ -116,7 +116,7 @@ TEST(WindowTreeTest2, NewTopLevelWindow) { ...@@ -116,7 +116,7 @@ TEST(WindowTreeTest2, NewTopLevelWindow) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, NewTopLevelWindowWithProperties) { TEST(WindowTreeTest, NewTopLevelWindowWithProperties) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
EXPECT_TRUE(setup.changes()->empty()); EXPECT_TRUE(setup.changes()->empty());
aura::PropertyConverter::PrimitiveType value = true; aura::PropertyConverter::PrimitiveType value = true;
...@@ -129,7 +129,7 @@ TEST(WindowTreeTest2, NewTopLevelWindowWithProperties) { ...@@ -129,7 +129,7 @@ TEST(WindowTreeTest2, NewTopLevelWindowWithProperties) {
EXPECT_TRUE(top_level->GetProperty(aura::client::kAlwaysOnTopKey)); EXPECT_TRUE(top_level->GetProperty(aura::client::kAlwaysOnTopKey));
} }
TEST(WindowTreeTest2, SetTopLevelWindowBounds) { TEST(WindowTreeTest, SetTopLevelWindowBounds) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -180,7 +180,7 @@ TEST(WindowTreeTest2, SetTopLevelWindowBounds) { ...@@ -180,7 +180,7 @@ TEST(WindowTreeTest2, SetTopLevelWindowBounds) {
ChangeToDescription((*setup.changes())[1])); ChangeToDescription((*setup.changes())[1]));
} }
TEST(WindowTreeTest2, SetTopLevelWindowBoundsFailsForSameSize) { TEST(WindowTreeTest, SetTopLevelWindowBoundsFailsForSameSize) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -188,7 +188,7 @@ TEST(WindowTreeTest2, SetTopLevelWindowBoundsFailsForSameSize) { ...@@ -188,7 +188,7 @@ TEST(WindowTreeTest2, SetTopLevelWindowBoundsFailsForSameSize) {
const gfx::Rect bounds = gfx::Rect(1, 2, 300, 400); const gfx::Rect bounds = gfx::Rect(1, 2, 300, 400);
top_level->SetBounds(bounds); top_level->SetBounds(bounds);
setup.changes()->clear(); setup.changes()->clear();
// WindowTreeTest2Helper::SetWindowBounds() uses a null LocalSurfaceId, which // WindowTreeTestHelper::SetWindowBounds() uses a null LocalSurfaceId, which
// differs from the current LocalSurfaceId (assigned by ClientRoot). Because // differs from the current LocalSurfaceId (assigned by ClientRoot). Because
// of this, the LocalSurfaceIds differ and the call returns false. // of this, the LocalSurfaceIds differ and the call returns false.
EXPECT_FALSE( EXPECT_FALSE(
...@@ -196,7 +196,7 @@ TEST(WindowTreeTest2, SetTopLevelWindowBoundsFailsForSameSize) { ...@@ -196,7 +196,7 @@ TEST(WindowTreeTest2, SetTopLevelWindowBoundsFailsForSameSize) {
EXPECT_TRUE(setup.changes()->empty()); EXPECT_TRUE(setup.changes()->empty());
} }
TEST(WindowTreeTest2, SetChildWindowBounds) { TEST(WindowTreeTest, SetChildWindowBounds) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
ASSERT_TRUE(window); ASSERT_TRUE(window);
...@@ -209,7 +209,7 @@ TEST(WindowTreeTest2, SetChildWindowBounds) { ...@@ -209,7 +209,7 @@ TEST(WindowTreeTest2, SetChildWindowBounds) {
EXPECT_EQ(bounds, window->bounds()); EXPECT_EQ(bounds, window->bounds());
} }
TEST(WindowTreeTest2, SetBoundsAtEmbedWindow) { TEST(WindowTreeTest, SetBoundsAtEmbedWindow) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
ASSERT_TRUE(window); ASSERT_TRUE(window);
...@@ -247,7 +247,7 @@ TEST(WindowTreeTest2, SetBoundsAtEmbedWindow) { ...@@ -247,7 +247,7 @@ TEST(WindowTreeTest2, SetBoundsAtEmbedWindow) {
} }
// Tests the ability of the client to change properties on the server. // Tests the ability of the client to change properties on the server.
TEST(WindowTreeTest2, SetTopLevelWindowProperty) { TEST(WindowTreeTest, SetTopLevelWindowProperty) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -272,7 +272,7 @@ TEST(WindowTreeTest2, SetTopLevelWindowProperty) { ...@@ -272,7 +272,7 @@ TEST(WindowTreeTest2, SetTopLevelWindowProperty) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, WindowToWindowData) { TEST(WindowTreeTest, WindowToWindowData) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
setup.changes()->clear(); setup.changes()->clear();
...@@ -292,7 +292,7 @@ TEST(WindowTreeTest2, WindowToWindowData) { ...@@ -292,7 +292,7 @@ TEST(WindowTreeTest2, WindowToWindowData) {
data->properties[ui::mojom::WindowManager::kAlwaysOnTop_Property])); data->properties[ui::mojom::WindowManager::kAlwaysOnTop_Property]));
} }
TEST(WindowTreeTest2, MovePressDragRelease) { TEST(WindowTreeTest, MovePressDragRelease) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
TestWindowTreeClient* window_tree_client = setup.window_tree_client(); TestWindowTreeClient* window_tree_client = setup.window_tree_client();
aura::Window* top_level = aura::Window* top_level =
...@@ -325,7 +325,7 @@ TEST(WindowTreeTest2, MovePressDragRelease) { ...@@ -325,7 +325,7 @@ TEST(WindowTreeTest2, MovePressDragRelease) {
} }
// Used to verify destruction with a touch pointer down doesn't crash. // Used to verify destruction with a touch pointer down doesn't crash.
TEST(WindowTreeTest2, ShutdownWithTouchDown) { TEST(WindowTreeTest, ShutdownWithTouchDown) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -338,7 +338,7 @@ TEST(WindowTreeTest2, ShutdownWithTouchDown) { ...@@ -338,7 +338,7 @@ TEST(WindowTreeTest2, ShutdownWithTouchDown) {
event_generator.PressTouch(); event_generator.PressTouch();
} }
TEST(WindowTreeTest2, TouchPressDragRelease) { TEST(WindowTreeTest, TouchPressDragRelease) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
TestWindowTreeClient* window_tree_client = setup.window_tree_client(); TestWindowTreeClient* window_tree_client = setup.window_tree_client();
aura::Window* top_level = aura::Window* top_level =
...@@ -396,7 +396,7 @@ class EventRecordingWindowDelegate : public aura::test::TestWindowDelegate { ...@@ -396,7 +396,7 @@ class EventRecordingWindowDelegate : public aura::test::TestWindowDelegate {
DISALLOW_COPY_AND_ASSIGN(EventRecordingWindowDelegate); DISALLOW_COPY_AND_ASSIGN(EventRecordingWindowDelegate);
}; };
TEST(WindowTreeTest2, MoveFromClientToNonClient) { TEST(WindowTreeTest, MoveFromClientToNonClient) {
EventRecordingWindowDelegate window_delegate; EventRecordingWindowDelegate window_delegate;
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
TestWindowTreeClient* window_tree_client = setup.window_tree_client(); TestWindowTreeClient* window_tree_client = setup.window_tree_client();
...@@ -474,7 +474,7 @@ TEST(WindowTreeTest2, MoveFromClientToNonClient) { ...@@ -474,7 +474,7 @@ TEST(WindowTreeTest2, MoveFromClientToNonClient) {
ASSERT_FALSE(window_delegate.PopEvent().get()); ASSERT_FALSE(window_delegate.PopEvent().get());
} }
TEST(WindowTreeTest2, MouseDownInNonClientWithChildWindow) { TEST(WindowTreeTest, MouseDownInNonClientWithChildWindow) {
EventRecordingWindowDelegate window_delegate; EventRecordingWindowDelegate window_delegate;
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
TestWindowTreeClient* window_tree_client = setup.window_tree_client(); TestWindowTreeClient* window_tree_client = setup.window_tree_client();
...@@ -517,7 +517,7 @@ TEST(WindowTreeTest2, MouseDownInNonClientWithChildWindow) { ...@@ -517,7 +517,7 @@ TEST(WindowTreeTest2, MouseDownInNonClientWithChildWindow) {
window_delegate.PopEvent().get())); window_delegate.PopEvent().get()));
} }
TEST(WindowTreeTest2, MouseDownInNonClientDragToClientWithChildWindow) { TEST(WindowTreeTest, MouseDownInNonClientDragToClientWithChildWindow) {
EventRecordingWindowDelegate window_delegate; EventRecordingWindowDelegate window_delegate;
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
setup.delegate()->set_delegate_for_next_top_level(&window_delegate); setup.delegate()->set_delegate_for_next_top_level(&window_delegate);
...@@ -552,7 +552,7 @@ TEST(WindowTreeTest2, MouseDownInNonClientDragToClientWithChildWindow) { ...@@ -552,7 +552,7 @@ TEST(WindowTreeTest2, MouseDownInNonClientDragToClientWithChildWindow) {
EXPECT_TRUE(window_tree_client->input_events().empty()); EXPECT_TRUE(window_tree_client->input_events().empty());
} }
TEST(WindowTreeTest2, PointerWatcher) { TEST(WindowTreeTest, PointerWatcher) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
TestWindowTreeClient* window_tree_client = setup.window_tree_client(); TestWindowTreeClient* window_tree_client = setup.window_tree_client();
aura::Window* top_level = aura::Window* top_level =
...@@ -599,7 +599,7 @@ TEST(WindowTreeTest2, PointerWatcher) { ...@@ -599,7 +599,7 @@ TEST(WindowTreeTest2, PointerWatcher) {
window_tree_client->PopObservedPointerEvent().event.get())); window_tree_client->PopObservedPointerEvent().event.get()));
} }
TEST(WindowTreeTest2, MatchesPointerWatcherSet) { TEST(WindowTreeTest, MatchesPointerWatcherSet) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
TestWindowTreeClient* window_tree_client = setup.window_tree_client(); TestWindowTreeClient* window_tree_client = setup.window_tree_client();
aura::Window* top_level = aura::Window* top_level =
...@@ -629,7 +629,7 @@ TEST(WindowTreeTest2, MatchesPointerWatcherSet) { ...@@ -629,7 +629,7 @@ TEST(WindowTreeTest2, MatchesPointerWatcherSet) {
EXPECT_TRUE(window_tree_client->observed_pointer_events().empty()); EXPECT_TRUE(window_tree_client->observed_pointer_events().empty());
} }
TEST(WindowTreeTest2, Capture) { TEST(WindowTreeTest, Capture) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
...@@ -652,7 +652,7 @@ TEST(WindowTreeTest2, Capture) { ...@@ -652,7 +652,7 @@ TEST(WindowTreeTest2, Capture) {
EXPECT_TRUE(setup.window_tree_test_helper()->ReleaseCapture(window)); EXPECT_TRUE(setup.window_tree_test_helper()->ReleaseCapture(window));
} }
TEST(WindowTreeTest2, TransferCaptureToClient) { TEST(WindowTreeTest, TransferCaptureToClient) {
EventRecordingWindowDelegate window_delegate; EventRecordingWindowDelegate window_delegate;
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
setup.delegate()->set_delegate_for_next_top_level(&window_delegate); setup.delegate()->set_delegate_for_next_top_level(&window_delegate);
...@@ -688,7 +688,7 @@ TEST(WindowTreeTest2, TransferCaptureToClient) { ...@@ -688,7 +688,7 @@ TEST(WindowTreeTest2, TransferCaptureToClient) {
EXPECT_TRUE(setup.window_tree_client()->input_events().empty()); EXPECT_TRUE(setup.window_tree_client()->input_events().empty());
} }
TEST(WindowTreeTest2, TransferCaptureBetweenParentAndChild) { TEST(WindowTreeTest, TransferCaptureBetweenParentAndChild) {
EventRecordingWindowDelegate window_delegate; EventRecordingWindowDelegate window_delegate;
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
setup.delegate()->set_delegate_for_next_top_level(&window_delegate); setup.delegate()->set_delegate_for_next_top_level(&window_delegate);
...@@ -734,7 +734,7 @@ TEST(WindowTreeTest2, TransferCaptureBetweenParentAndChild) { ...@@ -734,7 +734,7 @@ TEST(WindowTreeTest2, TransferCaptureBetweenParentAndChild) {
EXPECT_TRUE(embedding_helper->window_tree_client.input_events().empty()); EXPECT_TRUE(embedding_helper->window_tree_client.input_events().empty());
} }
TEST(WindowTreeTest2, CaptureNotification) { TEST(WindowTreeTest, CaptureNotification) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
aura::Window* top_level = aura::Window* top_level =
...@@ -752,7 +752,7 @@ TEST(WindowTreeTest2, CaptureNotification) { ...@@ -752,7 +752,7 @@ TEST(WindowTreeTest2, CaptureNotification) {
SingleChangeToDescription(*(setup.changes()))); SingleChangeToDescription(*(setup.changes())));
} }
TEST(WindowTreeTest2, CaptureNotificationForEmbedRoot) { TEST(WindowTreeTest, CaptureNotificationForEmbedRoot) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
aura::Window* top_level = aura::Window* top_level =
...@@ -795,7 +795,7 @@ TEST(WindowTreeTest2, CaptureNotificationForEmbedRoot) { ...@@ -795,7 +795,7 @@ TEST(WindowTreeTest2, CaptureNotificationForEmbedRoot) {
EXPECT_TRUE(embedding_helper->changes()->empty()); EXPECT_TRUE(embedding_helper->changes()->empty());
} }
TEST(WindowTreeTest2, CaptureNotificationForTopLevel) { TEST(WindowTreeTest, CaptureNotificationForTopLevel) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(11); setup.window_tree_test_helper()->NewTopLevelWindow(11);
...@@ -826,7 +826,7 @@ TEST(WindowTreeTest2, CaptureNotificationForTopLevel) { ...@@ -826,7 +826,7 @@ TEST(WindowTreeTest2, CaptureNotificationForTopLevel) {
SingleChangeToDescription(*(setup.changes()))); SingleChangeToDescription(*(setup.changes())));
} }
TEST(WindowTreeTest2, EventsGoToCaptureWindow) { TEST(WindowTreeTest, EventsGoToCaptureWindow) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
aura::Window* top_level = aura::Window* top_level =
...@@ -856,7 +856,7 @@ TEST(WindowTreeTest2, EventsGoToCaptureWindow) { ...@@ -856,7 +856,7 @@ TEST(WindowTreeTest2, EventsGoToCaptureWindow) {
LocatedEventToEventTypeAndLocation(drag_event.event.get())); LocatedEventToEventTypeAndLocation(drag_event.event.get()));
} }
TEST(WindowTreeTest2, InterceptEventsOnEmbeddedWindowWithCapture) { TEST(WindowTreeTest, InterceptEventsOnEmbeddedWindowWithCapture) {
EventRecordingWindowDelegate window_delegate; EventRecordingWindowDelegate window_delegate;
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
...@@ -902,7 +902,7 @@ TEST(WindowTreeTest2, InterceptEventsOnEmbeddedWindowWithCapture) { ...@@ -902,7 +902,7 @@ TEST(WindowTreeTest2, InterceptEventsOnEmbeddedWindowWithCapture) {
EXPECT_TRUE(embedding_helper->window_tree_client.input_events().empty()); EXPECT_TRUE(embedding_helper->window_tree_client.input_events().empty());
} }
TEST(WindowTreeTest2, PointerDownResetOnCaptureChange) { TEST(WindowTreeTest, PointerDownResetOnCaptureChange) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
ASSERT_TRUE(window); ASSERT_TRUE(window);
...@@ -934,7 +934,7 @@ TEST(WindowTreeTest2, PointerDownResetOnCaptureChange) { ...@@ -934,7 +934,7 @@ TEST(WindowTreeTest2, PointerDownResetOnCaptureChange) {
MouseEvent::kMousePointerId)); MouseEvent::kMousePointerId));
} }
TEST(WindowTreeTest2, PointerDownResetOnHide) { TEST(WindowTreeTest, PointerDownResetOnHide) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -960,7 +960,7 @@ TEST(WindowTreeTest2, PointerDownResetOnHide) { ...@@ -960,7 +960,7 @@ TEST(WindowTreeTest2, PointerDownResetOnHide) {
MouseEvent::kMousePointerId)); MouseEvent::kMousePointerId));
} }
TEST(WindowTreeTest2, DeleteWindow) { TEST(WindowTreeTest, DeleteWindow) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
ASSERT_TRUE(window); ASSERT_TRUE(window);
...@@ -973,7 +973,7 @@ TEST(WindowTreeTest2, DeleteWindow) { ...@@ -973,7 +973,7 @@ TEST(WindowTreeTest2, DeleteWindow) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, DeleteTopLevel) { TEST(WindowTreeTest, DeleteTopLevel) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -996,7 +996,7 @@ TEST(WindowTreeTest2, DeleteTopLevel) { ...@@ -996,7 +996,7 @@ TEST(WindowTreeTest2, DeleteTopLevel) {
setup.window_tree_test_helper()->GetWindowByClientId(top_level_id)); setup.window_tree_test_helper()->GetWindowByClientId(top_level_id));
} }
TEST(WindowTreeTest2, ExternalDeleteWindow) { TEST(WindowTreeTest, ExternalDeleteWindow) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
ASSERT_TRUE(window); ASSERT_TRUE(window);
...@@ -1006,7 +1006,7 @@ TEST(WindowTreeTest2, ExternalDeleteWindow) { ...@@ -1006,7 +1006,7 @@ TEST(WindowTreeTest2, ExternalDeleteWindow) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, Embed) { TEST(WindowTreeTest, Embed) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window = setup.window_tree_test_helper()->NewWindow(); aura::Window* window = setup.window_tree_test_helper()->NewWindow();
aura::Window* embed_window = setup.window_tree_test_helper()->NewWindow(); aura::Window* embed_window = setup.window_tree_test_helper()->NewWindow();
...@@ -1128,7 +1128,7 @@ TEST_F(WindowTreeScheduleEmbedTest, ScheduleEmbed) { ...@@ -1128,7 +1128,7 @@ TEST_F(WindowTreeScheduleEmbedTest, ScheduleEmbed) {
SingleChangeToDescription(*embed_client_.tracker()->changes())); SingleChangeToDescription(*embed_client_.tracker()->changes()));
} }
TEST(WindowTreeTest2, ScheduleEmbedForExistingClient) { TEST(WindowTreeTest, ScheduleEmbedForExistingClient) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
// Schedule an embed in the tree created by |setup|. // Schedule an embed in the tree created by |setup|.
base::UnguessableToken token; base::UnguessableToken token;
...@@ -1168,7 +1168,7 @@ TEST(WindowTreeTest2, ScheduleEmbedForExistingClient) { ...@@ -1168,7 +1168,7 @@ TEST(WindowTreeTest2, ScheduleEmbedForExistingClient) {
setup.window_tree_test_helper()->TransportIdForWindow(window_in_parent)); setup.window_tree_test_helper()->TransportIdForWindow(window_in_parent));
} }
TEST(WindowTreeTest2, DeleteRootOfEmbeddingFromScheduleEmbedForExistingClient) { TEST(WindowTreeTest, DeleteRootOfEmbeddingFromScheduleEmbedForExistingClient) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* window_in_parent = setup.window_tree_test_helper()->NewWindow(); aura::Window* window_in_parent = setup.window_tree_test_helper()->NewWindow();
ASSERT_TRUE(window_in_parent); ASSERT_TRUE(window_in_parent);
...@@ -1208,7 +1208,7 @@ TEST(WindowTreeTest2, DeleteRootOfEmbeddingFromScheduleEmbedForExistingClient) { ...@@ -1208,7 +1208,7 @@ TEST(WindowTreeTest2, DeleteRootOfEmbeddingFromScheduleEmbedForExistingClient) {
SingleChangeToDescription(*client2.tracker()->changes())); SingleChangeToDescription(*client2.tracker()->changes()));
} }
TEST(WindowTreeTest2, StackAtTop) { TEST(WindowTreeTest, StackAtTop) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level1 = aura::Window* top_level1 =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1239,7 +1239,7 @@ TEST(WindowTreeTest2, StackAtTop) { ...@@ -1239,7 +1239,7 @@ TEST(WindowTreeTest2, StackAtTop) {
setup.window_tree_test_helper()->StackAtTop(non_top_level_window)); setup.window_tree_test_helper()->StackAtTop(non_top_level_window));
} }
TEST(WindowTreeTest2, OnUnhandledKeyEvent) { TEST(WindowTreeTest, OnUnhandledKeyEvent) {
// Create a top-level, show it and give it focus. // Create a top-level, show it and give it focus.
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
...@@ -1273,7 +1273,7 @@ TEST(WindowTreeTest2, OnUnhandledKeyEvent) { ...@@ -1273,7 +1273,7 @@ TEST(WindowTreeTest2, OnUnhandledKeyEvent) {
EXPECT_TRUE(setup.delegate()->unhandled_key_events()->empty()); EXPECT_TRUE(setup.delegate()->unhandled_key_events()->empty());
} }
TEST(WindowTreeTest2, ReorderWindow) { TEST(WindowTreeTest, ReorderWindow) {
// Create a top-level and two child windows. // Create a top-level and two child windows.
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
...@@ -1322,7 +1322,7 @@ TEST(WindowTreeTest2, ReorderWindow) { ...@@ -1322,7 +1322,7 @@ TEST(WindowTreeTest2, ReorderWindow) {
top_level, window2, mojom::OrderDirection::ABOVE)); top_level, window2, mojom::OrderDirection::ABOVE));
} }
TEST(WindowTreeTest2, StackAbove) { TEST(WindowTreeTest, StackAbove) {
// Create two top-levels. // Create two top-levels.
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level1 = aura::Window* top_level1 =
...@@ -1381,7 +1381,7 @@ TEST(WindowTreeTest2, StackAbove) { ...@@ -1381,7 +1381,7 @@ TEST(WindowTreeTest2, StackAbove) {
top_level1, non_top_level_window)); top_level1, non_top_level_window));
} }
TEST(WindowTreeTest2, RunMoveLoopTouch) { TEST(WindowTreeTest, RunMoveLoopTouch) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1426,7 +1426,7 @@ TEST(WindowTreeTest2, RunMoveLoopTouch) { ...@@ -1426,7 +1426,7 @@ TEST(WindowTreeTest2, RunMoveLoopTouch) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, RunMoveLoopMouse) { TEST(WindowTreeTest, RunMoveLoopMouse) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1461,7 +1461,7 @@ TEST(WindowTreeTest2, RunMoveLoopMouse) { ...@@ -1461,7 +1461,7 @@ TEST(WindowTreeTest2, RunMoveLoopMouse) {
setup.changes()->clear(); setup.changes()->clear();
} }
TEST(WindowTreeTest2, CancelMoveLoop) { TEST(WindowTreeTest, CancelMoveLoop) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1500,7 +1500,7 @@ TEST(WindowTreeTest2, CancelMoveLoop) { ...@@ -1500,7 +1500,7 @@ TEST(WindowTreeTest2, CancelMoveLoop) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, CancelMode) { TEST(WindowTreeTest, CancelMode) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1514,7 +1514,7 @@ TEST(WindowTreeTest2, CancelMode) { ...@@ -1514,7 +1514,7 @@ TEST(WindowTreeTest2, CancelMode) {
setup.window_tree_client()->PopInputEvent().event.get())); setup.window_tree_client()->PopInputEvent().event.get()));
} }
TEST(WindowTreeTest2, PerformDragDrop) { TEST(WindowTreeTest, PerformDragDrop) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1559,7 +1559,7 @@ TEST(WindowTreeTest2, PerformDragDrop) { ...@@ -1559,7 +1559,7 @@ TEST(WindowTreeTest2, PerformDragDrop) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, PerformDragDropBeforePreviousOneFinish) { TEST(WindowTreeTest, PerformDragDropBeforePreviousOneFinish) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1606,7 +1606,7 @@ TEST(WindowTreeTest2, PerformDragDropBeforePreviousOneFinish) { ...@@ -1606,7 +1606,7 @@ TEST(WindowTreeTest2, PerformDragDropBeforePreviousOneFinish) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, CancelDragDrop) { TEST(WindowTreeTest, CancelDragDrop) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1649,7 +1649,7 @@ TEST(WindowTreeTest2, CancelDragDrop) { ...@@ -1649,7 +1649,7 @@ TEST(WindowTreeTest2, CancelDragDrop) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, CancelDragDropBeforeDragLoopRun) { TEST(WindowTreeTest, CancelDragDropBeforeDragLoopRun) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
...@@ -1681,7 +1681,7 @@ TEST(WindowTreeTest2, CancelDragDropBeforeDragLoopRun) { ...@@ -1681,7 +1681,7 @@ TEST(WindowTreeTest2, CancelDragDropBeforeDragLoopRun) {
SingleChangeToDescription(*setup.changes())); SingleChangeToDescription(*setup.changes()));
} }
TEST(WindowTreeTest2, DsfChanges) { TEST(WindowTreeTest, DsfChanges) {
WindowServiceTestSetup setup; WindowServiceTestSetup setup;
aura::Window* top_level = aura::Window* top_level =
setup.window_tree_test_helper()->NewTopLevelWindow(); setup.window_tree_test_helper()->NewTopLevelWindow();
......
ui/events/event.h
View file @ 4c8bcd01
...@@ -211,7 +211,7 @@ class EVENTS_EXPORT Event { ...@@ -211,7 +211,7 @@ class EVENTS_EXPORT Event {
} }
bool IsScrollEvent() const { bool IsScrollEvent() const {
// Flings can be GestureEvents too. EF_FROM_TOUCH determins if they're // Flings can be GestureEvents too. EF_FROM_TOUCH determines if they're
// Gesture or Scroll events. // Gesture or Scroll events.
return type_ == ET_SCROLL || return type_ == ET_SCROLL ||
((type_ == ET_SCROLL_FLING_START || ((type_ == ET_SCROLL_FLING_START ||
......
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