BIND 10 trac2750, updated. 0a5bd2ebb43c45ebab9f466d102a3c9e4c024efa [2750] Increase number of nodes to 1024

[BIND 10 source code commits]

The branch, trac2750 has been updated
       via  0a5bd2ebb43c45ebab9f466d102a3c9e4c024efa (commit)
       via  8380acd2fcbd511f0a72f1854e19baa874e34175 (commit)
      from  c0e91c529e7e110f68c30c127a8370643a1a9b78 (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 0a5bd2ebb43c45ebab9f466d102a3c9e4c024efa
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Sep 3 10:12:02 2013 +0530

    [2750] Increase number of nodes to 1024

commit 8380acd2fcbd511f0a72f1854e19baa874e34175
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Sep 3 10:11:41 2013 +0530

    [2750] Remove some temporary tests

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

Summary of changes:
 .../datasrc/tests/memory/domaintree_unittest.cc    |   89 +-------------------
 1 file changed, 4 insertions(+), 85 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory/domaintree_unittest.cc b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
index 574577b..d678af2 100644
--- a/src/lib/datasrc/tests/memory/domaintree_unittest.cc
+++ b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
@@ -35,7 +35,6 @@
 
 #include <set>
 #include <algorithm>
-#include <fstream>
 
 using namespace std;
 using namespace isc;
@@ -518,8 +517,8 @@ checkTree(const TestDomainTree& tree,
           const std::set<std::string>& names)
 {
     // The distance from each node to its sub-tree root must be less
-    // than 2 * log_2(256).
-    EXPECT_GE(2 * 8, tree.getHeight());
+    // than 2 * log_2(1024).
+    EXPECT_GE(2 * 10, tree.getHeight());
 
     // Also check RB tree properties
     EXPECT_TRUE(tree.checkProperties());
@@ -567,7 +566,7 @@ TEST_F(DomainTreeTest, insertAndRemove) {
 
     // NOTE: These tests are run within a single tree in the
     // forest. Fusion, etc. are tested elsewhere. The number of nodes in
-    // the tree doesn't grow over 256.
+    // the tree doesn't grow over 1024.
 
     TreeHolder holder(mem_sgmt_, TestDomainTree::create(mem_sgmt_, true));
     TestDomainTree& tree(*holder.get());
@@ -577,7 +576,7 @@ TEST_F(DomainTreeTest, insertAndRemove) {
 
     // Repeat the insert/remove test some 4096 times
     for (int i = 0; i < 4096; ++i) {
-         UniformRandomIntegerGenerator gen(1, 256 - node_count);
+         UniformRandomIntegerGenerator gen(1, 1024 - node_count);
          size_t num_nodes = gen();
          node_count += num_nodes;
 
@@ -868,86 +867,6 @@ TEST_F(DomainTreeTest, nodeFusionMultiple) {
     EXPECT_EQ(Name("p.w.y.d.e.f"), cdtnode->getName());
 }
 
-TEST_F(DomainTreeTest, DISABLED_remove1) {
-    ofstream o1("d1.dot");
-    dtree_expose_empty_node.dumpDot(o1);
-    o1.close();
-
-    EXPECT_EQ(TestDomainTree::EXACTMATCH,
-              dtree_expose_empty_node.find(Name("x.d.e.f"), &dtnode));
-    dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);
-
-    ofstream o2("d2.dot");
-    dtree_expose_empty_node.dumpDot(o2);
-    o2.close();
-
-    EXPECT_EQ(TestDomainTree::EXACTMATCH,
-              dtree_expose_empty_node.find(Name("z.d.e.f"), &dtnode));
-    dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);
-
-    ofstream o3("d3.dot");
-    dtree_expose_empty_node.dumpDot(o3);
-    o3.close();
-
-    EXPECT_EQ(TestDomainTree::EXACTMATCH,
-              dtree_expose_empty_node.find(Name("q.w.y.d.e.f"), &dtnode));
-    dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);
-
-    ofstream o4("d4.dot");
-    dtree_expose_empty_node.dumpDot(o4);
-    o4.close();
-
-    EXPECT_EQ(TestDomainTree::EXACTMATCH,
-              dtree_expose_empty_node.find(Name("o.w.y.d.e.f"), &dtnode));
-    dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);
-
-    ofstream o5("d5.dot");
-    dtree_expose_empty_node.dumpDot(o5);
-    o5.close();
-}
-
-TEST_F(DomainTreeTest, DISABLED_remove2) {
-    ofstream o1("g1.dot");
-    dtree_expose_empty_node.dumpDot(o1);
-    o1.close();
-
-    EXPECT_EQ(TestDomainTree::EXACTMATCH,
-              dtree_expose_empty_node.find(Name("p.w.y.d.e.f"), &dtnode));
-    dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);
-
-    ofstream o2("g2.dot");
-    dtree_expose_empty_node.dumpDot(o2);
-    o2.close();
-}
-
-TEST_F(DomainTreeTest, DISABLED_remove3) {
-    ofstream o1("g1.dot");
-    dtree_expose_empty_node.dumpDot(o1);
-    o1.close();
-
-    EXPECT_EQ(TestDomainTree::EXACTMATCH,
-              dtree_expose_empty_node.find(Name("b"), &dtnode));
-    dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);
-
-    ofstream o2("g2.dot");
-    dtree_expose_empty_node.dumpDot(o2);
-    o2.close();
-}
-
-TEST_F(DomainTreeTest, DISABLED_remove4) {
-    ofstream o1("g1.dot");
-    dtree_expose_empty_node.dumpDot(o1);
-    o1.close();
-
-    EXPECT_EQ(TestDomainTree::EXACTMATCH,
-              dtree_expose_empty_node.find(Name("j.z.d.e.f"), &dtnode));
-    dtree_expose_empty_node.remove(mem_sgmt_, dtnode, deleteData);
-
-    ofstream o2("g2.dot");
-    dtree_expose_empty_node.dumpDot(o2);
-    o2.close();
-}
-
 TEST_F(DomainTreeTest, subTreeRoot) {
     // This is a testcase for a particular issue that went unchecked in
     // #2089's implementation, but was fixed in #2092. The issue was