1 files changed, 5 insertions, 22 deletions
diff --git a/storage/src/tests/persistence/diskmoveoperationhandlertest.cpp b/storage/src/tests/persistence/diskmoveoperationhandlertest.cpp
index def9dd6ec6e..0dd3285e5f3 100644
--- a/storage/src/tests/persistence/diskmoveoperationhandlertest.cpp
+++ b/storage/src/tests/persistence/diskmoveoperationhandlertest.cpp
@@ -1,34 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/storage/persistence/diskmoveoperationhandler.h>
-#include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storage/persistence/messages.h>
 #include <tests/persistence/persistencetestutils.h>
 #include <vespa/document/test/make_document_bucket.h>
 
 using document::test::makeDocumentBucket;
+using namespace ::testing;
 
 namespace storage {
 
-class DiskMoveOperationHandlerTest : public PersistenceTestUtils
-{
-    CPPUNIT_TEST_SUITE(DiskMoveOperationHandlerTest);
-    CPPUNIT_TEST(testSimple);
-    CPPUNIT_TEST_SUITE_END();
+struct DiskMoveOperationHandlerTest : PersistenceTestUtils {};
 
-public:
-    void testSimple();
-    void testTargetExists();
-    void testTargetWithOverlap();
-
-    void insertDocumentInBucket(uint64_t location, uint64_t timestamp, document::BucketId bucket);
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(DiskMoveOperationHandlerTest);
-
-void
-DiskMoveOperationHandlerTest::testSimple()
-{
+TEST_F(DiskMoveOperationHandlerTest, simple) {
     setupDisks(10);
 
     // Create bucket 16, 4 on disk 3.
@@ -51,9 +35,8 @@ DiskMoveOperationHandlerTest::testSimple()
     spi::Context context(documentapi::LoadType::DEFAULT, 0, 0);
     diskMoveHandler.handleBucketDiskMove(move, context);
 
-    CPPUNIT_ASSERT_EQUAL(
-            std::string("BucketId(0x4000000000000004): 10,4"),
-            getBucketStatus(document::BucketId(16,4)));
+    EXPECT_EQ("BucketId(0x4000000000000004): 10,4",
+              getBucketStatus(document::BucketId(16,4)));
 }
 
 }