Rewrite to use GTest.

2 files changed, 26 insertions, 35 deletions

diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
index 0b42d480e33..b89d4d9301f 100644
--- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
@@ -10,5 +10,6 @@ vespa_add_executable(searchcore_clusterstatehandler_test_app TEST
     searchcore_attribute
     searchcore_pcommon
     searchcore_grouping
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_clusterstatehandler_test_app COMMAND searchcore_clusterstatehandler_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp b/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp
index 4cd2eab513c..ad38b7220c5 100644
--- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp
@@ -1,11 +1,12 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
 #include <vespa/searchcore/proton/server/clusterstatehandler.h>
 #include <vespa/searchcore/proton/server/iclusterstatechangedhandler.h>
 #include <vespa/searchcore/proton/test/test.h>
-#include <vespa/vespalib/util/threadstackexecutor.h>
-#include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vdslib/state/clusterstate.h>
+#include <vespa/vespalib/gtest/gtest.h>
+#include <vespa/vespalib/util/threadstackexecutor.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("cluster_state_handler_test");
@@ -17,8 +18,7 @@ using storage::spi::BucketIdListResult;
 using storage::spi::ClusterState;
 using storage::spi::Result;
 
-struct MyClusterStateChangedHandler : public IClusterStateChangedHandler
-{
+struct MyClusterStateChangedHandler : public IClusterStateChangedHandler {
     std::shared_ptr<IBucketStateCalculator> _calc;
     void
     notifyClusterStateChanged(const std::shared_ptr<IBucketStateCalculator> &newCalc) override {
@@ -26,7 +26,6 @@ struct MyClusterStateChangedHandler : public IClusterStateChangedHandler
     }
 };
 
-
 BucketId bucket1(1);
 BucketId bucket2(2);
 BucketId bucket3(3);
@@ -34,15 +33,13 @@ Distribution distribution(Distribution::getDefaultDistributionConfig(3, 3));
 storage::lib::ClusterState rawClusterState("version:1 storage:3 distributor:3");
 ClusterState clusterState(rawClusterState, 0, distribution);
 
-
-struct Fixture
-{
+struct ClusterStateHandlerTest : testing::Test {
     vespalib::ThreadStackExecutor   _exec;
     ClusterStateHandler             _stateHandler;
     MyClusterStateChangedHandler    _changedHandler;
     test::GenericResultHandler      _genericHandler;
     test::BucketIdListResultHandler _bucketListHandler;
-    Fixture()
+    ClusterStateHandlerTest()
         : _exec(1),
           _stateHandler(_exec),
           _changedHandler(),
@@ -51,47 +48,40 @@ struct Fixture
     {
         _stateHandler.addClusterStateChangedHandler(&_changedHandler);
     }
-    ~Fixture()
-    {
+    ~ClusterStateHandlerTest() {
         _stateHandler.removeClusterStateChangedHandler(&_changedHandler);
     }
 };
 
-
-TEST_F("require that cluster state change is notified", Fixture)
+TEST_F(ClusterStateHandlerTest, cluster_state_change_is_notified)
 {
-    f._stateHandler.handleSetClusterState(clusterState, f._genericHandler);
-    f._exec.sync();
-    EXPECT_TRUE(f._changedHandler._calc);
+    _stateHandler.handleSetClusterState(clusterState, _genericHandler);
+    _exec.sync();
+    EXPECT_TRUE(_changedHandler._calc);
 }
 
-
-TEST_F("require that modified buckets are returned", Fixture)
+TEST_F(ClusterStateHandlerTest, modified_buckets_are_returned)
 {
-    f._stateHandler.handleSetClusterState(clusterState, f._genericHandler);
-    f._exec.sync();
+    _stateHandler.handleSetClusterState(clusterState, _genericHandler);
+    _exec.sync();
 
     // notify 2 buckets
-    IBucketModifiedHandler &bmh = f._stateHandler;
+    IBucketModifiedHandler &bmh = _stateHandler;
     bmh.notifyBucketModified(bucket1);
     bmh.notifyBucketModified(bucket2);
-    f._stateHandler.handleGetModifiedBuckets(f._bucketListHandler);
-    f._exec.sync();
-    EXPECT_EQUAL(2u, f._bucketListHandler.getList().size());
-    EXPECT_EQUAL(bucket1, f._bucketListHandler.getList()[0]);
-    EXPECT_EQUAL(bucket2, f._bucketListHandler.getList()[1]);
+    _stateHandler.handleGetModifiedBuckets(_bucketListHandler);
+    _exec.sync();
+    EXPECT_EQ(2u, _bucketListHandler.getList().size());
+    EXPECT_EQ(bucket1, _bucketListHandler.getList()[0]);
+    EXPECT_EQ(bucket2, _bucketListHandler.getList()[1]);
 
     // notify 1 bucket, already reported buckets should be gone
     bmh.notifyBucketModified(bucket3);
-    f._stateHandler.handleGetModifiedBuckets(f._bucketListHandler);
-    f._exec.sync();
-    EXPECT_EQUAL(1u, f._bucketListHandler.getList().size());
-    EXPECT_EQUAL(bucket3, f._bucketListHandler.getList()[0]);
+    _stateHandler.handleGetModifiedBuckets(_bucketListHandler);
+    _exec.sync();
+    EXPECT_EQ(1u, _bucketListHandler.getList().size());
+    EXPECT_EQ(bucket3, _bucketListHandler.getList()[0]);
 }
 
-
-TEST_MAIN()
-{
-    TEST_RUN_ALL();
-}
+GTEST_MAIN_RUN_ALL_TESTS()