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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/services/public/cpp/view_manager/tests/node_unittest.cc

Issue 374933003: Remove DispositionChangePhase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « mojo/services/public/cpp/view_manager/node_observer.h ('k') | mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/public/cpp/view_manager/tests/node_unittest.cc
diff --git a/mojo/services/public/cpp/view_manager/tests/node_unittest.cc b/mojo/services/public/cpp/view_manager/tests/node_unittest.cc
index e38d48dca2d26c68ae7cc9b8f48f2d1852d2e6d6..c7daf070b90d8708f83dd0b7be435a477e90d512 100644
--- a/mojo/services/public/cpp/view_manager/tests/node_unittest.cc
+++ b/mojo/services/public/cpp/view_manager/tests/node_unittest.cc
@@ -93,8 +93,7 @@ typedef testing::Test NodeObserverTest;
bool TreeChangeParamsMatch(const NodeObserver::TreeChangeParams& lhs,
const NodeObserver::TreeChangeParams& rhs) {
return lhs.target == rhs.target && lhs.old_parent == rhs.old_parent &&
- lhs.new_parent == rhs.new_parent && lhs.receiver == rhs.receiver &&
- lhs.phase == rhs.phase;
+ lhs.new_parent == rhs.new_parent && lhs.receiver == rhs.receiver;
}
class TreeChangeObserver : public NodeObserver {
@@ -116,7 +115,10 @@ class TreeChangeObserver : public NodeObserver {
private:
// Overridden from NodeObserver:
- virtual void OnTreeChange(const TreeChangeParams& params) OVERRIDE {
+ virtual void OnTreeChanging(const TreeChangeParams& params) OVERRIDE {
+ received_params_.push_back(params);
+ }
+ virtual void OnTreeChanged(const TreeChangeParams& params) OVERRIDE {
received_params_.push_back(params);
}
@@ -146,15 +148,12 @@ TEST_F(NodeObserverTest, TreeChange_SimpleAddRemove) {
p1.receiver = &v1;
p1.old_parent = NULL;
p1.new_parent = &v1;
- p1.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().back()));
EXPECT_EQ(2U, o11.received_params().size());
NodeObserver::TreeChangeParams p11 = p1;
p11.receiver = &v11;
- p11.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().front()));
- p11.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().back()));
o1.Reset();
@@ -171,14 +170,12 @@ TEST_F(NodeObserverTest, TreeChange_SimpleAddRemove) {
p1.receiver = &v1;
p1.old_parent = &v1;
p1.new_parent = NULL;
- p1.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().front()));
EXPECT_EQ(2U, o11.received_params().size());
p11 = p1;
p11.receiver = &v11;
EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().front()));
- p11.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().back()));
}
@@ -212,7 +209,6 @@ TEST_F(NodeObserverTest, TreeChange_NestedAddRemove) {
p1.receiver = &v1;
p1.old_parent = NULL;
p1.new_parent = &v11;
- p1.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().back()));
EXPECT_EQ(2U, o11.received_params().size());
@@ -223,25 +219,19 @@ TEST_F(NodeObserverTest, TreeChange_NestedAddRemove) {
EXPECT_EQ(2U, o111.received_params().size());
p111 = p11;
p111.receiver = &v111;
- p111.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().front()));
- p111.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().back()));
EXPECT_EQ(2U, o1111.received_params().size());
p1111 = p111;
p1111.receiver = &v1111;
- p1111.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p1111, o1111.received_params().front()));
- p1111.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p1111, o1111.received_params().back()));
EXPECT_EQ(2U, o1112.received_params().size());
p1112 = p111;
p1112.receiver = &v1112;
- p1112.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p1112, o1112.received_params().front()));
- p1112.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p1112, o1112.received_params().back()));
// Remove.
@@ -263,7 +253,6 @@ TEST_F(NodeObserverTest, TreeChange_NestedAddRemove) {
p1.receiver = &v1;
p1.old_parent = &v11;
p1.new_parent = NULL;
- p1.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().front()));
EXPECT_EQ(2U, o11.received_params().size());
@@ -274,25 +263,19 @@ TEST_F(NodeObserverTest, TreeChange_NestedAddRemove) {
EXPECT_EQ(2U, o111.received_params().size());
p111 = p11;
p111.receiver = &v111;
- p111.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().front()));
- p111.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().back()));
EXPECT_EQ(2U, o1111.received_params().size());
p1111 = p111;
p1111.receiver = &v1111;
- p1111.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p1111, o1111.received_params().front()));
- p1111.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p1111, o1111.received_params().back()));
EXPECT_EQ(2U, o1112.received_params().size());
p1112 = p111;
p1112.receiver = &v1112;
- p1112.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p1112, o1112.received_params().front()));
- p1112.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p1112, o1112.received_params().back()));
}
@@ -314,9 +297,7 @@ TEST_F(NodeObserverTest, TreeChange_Reparent) {
p1.receiver = &v1;
p1.old_parent = &v11;
p1.new_parent = &v12;
- p1.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().front()));
- p1.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().back()));
// v11 should see changing notifications.
@@ -324,7 +305,6 @@ TEST_F(NodeObserverTest, TreeChange_Reparent) {
NodeObserver::TreeChangeParams p11;
p11 = p1;
p11.receiver = &v11;
- p11.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().front()));
// v12 should see changed notifications.
@@ -332,7 +312,6 @@ TEST_F(NodeObserverTest, TreeChange_Reparent) {
NodeObserver::TreeChangeParams p12;
p12 = p1;
p12.receiver = &v12;
- p12.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p12, o12.received_params().back()));
// v111 should see both changing and changed notifications.
@@ -340,9 +319,7 @@ TEST_F(NodeObserverTest, TreeChange_Reparent) {
NodeObserver::TreeChangeParams p111;
p111 = p1;
p111.receiver = &v111;
- p111.phase = NodeObserver::DISPOSITION_CHANGING;
EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().front()));
- p111.phase = NodeObserver::DISPOSITION_CHANGED;
EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().back()));
}
@@ -354,7 +331,6 @@ class OrderChangeObserver : public NodeObserver {
Node* node;
Node* relative_node;
OrderDirection direction;
- DispositionChangePhase phase;
};
typedef std::vector<Change> Changes;
@@ -375,13 +351,11 @@ class OrderChangeObserver : public NodeObserver {
// Overridden from NodeObserver:
virtual void OnNodeReordered(Node* node,
Node* relative_node,
- OrderDirection direction,
- DispositionChangePhase phase) OVERRIDE {
+ OrderDirection direction) OVERRIDE {
Change change;
change.node = node;
change.relative_node = relative_node;
change.direction = direction;
- change.phase = phase;
changes_.push_back(change);
}
@@ -418,12 +392,10 @@ TEST_F(NodeObserverTest, Order) {
EXPECT_EQ(&v11, changes[0].node);
EXPECT_EQ(&v13, changes[0].relative_node);
EXPECT_EQ(ORDER_ABOVE, changes[0].direction);
- EXPECT_EQ(NodeObserver::DISPOSITION_CHANGING, changes[0].phase);
EXPECT_EQ(&v11, changes[1].node);
EXPECT_EQ(&v13, changes[1].relative_node);
EXPECT_EQ(ORDER_ABOVE, changes[1].direction);
- EXPECT_EQ(NodeObserver::DISPOSITION_CHANGED, changes[1].phase);
}
{
@@ -440,12 +412,10 @@ TEST_F(NodeObserverTest, Order) {
EXPECT_EQ(&v11, changes[0].node);
EXPECT_EQ(&v12, changes[0].relative_node);
EXPECT_EQ(ORDER_BELOW, changes[0].direction);
- EXPECT_EQ(NodeObserver::DISPOSITION_CHANGING, changes[0].phase);
EXPECT_EQ(&v11, changes[1].node);
EXPECT_EQ(&v12, changes[1].relative_node);
EXPECT_EQ(ORDER_BELOW, changes[1].direction);
- EXPECT_EQ(NodeObserver::DISPOSITION_CHANGED, changes[1].phase);
}
{
@@ -462,12 +432,10 @@ TEST_F(NodeObserverTest, Order) {
EXPECT_EQ(&v11, changes[0].node);
EXPECT_EQ(&v12, changes[0].relative_node);
EXPECT_EQ(ORDER_ABOVE, changes[0].direction);
- EXPECT_EQ(NodeObserver::DISPOSITION_CHANGING, changes[0].phase);
EXPECT_EQ(&v11, changes[1].node);
EXPECT_EQ(&v12, changes[1].relative_node);
EXPECT_EQ(ORDER_ABOVE, changes[1].direction);
- EXPECT_EQ(NodeObserver::DISPOSITION_CHANGED, changes[1].phase);
}
{
@@ -484,12 +452,10 @@ TEST_F(NodeObserverTest, Order) {
EXPECT_EQ(&v11, changes[0].node);
EXPECT_EQ(&v12, changes[0].relative_node);
EXPECT_EQ(ORDER_BELOW, changes[0].direction);
- EXPECT_EQ(NodeObserver::DISPOSITION_CHANGING, changes[0].phase);
EXPECT_EQ(&v11, changes[1].node);
EXPECT_EQ(&v12, changes[1].relative_node);
EXPECT_EQ(ORDER_BELOW, changes[1].direction);
- EXPECT_EQ(NodeObserver::DISPOSITION_CHANGED, changes[1].phase);
}
}
@@ -507,11 +473,6 @@ std::string RectToString(const gfx::Rect& rect) {
rect.x(), rect.y(), rect.width(), rect.height());
}
-std::string PhaseToString(NodeObserver::DispositionChangePhase phase) {
- return phase == NodeObserver::DISPOSITION_CHANGING ?
- "changing" : "changed";
-}
-
class BoundsChangeObserver : public NodeObserver {
public:
explicit BoundsChangeObserver(Node* node) : node_(node) {
@@ -529,17 +490,25 @@ class BoundsChangeObserver : public NodeObserver {
private:
// Overridden from NodeObserver:
- virtual void OnNodeBoundsChange(Node* node,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds,
- DispositionChangePhase phase) OVERRIDE {
+ virtual void OnNodeBoundsChanging(Node* node,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) OVERRIDE {
+ changes_.push_back(
+ base::StringPrintf(
+ "node=%s old_bounds=%s new_bounds=%s phase=changing",
+ NodeIdToString(node->id()).c_str(),
+ RectToString(old_bounds).c_str(),
+ RectToString(new_bounds).c_str()));
+ }
+ virtual void OnNodeBoundsChanged(Node* node,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) OVERRIDE {
changes_.push_back(
base::StringPrintf(
- "node=%s old_bounds=%s new_bounds=%s phase=%s",
+ "node=%s old_bounds=%s new_bounds=%s phase=changed",
NodeIdToString(node->id()).c_str(),
RectToString(old_bounds).c_str(),
- RectToString(new_bounds).c_str(),
- PhaseToString(phase).c_str()));
+ RectToString(new_bounds).c_str()));
}
Node* node_;
« no previous file with comments | « mojo/services/public/cpp/view_manager/node_observer.h ('k') | mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698