diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 21:28:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 21:28:51 +0000 |
| commit | 28d082e6528f65d7a2ac3f1d7f772e4f6b448ed9 (patch) | |
| tree | 222139289e5488464394634427db8c6657104763 /ui | |
| parent | e978bd57bd170c024a23c3e922da68018440ca18 (diff) | |
| download | chromium_src-28d082e6528f65d7a2ac3f1d7f772e4f6b448ed9.zip chromium_src-28d082e6528f65d7a2ac3f1d7f772e4f6b448ed9.tar.gz chromium_src-28d082e6528f65d7a2ac3f1d7f772e4f6b448ed9.tar.bz2 | |
ui/base/models: Rewrite the TreeNodeModelTest.HasAncestor unittest.
- This improves and simplifies the tests covered in HasAncestor.
BUG=None
TEST=ui_unittests --gtest_filter=TreeNodeModelTest.RemoveAllNodes
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7108072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/models/tree_node_model_unittest.cc | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/ui/base/models/tree_node_model_unittest.cc b/ui/base/models/tree_node_model_unittest.cc index 8fc4e42..fb6b218 100644 --- a/ui/base/models/tree_node_model_unittest.cc +++ b/ui/base/models/tree_node_model_unittest.cc @@ -209,25 +209,38 @@ TEST_F(TreeNodeModelTest, GetIndexOf) { // The tree looks like this: // root // |-- child1 -// |-- child2 +// | |-- foo1 +// +-- child2 TEST_F(TreeNodeModelTest, HasAncestor) { - TreeNodeWithValue<int>* root = - new TreeNodeWithValue<int>(ASCIIToUTF16("root"), 0); - TreeNodeModel<TreeNodeWithValue<int> > model(root); + TreeNodeWithValue<int> root; + TreeNodeWithValue<int>* child1 = new TreeNodeWithValue<int>(0); + TreeNodeWithValue<int>* child2 = new TreeNodeWithValue<int>(0); - TreeNodeWithValue<int>* child1 = - new TreeNodeWithValue<int>(ASCIIToUTF16("child 1"), 0); - model.Add(root, child1, 0); + root.Add(child1, 0); + root.Add(child2, 1); - TreeNodeWithValue<int>* child2 = - new TreeNodeWithValue<int>(ASCIIToUTF16("child 2"), 1); - model.Add(root, child2, 1); + TreeNodeWithValue<int>* foo1 = new TreeNodeWithValue<int>(0); + child1->Add(foo1, 0); + + ASSERT_TRUE(root.HasAncestor(&root)); + ASSERT_FALSE(root.HasAncestor(child1)); + ASSERT_FALSE(root.HasAncestor(child2)); + ASSERT_FALSE(root.HasAncestor(foo1)); - ASSERT_TRUE(root->HasAncestor(root)); - ASSERT_FALSE(root->HasAncestor(child1)); - ASSERT_TRUE(child1->HasAncestor(root)); + ASSERT_TRUE(child1->HasAncestor(child1)); + ASSERT_TRUE(child1->HasAncestor(&root)); ASSERT_FALSE(child1->HasAncestor(child2)); + ASSERT_FALSE(child1->HasAncestor(foo1)); + + ASSERT_TRUE(child2->HasAncestor(child2)); + ASSERT_TRUE(child2->HasAncestor(&root)); ASSERT_FALSE(child2->HasAncestor(child1)); + ASSERT_FALSE(child2->HasAncestor(foo1)); + + ASSERT_TRUE(foo1->HasAncestor(foo1)); + ASSERT_TRUE(foo1->HasAncestor(child1)); + ASSERT_TRUE(foo1->HasAncestor(&root)); + ASSERT_FALSE(foo1->HasAncestor(child2)); } // The tree looks like this: |