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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/mus/public/cpp/tests/window_unittest.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase 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/public/cpp/tests/window_tree_client_impl_unittest.cc ('k') | components/mus/public/interfaces/cursor.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/public/cpp/tests/window_unittest.cc
diff --git a/components/mus/public/cpp/tests/window_unittest.cc b/components/mus/public/cpp/tests/window_unittest.cc
index 5b706582457a70c1a15678e5e5644bd7acf08163..09172c677cbf759532b53c958be197cccd604e05 100644
--- a/components/mus/public/cpp/tests/window_unittest.cc
+++ b/components/mus/public/cpp/tests/window_unittest.cc
@@ -516,11 +516,11 @@ TEST_F(WindowObserverTest, Order) {
ASSERT_EQ(2U, changes.size());
EXPECT_EQ(&w11, changes[0].window);
EXPECT_EQ(&w13, changes[0].relative_window);
- EXPECT_EQ(mojom::ORDER_DIRECTION_ABOVE, changes[0].direction);
+ EXPECT_EQ(mojom::OrderDirection::ABOVE, changes[0].direction);
EXPECT_EQ(&w11, changes[1].window);
EXPECT_EQ(&w13, changes[1].relative_window);
- EXPECT_EQ(mojom::ORDER_DIRECTION_ABOVE, changes[1].direction);
+ EXPECT_EQ(mojom::OrderDirection::ABOVE, changes[1].direction);
}
{
@@ -536,11 +536,11 @@ TEST_F(WindowObserverTest, Order) {
ASSERT_EQ(2U, changes.size());
EXPECT_EQ(&w11, changes[0].window);
EXPECT_EQ(&w12, changes[0].relative_window);
- EXPECT_EQ(mojom::ORDER_DIRECTION_BELOW, changes[0].direction);
+ EXPECT_EQ(mojom::OrderDirection::BELOW, changes[0].direction);
EXPECT_EQ(&w11, changes[1].window);
EXPECT_EQ(&w12, changes[1].relative_window);
- EXPECT_EQ(mojom::ORDER_DIRECTION_BELOW, changes[1].direction);
+ EXPECT_EQ(mojom::OrderDirection::BELOW, changes[1].direction);
}
{
@@ -548,7 +548,7 @@ TEST_F(WindowObserverTest, Order) {
// Move w11 above w12.
// Resulting order: w12. w11, w13
- w11.Reorder(&w12, mojom::ORDER_DIRECTION_ABOVE);
+ w11.Reorder(&w12, mojom::OrderDirection::ABOVE);
EXPECT_EQ(&w12, w1.children().front());
EXPECT_EQ(&w13, w1.children().back());
@@ -556,11 +556,11 @@ TEST_F(WindowObserverTest, Order) {
ASSERT_EQ(2U, changes.size());
EXPECT_EQ(&w11, changes[0].window);
EXPECT_EQ(&w12, changes[0].relative_window);
- EXPECT_EQ(mojom::ORDER_DIRECTION_ABOVE, changes[0].direction);
+ EXPECT_EQ(mojom::OrderDirection::ABOVE, changes[0].direction);
EXPECT_EQ(&w11, changes[1].window);
EXPECT_EQ(&w12, changes[1].relative_window);
- EXPECT_EQ(mojom::ORDER_DIRECTION_ABOVE, changes[1].direction);
+ EXPECT_EQ(mojom::OrderDirection::ABOVE, changes[1].direction);
}
{
@@ -568,7 +568,7 @@ TEST_F(WindowObserverTest, Order) {
// Move w11 below w12.
// Resulting order: w11, w12, w13
- w11.Reorder(&w12, mojom::ORDER_DIRECTION_BELOW);
+ w11.Reorder(&w12, mojom::OrderDirection::BELOW);
EXPECT_EQ(&w11, w1.children().front());
EXPECT_EQ(&w13, w1.children().back());
@@ -576,11 +576,11 @@ TEST_F(WindowObserverTest, Order) {
ASSERT_EQ(2U, changes.size());
EXPECT_EQ(&w11, changes[0].window);
EXPECT_EQ(&w12, changes[0].relative_window);
- EXPECT_EQ(mojom::ORDER_DIRECTION_BELOW, changes[0].direction);
+ EXPECT_EQ(mojom::OrderDirection::BELOW, changes[0].direction);
EXPECT_EQ(&w11, changes[1].window);
EXPECT_EQ(&w12, changes[1].relative_window);
- EXPECT_EQ(mojom::ORDER_DIRECTION_BELOW, changes[1].direction);
+ EXPECT_EQ(mojom::OrderDirection::BELOW, changes[1].direction);
}
}
@@ -985,39 +985,39 @@ TEST_F(WindowTest, TransientWindowsGroupAbove) {
EXPECT_EQ(w22, parent->children().back());
EXPECT_EQ("1 11 2 21 211 212 213 22", ChildWindowIDsAsString(parent.get()));
- w11->Reorder(w2.get(), mojom::ORDER_DIRECTION_ABOVE);
+ w11->Reorder(w2.get(), mojom::OrderDirection::ABOVE);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 21 211 212 213 22 1 11", ChildWindowIDsAsString(parent.get()));
- w21->Reorder(w1.get(), mojom::ORDER_DIRECTION_ABOVE);
+ w21->Reorder(w1.get(), mojom::OrderDirection::ABOVE);
EXPECT_EQ(w22, parent->children().back());
EXPECT_EQ("1 11 2 21 211 212 213 22", ChildWindowIDsAsString(parent.get()));
- w21->Reorder(w22, mojom::ORDER_DIRECTION_ABOVE);
+ w21->Reorder(w22, mojom::OrderDirection::ABOVE);
EXPECT_EQ(w213, parent->children().back());
EXPECT_EQ("1 11 2 22 21 211 212 213", ChildWindowIDsAsString(parent.get()));
- w11->Reorder(w21, mojom::ORDER_DIRECTION_ABOVE);
+ w11->Reorder(w21, mojom::OrderDirection::ABOVE);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 22 21 211 212 213 1 11", ChildWindowIDsAsString(parent.get()));
- w213->Reorder(w21, mojom::ORDER_DIRECTION_ABOVE);
+ w213->Reorder(w21, mojom::OrderDirection::ABOVE);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 22 21 213 211 212 1 11", ChildWindowIDsAsString(parent.get()));
// No change when stacking a transient parent above its transient child.
- w21->Reorder(w211, mojom::ORDER_DIRECTION_ABOVE);
+ w21->Reorder(w211, mojom::OrderDirection::ABOVE);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 22 21 213 211 212 1 11", ChildWindowIDsAsString(parent.get()));
// This tests that the order in children_ array rather than in
// transient_children_ array is used when reinserting transient children.
// If transient_children_ array was used '22' would be following '21'.
- w2->Reorder(w1.get(), mojom::ORDER_DIRECTION_ABOVE);
+ w2->Reorder(w1.get(), mojom::OrderDirection::ABOVE);
EXPECT_EQ(w212, parent->children().back());
EXPECT_EQ("1 11 2 22 21 213 211 212", ChildWindowIDsAsString(parent.get()));
- w11->Reorder(w213, mojom::ORDER_DIRECTION_ABOVE);
+ w11->Reorder(w213, mojom::OrderDirection::ABOVE);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 22 21 213 211 212 1 11", ChildWindowIDsAsString(parent.get()));
}
@@ -1063,36 +1063,36 @@ TEST_F(WindowTest, TransientWindowsGroupBelow) {
EXPECT_EQ(w22, parent->children().back());
EXPECT_EQ("1 11 2 21 211 212 213 22", ChildWindowIDsAsString(parent.get()));
- w21->Reorder(w1.get(), mojom::ORDER_DIRECTION_BELOW);
+ w21->Reorder(w1.get(), mojom::OrderDirection::BELOW);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 21 211 212 213 22 1 11", ChildWindowIDsAsString(parent.get()));
- w11->Reorder(w2.get(), mojom::ORDER_DIRECTION_BELOW);
+ w11->Reorder(w2.get(), mojom::OrderDirection::BELOW);
EXPECT_EQ(w22, parent->children().back());
EXPECT_EQ("1 11 2 21 211 212 213 22", ChildWindowIDsAsString(parent.get()));
- w22->Reorder(w21, mojom::ORDER_DIRECTION_BELOW);
+ w22->Reorder(w21, mojom::OrderDirection::BELOW);
EXPECT_EQ(w213, parent->children().back());
EXPECT_EQ("1 11 2 22 21 211 212 213", ChildWindowIDsAsString(parent.get()));
- w21->Reorder(w11, mojom::ORDER_DIRECTION_BELOW);
+ w21->Reorder(w11, mojom::OrderDirection::BELOW);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 22 21 211 212 213 1 11", ChildWindowIDsAsString(parent.get()));
- w213->Reorder(w211, mojom::ORDER_DIRECTION_BELOW);
+ w213->Reorder(w211, mojom::OrderDirection::BELOW);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 22 21 213 211 212 1 11", ChildWindowIDsAsString(parent.get()));
// No change when stacking a transient parent below its transient child.
- w21->Reorder(w211, mojom::ORDER_DIRECTION_BELOW);
+ w21->Reorder(w211, mojom::OrderDirection::BELOW);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 22 21 213 211 212 1 11", ChildWindowIDsAsString(parent.get()));
- w1->Reorder(w2.get(), mojom::ORDER_DIRECTION_BELOW);
+ w1->Reorder(w2.get(), mojom::OrderDirection::BELOW);
EXPECT_EQ(w212, parent->children().back());
EXPECT_EQ("1 11 2 22 21 213 211 212", ChildWindowIDsAsString(parent.get()));
- w213->Reorder(w11, mojom::ORDER_DIRECTION_BELOW);
+ w213->Reorder(w11, mojom::OrderDirection::BELOW);
EXPECT_EQ(w11, parent->children().back());
EXPECT_EQ("2 22 21 213 211 212 1 11", ChildWindowIDsAsString(parent.get()));
}
« no previous file with comments | « components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc ('k') | components/mus/public/interfaces/cursor.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698