BIND 10 trac2750, updated. bf298463e636da9989a877145fee8853733f7030 [2750] Check that having 2 nodes in subtree doesn't cause node fusion

[BIND 10 source code commits]

The branch, trac2750 has been updated
       via  bf298463e636da9989a877145fee8853733f7030 (commit)
      from  8a6e0a611829250157c74d6fe8a329629d66b537 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bf298463e636da9989a877145fee8853733f7030
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Aug 30 07:21:17 2013 +0530

    [2750] Check that having 2 nodes in subtree doesn't cause node fusion

-----------------------------------------------------------------------

Summary of changes:
 .../datasrc/tests/memory/domaintree_unittest.cc    |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory/domaintree_unittest.cc b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
index 9373b1f..ae0073b 100644
--- a/src/lib/datasrc/tests/memory/domaintree_unittest.cc
+++ b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
@@ -482,11 +482,18 @@ TEST_F(DomainTreeTest, nodeFusion) {
               dtree_expose_empty_node.find(Name("w.y.d.e.f"), &cdtnode));
     EXPECT_EQ(Name("w.y"), cdtnode->getName());
 
-    // Now, delete "x" and "z" nodes.
+    // Now, delete "x" node.
     EXPECT_EQ(TestDomainTree::EXACTMATCH,
               dtree_expose_empty_node.find(Name("x.d.e.f"), &dtnode));
     dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);
 
+    // "d.e.f" should still exist independently as "w.y" still has a
+    // left or right child.
+    EXPECT_EQ(TestDomainTree::EXACTMATCH,
+              dtree_expose_empty_node.find(Name("d.e.f"), &cdtnode));
+    EXPECT_EQ(Name("d.e.f"), cdtnode->getName());
+
+    // Now, delete "z" node.
     EXPECT_EQ(TestDomainTree::EXACTMATCH,
               dtree_expose_empty_node.find(Name("z.d.e.f"), &dtnode));
     dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);