From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 26 Sep 2012 11:40:36 +0000 (+0530)
Subject: [2218] Remove unused DomainTreeNode::getLargestInSubTree() and its tests
X-Git-Tag: trac2351_base~37^2~1^2~3^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=babcf09173d27ad28f53d911d1908c7375fd4e22;p=thirdparty%2Fkea.git

[2218] Remove unused DomainTreeNode::getLargestInSubTree() and its tests
---

diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h
index 576dcdd47a..acc5e2b83f 100644
--- a/src/lib/datasrc/memory/domaintree.h
+++ b/src/lib/datasrc/memory/domaintree.h
@@ -390,14 +390,6 @@ private:
     /// This method never throws an exception.
     const DomainTreeNode<T>* getSubTreeRoot() const;
 
-    /// \brief returns the largest node of this node's subtree
-    ///
-    /// This method takes a node and returns the largest node in its
-    /// subtree.
-    ///
-    /// This method never throws an exception.
-    const DomainTreeNode<T>* getLargestInSubTree() const;
-
 public:
     /// \brief returns the parent of the root of its subtree
     ///
@@ -577,17 +569,6 @@ DomainTreeNode<T>::getUpperNode() const {
     return (getSubTreeRoot()->getParent());
 }
 
-template <typename T>
-const DomainTreeNode<T>*
-DomainTreeNode<T>::getLargestInSubTree() const {
-    const DomainTreeNode<T>* sroot = getSubTreeRoot();
-    while (sroot->getRight() != NULL) {
-        sroot = sroot->getRight();
-    }
-
-    return (sroot);
-}
-
 template <typename T>
 isc::dns::LabelSequence
 DomainTreeNode<T>::getAbsoluteLabels(
diff --git a/src/lib/datasrc/memory/tests/domaintree_unittest.cc b/src/lib/datasrc/memory/tests/domaintree_unittest.cc
index ac22a4fe53..f8f39de357 100644
--- a/src/lib/datasrc/memory/tests/domaintree_unittest.cc
+++ b/src/lib/datasrc/memory/tests/domaintree_unittest.cc
@@ -718,8 +718,8 @@ TEST_F(DomainTreeTest, getUpperNode) {
 
 
 #if 0
-// Disabled and kept still, for use in case we make getSubTreeRoot() and
-// getLargestInSubTree() public functions again.
+// Disabled and kept still, for use in case we make getSubTreeRoot() a
+// public function again.
 
 const char* const subtree_root_node_names[] = {
     "b", "b", "b", "b", "w.y.d.e.f", "w.y.d.e.f", "p.w.y.d.e.f",
@@ -755,41 +755,7 @@ TEST_F(DomainTreeTest, getSubTreeRoot) {
     EXPECT_EQ(static_cast<void*>(NULL), node);
 }
 
-const char* const largest_node_names[] = {
-    "g.h", "g.h", "g.h", "g.h", "z.d.e.f", "z.d.e.f", "q.w.y.d.e.f",
-    "q.w.y.d.e.f", "q.w.y.d.e.f", "z.d.e.f", "j.z.d.e.f",
-    "g.h", "k.g.h", "k.g.h"};
-
-TEST_F(DomainTreeTest, getLargestInSubTree) {
-    TestDomainTreeNodeChain node_path;
-    const TestDomainTreeNode* node = NULL;
-    EXPECT_EQ(TestDomainTree::EXACTMATCH,
-              dtree_expose_empty_node.find(Name(names[0]),
-                                            &node,
-                                            node_path));
-    for (int i = 0; i < name_count; ++i) {
-        EXPECT_NE(static_cast<void*>(NULL), node);
-
-        const TestDomainTreeNode* largest_node = node->getLargestInSubTree();
-        if (largest_node_names[i] != NULL) {
-            const TestDomainTreeNode* largest_node2 = NULL;
-            EXPECT_EQ(TestDomainTree::EXACTMATCH,
-                dtree_expose_empty_node.find(Name(largest_node_names[i]),
-                                             &largest_node2));
-            EXPECT_NE(static_cast<void*>(NULL), largest_node2);
-            EXPECT_EQ(largest_node, largest_node2);
-        } else {
-            EXPECT_EQ(static_cast<void*>(NULL), largest_node);
-        }
-
-        node = dtree_expose_empty_node.nextNode(node_path);
-    }
-
-    // We should have reached the end of the tree.
-    EXPECT_EQ(static_cast<void*>(NULL), node);
-}
-
-#endif // disabled getSubTreeRoot() and getLargestInSubTree()
+#endif // disabled getSubTreeRoot()
 
 
 TEST_F(DomainTreeTest, nextNode) {