Merge pull request #30390 from vespa-engine/toregge/rewrite-frozen-btree-unit-test-to-gtest

Rewrite frozen btree unit test to gtest.

2 files changed, 13 insertions, 28 deletions

diff --git a/vespalib/src/tests/btree/CMakeLists.txt b/vespalib/src/tests/btree/CMakeLists.txt
index 79bda87867e..bf4edc9e5e9 100644
--- a/vespalib/src/tests/btree/CMakeLists.txt
+++ b/vespalib/src/tests/btree/CMakeLists.txt
@@ -12,6 +12,7 @@ vespa_add_executable(vespalib_frozenbtree_test_app TEST
     frozenbtree_test.cpp
     DEPENDS
     vespalib
+    GTest::gtest
 )
 vespa_add_test(NAME vespalib_frozenbtree_test_app COMMAND vespalib_frozenbtree_test_app COST 30)
 vespa_add_executable(vespalib_btreeaggregation_test_app TEST
diff --git a/vespalib/src/tests/btree/frozenbtree_test.cpp b/vespalib/src/tests/btree/frozenbtree_test.cpp
index b16a7013db4..ffe8b4516aa 100644
--- a/vespalib/src/tests/btree/frozenbtree_test.cpp
+++ b/vespalib/src/tests/btree/frozenbtree_test.cpp
@@ -2,12 +2,12 @@
 
 #define DEBUG_FROZENBTREE
 #define LOG_FROZENBTREEXX
-#include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/btree/btreeroot.h>
 #include <vespa/vespalib/btree/btreeiterator.hpp>
 #include <vespa/vespalib/btree/btreeroot.hpp>
 #include <vespa/vespalib/btree/btreenodeallocator.hpp>
 #include <vespa/vespalib/datastore/buffer_type.hpp>
+#include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/util/rand48.h>
 #include <map>
 
@@ -24,11 +24,11 @@ using vespalib::GenerationHandler;
 namespace vespalib {
 
 
-class FrozenBTreeTest : public vespalib::TestApp
+class FrozenBTreeTest : public ::testing::Test
 {
 public:
     using KeyType = int;
-private:
+protected:
     std::vector<KeyType> _randomValues;
     std::vector<KeyType> _sortedRandomValues;
 
@@ -43,7 +43,7 @@ public:
     using LeafNodeType = Tree::LeafNodeType;
     using Iterator = Tree::Iterator;
     using ConstIterator = Tree::ConstIterator;
-private:
+protected:
     GenerationHandler *_generationHandler;
     NodeAllocator *_allocator;
     Tree *_tree;
@@ -70,21 +70,21 @@ private:
     }
 public:
     FrozenBTreeTest();
-    ~FrozenBTreeTest();
-
-    int Main() override;
+    ~FrozenBTreeTest() override;
 };
 
 FrozenBTreeTest::FrozenBTreeTest()
-    : vespalib::TestApp(),
+    : ::testing::Test(),
       _randomValues(),
       _sortedRandomValues(),
       _generationHandler(NULL),
       _allocator(NULL),
       _tree(NULL),
       _randomGenerator()
-{}
-FrozenBTreeTest::~FrozenBTreeTest() {}
+{
+}
+
+FrozenBTreeTest::~FrozenBTreeTest() = default;
 
 void
 FrozenBTreeTest::allocTree()
@@ -410,11 +410,8 @@ FrozenBTreeTest::printEnumTree(const Tree *tree,
 
 
 
-int
-FrozenBTreeTest::Main()
+TEST_F(FrozenBTreeTest, test_frozen_btree)
 {
-    TEST_INIT("frozenbtree_test");
-
     fillRandomValues(1000);
     sortRandomValues();
 
@@ -451,21 +448,8 @@ FrozenBTreeTest::Main()
                          true);
     insertRandomValues(*_tree, *_allocator, _randomValues);
     freeTree(true);
-
-    fillRandomValues(1000000);
-    sortRandomValues();
-
-    allocTree();
-    insertRandomValues(*_tree, *_allocator, _randomValues);
-    traverseTreeIterator(*_tree,
-                         *_allocator,
-                         _sortedRandomValues,
-                         false);
-    freeTree(false);
-
-    TEST_DONE();
 }
 
 }
 
-TEST_APPHOOK(vespalib::FrozenBTreeTest);
+GTEST_MAIN_RUN_ALL_TESTS()