| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/services/view_manager/public/cpp/view.h" | 5 #include "mojo/services/view_manager/public/cpp/view.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "mojo/services/view_manager/public/cpp/lib/view_private.h" | 9 #include "mojo/services/view_manager/public/cpp/lib/view_private.h" |
| 10 #include "mojo/services/view_manager/public/cpp/util.h" | 10 #include "mojo/services/view_manager/public/cpp/util.h" |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 // Move v11 to front. | 485 // Move v11 to front. |
| 486 // Resulting order: v12, v13, v11 | 486 // Resulting order: v12, v13, v11 |
| 487 v11.MoveToFront(); | 487 v11.MoveToFront(); |
| 488 EXPECT_EQ(&v12, v1.children().front()); | 488 EXPECT_EQ(&v12, v1.children().front()); |
| 489 EXPECT_EQ(&v11, v1.children().back()); | 489 EXPECT_EQ(&v11, v1.children().back()); |
| 490 | 490 |
| 491 OrderChangeObserver::Changes changes = observer.GetAndClearChanges(); | 491 OrderChangeObserver::Changes changes = observer.GetAndClearChanges(); |
| 492 ASSERT_EQ(2U, changes.size()); | 492 ASSERT_EQ(2U, changes.size()); |
| 493 EXPECT_EQ(&v11, changes[0].view); | 493 EXPECT_EQ(&v11, changes[0].view); |
| 494 EXPECT_EQ(&v13, changes[0].relative_view); | 494 EXPECT_EQ(&v13, changes[0].relative_view); |
| 495 EXPECT_EQ(ORDER_DIRECTION_ABOVE, changes[0].direction); | 495 EXPECT_EQ(OrderDirection::ABOVE, changes[0].direction); |
| 496 | 496 |
| 497 EXPECT_EQ(&v11, changes[1].view); | 497 EXPECT_EQ(&v11, changes[1].view); |
| 498 EXPECT_EQ(&v13, changes[1].relative_view); | 498 EXPECT_EQ(&v13, changes[1].relative_view); |
| 499 EXPECT_EQ(ORDER_DIRECTION_ABOVE, changes[1].direction); | 499 EXPECT_EQ(OrderDirection::ABOVE, changes[1].direction); |
| 500 } | 500 } |
| 501 | 501 |
| 502 { | 502 { |
| 503 OrderChangeObserver observer(&v11); | 503 OrderChangeObserver observer(&v11); |
| 504 | 504 |
| 505 // Move v11 to back. | 505 // Move v11 to back. |
| 506 // Resulting order: v11, v12, v13 | 506 // Resulting order: v11, v12, v13 |
| 507 v11.MoveToBack(); | 507 v11.MoveToBack(); |
| 508 EXPECT_EQ(&v11, v1.children().front()); | 508 EXPECT_EQ(&v11, v1.children().front()); |
| 509 EXPECT_EQ(&v13, v1.children().back()); | 509 EXPECT_EQ(&v13, v1.children().back()); |
| 510 | 510 |
| 511 OrderChangeObserver::Changes changes = observer.GetAndClearChanges(); | 511 OrderChangeObserver::Changes changes = observer.GetAndClearChanges(); |
| 512 ASSERT_EQ(2U, changes.size()); | 512 ASSERT_EQ(2U, changes.size()); |
| 513 EXPECT_EQ(&v11, changes[0].view); | 513 EXPECT_EQ(&v11, changes[0].view); |
| 514 EXPECT_EQ(&v12, changes[0].relative_view); | 514 EXPECT_EQ(&v12, changes[0].relative_view); |
| 515 EXPECT_EQ(ORDER_DIRECTION_BELOW, changes[0].direction); | 515 EXPECT_EQ(OrderDirection::BELOW, changes[0].direction); |
| 516 | 516 |
| 517 EXPECT_EQ(&v11, changes[1].view); | 517 EXPECT_EQ(&v11, changes[1].view); |
| 518 EXPECT_EQ(&v12, changes[1].relative_view); | 518 EXPECT_EQ(&v12, changes[1].relative_view); |
| 519 EXPECT_EQ(ORDER_DIRECTION_BELOW, changes[1].direction); | 519 EXPECT_EQ(OrderDirection::BELOW, changes[1].direction); |
| 520 } | 520 } |
| 521 | 521 |
| 522 { | 522 { |
| 523 OrderChangeObserver observer(&v11); | 523 OrderChangeObserver observer(&v11); |
| 524 | 524 |
| 525 // Move v11 above v12. | 525 // Move v11 above v12. |
| 526 // Resulting order: v12. v11, v13 | 526 // Resulting order: v12. v11, v13 |
| 527 v11.Reorder(&v12, ORDER_DIRECTION_ABOVE); | 527 v11.Reorder(&v12, OrderDirection::ABOVE); |
| 528 EXPECT_EQ(&v12, v1.children().front()); | 528 EXPECT_EQ(&v12, v1.children().front()); |
| 529 EXPECT_EQ(&v13, v1.children().back()); | 529 EXPECT_EQ(&v13, v1.children().back()); |
| 530 | 530 |
| 531 OrderChangeObserver::Changes changes = observer.GetAndClearChanges(); | 531 OrderChangeObserver::Changes changes = observer.GetAndClearChanges(); |
| 532 ASSERT_EQ(2U, changes.size()); | 532 ASSERT_EQ(2U, changes.size()); |
| 533 EXPECT_EQ(&v11, changes[0].view); | 533 EXPECT_EQ(&v11, changes[0].view); |
| 534 EXPECT_EQ(&v12, changes[0].relative_view); | 534 EXPECT_EQ(&v12, changes[0].relative_view); |
| 535 EXPECT_EQ(ORDER_DIRECTION_ABOVE, changes[0].direction); | 535 EXPECT_EQ(OrderDirection::ABOVE, changes[0].direction); |
| 536 | 536 |
| 537 EXPECT_EQ(&v11, changes[1].view); | 537 EXPECT_EQ(&v11, changes[1].view); |
| 538 EXPECT_EQ(&v12, changes[1].relative_view); | 538 EXPECT_EQ(&v12, changes[1].relative_view); |
| 539 EXPECT_EQ(ORDER_DIRECTION_ABOVE, changes[1].direction); | 539 EXPECT_EQ(OrderDirection::ABOVE, changes[1].direction); |
| 540 } | 540 } |
| 541 | 541 |
| 542 { | 542 { |
| 543 OrderChangeObserver observer(&v11); | 543 OrderChangeObserver observer(&v11); |
| 544 | 544 |
| 545 // Move v11 below v12. | 545 // Move v11 below v12. |
| 546 // Resulting order: v11, v12, v13 | 546 // Resulting order: v11, v12, v13 |
| 547 v11.Reorder(&v12, ORDER_DIRECTION_BELOW); | 547 v11.Reorder(&v12, OrderDirection::BELOW); |
| 548 EXPECT_EQ(&v11, v1.children().front()); | 548 EXPECT_EQ(&v11, v1.children().front()); |
| 549 EXPECT_EQ(&v13, v1.children().back()); | 549 EXPECT_EQ(&v13, v1.children().back()); |
| 550 | 550 |
| 551 OrderChangeObserver::Changes changes = observer.GetAndClearChanges(); | 551 OrderChangeObserver::Changes changes = observer.GetAndClearChanges(); |
| 552 ASSERT_EQ(2U, changes.size()); | 552 ASSERT_EQ(2U, changes.size()); |
| 553 EXPECT_EQ(&v11, changes[0].view); | 553 EXPECT_EQ(&v11, changes[0].view); |
| 554 EXPECT_EQ(&v12, changes[0].relative_view); | 554 EXPECT_EQ(&v12, changes[0].relative_view); |
| 555 EXPECT_EQ(ORDER_DIRECTION_BELOW, changes[0].direction); | 555 EXPECT_EQ(OrderDirection::BELOW, changes[0].direction); |
| 556 | 556 |
| 557 EXPECT_EQ(&v11, changes[1].view); | 557 EXPECT_EQ(&v11, changes[1].view); |
| 558 EXPECT_EQ(&v12, changes[1].relative_view); | 558 EXPECT_EQ(&v12, changes[1].relative_view); |
| 559 EXPECT_EQ(ORDER_DIRECTION_BELOW, changes[1].direction); | 559 EXPECT_EQ(OrderDirection::BELOW, changes[1].direction); |
| 560 } | 560 } |
| 561 } | 561 } |
| 562 | 562 |
| 563 namespace { | 563 namespace { |
| 564 | 564 |
| 565 typedef std::vector<std::string> Changes; | 565 typedef std::vector<std::string> Changes; |
| 566 | 566 |
| 567 std::string ViewIdToString(Id id) { | 567 std::string ViewIdToString(Id id) { |
| 568 return (id == 0) ? "null" : | 568 return (id == 0) ? "null" : |
| 569 base::StringPrintf("%d,%d", HiWord(id), LoWord(id)); | 569 base::StringPrintf("%d,%d", HiWord(id), LoWord(id)); |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 875 EXPECT_EQ(PropertyChangeInfo(&prop, -2), o.PropertyChangeInfoAndClear()); | 875 EXPECT_EQ(PropertyChangeInfo(&prop, -2), o.PropertyChangeInfoAndClear()); |
| 876 v1.ClearLocalProperty(&prop); | 876 v1.ClearLocalProperty(&prop); |
| 877 EXPECT_EQ(PropertyChangeInfo(&prop, 3), o.PropertyChangeInfoAndClear()); | 877 EXPECT_EQ(PropertyChangeInfo(&prop, 3), o.PropertyChangeInfoAndClear()); |
| 878 | 878 |
| 879 // Sanity check to see if |PropertyChangeInfoAndClear| really clears. | 879 // Sanity check to see if |PropertyChangeInfoAndClear| really clears. |
| 880 EXPECT_EQ(PropertyChangeInfo( | 880 EXPECT_EQ(PropertyChangeInfo( |
| 881 reinterpret_cast<const void*>(NULL), -3), o.PropertyChangeInfoAndClear()); | 881 reinterpret_cast<const void*>(NULL), -3), o.PropertyChangeInfoAndClear()); |
| 882 } | 882 } |
| 883 | 883 |
| 884 } // namespace mojo | 884 } // namespace mojo |
| OLD | NEW |