1 files changed, 34 insertions, 78 deletions
diff --git a/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp b/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp
index 93b78bd1b10..c965cc08aa6 100644
--- a/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp
+++ b/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp
@@ -1,23 +1,18 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("frozenbtree_test");
 #define DEBUG_FROZENBTREE
 #define LOG_FROZENBTREEXX
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/util/rand48.h>
 #include <vespa/searchlib/btree/btreeroot.h>
-#include <vespa/searchlib/btree/btreenodeallocator.h>
 #include <vespa/searchlib/btree/btreeiterator.hpp>
 #include <vespa/searchlib/btree/btreeroot.hpp>
 #include <vespa/searchlib/btree/btreenodeallocator.hpp>
-#include <vespa/searchlib/btree/btreenode.hpp>
-#include <vespa/searchlib/btree/btreenodestore.hpp>
-#include <algorithm>
-#include <limits>
 #include <map>
 
+#include <vespa/log/log.h>
+LOG_SETUP("frozenbtree_test");
+
 using search::btree::BTreeRoot;
 using search::btree::BTreeNode;
 using search::btree::BTreeInternalNode;
@@ -54,82 +49,44 @@ private:
 
     Rand48 _randomGenerator;
 
-    void
-    allocTree(void);
-
-    void
-    freeTree(bool verbose);
-
-    void
-    fillRandomValues(unsigned int count);
-
-    void
-    insertRandomValues(Tree &tree,
-                       NodeAllocator &allocator,
-                       const std::vector<KeyType> &values);
-
-    void
-    removeRandomValues(Tree &tree,
-                       NodeAllocator &allocator,
-                       const std::vector<KeyType> &values);
-
-    void
-    lookupRandomValues(const Tree &tree,
-                       NodeAllocator &allocator,
-                       const std::vector<KeyType> &values);
-
-    void
-    lookupGoneRandomValues(const Tree &tree,
-                           NodeAllocator &allocator,
-                           const std::vector<KeyType> &values);
-
-    void
-    lookupFrozenRandomValues(const Tree &tree,
-                             NodeAllocator &allocator,
-                             const std::vector<KeyType> &values);
-
-    void
-    sortRandomValues(void);
-
-    void
-    traverseTreeIterator(const Tree &tree,
-                         NodeAllocator &allocator,
-                         const std::vector<KeyType> &sorted,
-                         bool frozen);
-
-    void
-    printSubEnumTree(BTreeNode::Ref node,
-                     NodeAllocator &allocator,
-                     int indent) const;
-
-    void
-    printEnumTree(const Tree *tree,
-                  NodeAllocator &allocator);
-
-    static const char *
-    frozenName(bool frozen)
-    {
+    void allocTree(void);
+    void freeTree(bool verbose);
+    void fillRandomValues(unsigned int count);
+    void insertRandomValues(Tree &tree, NodeAllocator &allocator, const std::vector<KeyType> &values);
+    void removeRandomValues(Tree &tree, NodeAllocator &allocator, const std::vector<KeyType> &values);
+    void lookupRandomValues(const Tree &tree, NodeAllocator &allocator, const std::vector<KeyType> &values);
+    void lookupGoneRandomValues(const Tree &tree, NodeAllocator &allocator, const std::vector<KeyType> &values);
+    void lookupFrozenRandomValues(const Tree &tree, NodeAllocator &allocator, const std::vector<KeyType> &values);
+    void sortRandomValues();
+    void traverseTreeIterator(const Tree &tree, NodeAllocator &allocator,
+                              const std::vector<KeyType> &sorted, bool frozen);
+
+    void printSubEnumTree(BTreeNode::Ref node, NodeAllocator &allocator, int indent) const;
+    void printEnumTree(const Tree *tree, NodeAllocator &allocator);
+
+    static const char *frozenName(bool frozen) {
         return frozen ? "frozen" : "thawed";
     }
 public:
-    FrozenBTreeTest(void)
-        : vespalib::TestApp(),
-          _randomValues(),
-          _sortedRandomValues(),
-          _generationHandler(NULL),
-          _allocator(NULL),
-          _tree(NULL),
-          _randomGenerator()
-    {
-    }
+    FrozenBTreeTest();
+    ~FrozenBTreeTest();
 
-    int Main(void) override;
+    int Main() override;
 };
 
-
+FrozenBTreeTest::FrozenBTreeTest()
+    : vespalib::TestApp(),
+      _randomValues(),
+      _sortedRandomValues(),
+      _generationHandler(NULL),
+      _allocator(NULL),
+      _tree(NULL),
+      _randomGenerator()
+{}
+FrozenBTreeTest::~FrozenBTreeTest() {}
 
 void
-FrozenBTreeTest::allocTree(void)
+FrozenBTreeTest::allocTree()
 {
     assert(_generationHandler == NULL);
     assert(_allocator == NULL);
@@ -193,8 +150,7 @@ FrozenBTreeTest::fillRandomValues(unsigned int count)
 {
     unsigned int i;
 
-    LOG(info,
-        "Filling %u random values", count);
+    LOG(info, "Filling %u random values", count);
     _randomValues.clear();
     _randomValues.reserve(count);
     _randomGenerator.srand48(42);