1 files changed, 11 insertions, 29 deletions

diff --git a/vdslib/src/tests/state/cluster_state_bundle_test.cpp b/vdslib/src/tests/state/cluster_state_bundle_test.cpp
index 4798fe505f8..bfd83673442 100644
--- a/vdslib/src/tests/state/cluster_state_bundle_test.cpp
+++ b/vdslib/src/tests/state/cluster_state_bundle_test.cpp
@@ -2,8 +2,7 @@
 
 #include <vespa/vdslib/state/cluster_state_bundle.h>
 #include <vespa/vdslib/state/clusterstate.h>
-
-#include <cppunit/extensions/HelperMacros.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 using document::BucketSpace;
 
@@ -11,20 +10,6 @@ namespace storage::lib {
 
 using ClusterStatePtr = std::shared_ptr<const ClusterState>;
 
-struct ClusterStateBundleTest : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(ClusterStateBundleTest);
-    CPPUNIT_TEST(derived_state_is_returned_if_bucket_space_is_found);
-    CPPUNIT_TEST(baseline_state_is_returned_if_bucket_space_is_not_found);
-    CPPUNIT_TEST(verify_equality_operator);
-    CPPUNIT_TEST_SUITE_END();
-
-    void derived_state_is_returned_if_bucket_space_is_found();
-    void baseline_state_is_returned_if_bucket_space_is_not_found();
-    void verify_equality_operator();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(ClusterStateBundleTest);
-
 struct Fixture {
     ClusterState baselineState;
     ClusterStatePtr derivedState;
@@ -37,18 +22,16 @@ struct Fixture {
     ~Fixture() {}
 };
 
-void
-ClusterStateBundleTest::derived_state_is_returned_if_bucket_space_is_found()
+TEST(ClusterStateBundleTest, derived_state_is_returned_if_bucket_space_is_found)
 {
     Fixture f;
-    CPPUNIT_ASSERT_EQUAL(*f.derivedState, *f.bundle.getDerivedClusterState(BucketSpace(1)));
+    EXPECT_EQ(*f.derivedState, *f.bundle.getDerivedClusterState(BucketSpace(1)));
 }
 
-void
-ClusterStateBundleTest::baseline_state_is_returned_if_bucket_space_is_not_found()
+TEST(ClusterStateBundleTest, baseline_state_is_returned_if_bucket_space_is_not_found)
 {
     Fixture f;
-    CPPUNIT_ASSERT_EQUAL(f.baselineState, *f.bundle.getDerivedClusterState(BucketSpace(2)));
+    EXPECT_EQ(f.baselineState, *f.bundle.getDerivedClusterState(BucketSpace(2)));
 }
 
 ClusterStateBundle
@@ -61,16 +44,15 @@ makeBundle(const vespalib::string &baselineState, const std::map<BucketSpace, ve
     return ClusterStateBundle(ClusterState(baselineState), std::move(derivedBucketSpaceStates));
 }
 
-void
-ClusterStateBundleTest::verify_equality_operator()
+TEST(ClusterStateBundleTest, verify_equality_operator)
 {
     Fixture f;
-    CPPUNIT_ASSERT(f.bundle != makeBundle("storage:3", {{BucketSpace(1), "storage:2 .1.s:m"}}));
-    CPPUNIT_ASSERT(f.bundle != makeBundle("storage:2", {}));
-    CPPUNIT_ASSERT(f.bundle != makeBundle("storage:2", {{BucketSpace(1), "storage:2 .0.s:m"}}));
-    CPPUNIT_ASSERT(f.bundle != makeBundle("storage:2", {{BucketSpace(2), "storage:2 .1.s:m"}}));
+    EXPECT_NE(f.bundle, makeBundle("storage:3", {{BucketSpace(1), "storage:2 .1.s:m"}}));
+    EXPECT_NE(f.bundle, makeBundle("storage:2", {}));
+    EXPECT_NE(f.bundle, makeBundle("storage:2", {{BucketSpace(1), "storage:2 .0.s:m"}}));
+    EXPECT_NE(f.bundle, makeBundle("storage:2", {{BucketSpace(2), "storage:2 .1.s:m"}}));
 
-    CPPUNIT_ASSERT_EQUAL(f.bundle, makeBundle("storage:2", {{BucketSpace(1), "storage:2 .1.s:m"}}));
+    EXPECT_EQ(f.bundle, makeBundle("storage:2", {{BucketSpace(1), "storage:2 .1.s:m"}}));
 }
 
 }