1 files changed, 26 insertions, 18 deletions

diff --git a/storage/src/tests/common/storagelinktest.cpp b/storage/src/tests/common/storagelinktest.cpp
index 95fe8ad23da..890376debbc 100644
--- a/storage/src/tests/common/storagelinktest.cpp
+++ b/storage/src/tests/common/storagelinktest.cpp
@@ -1,25 +1,35 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <tests/common/storagelinktest.h>
 #include <vespa/document/test/make_document_bucket.h>
+#include <tests/common/dummystoragelink.h>
+#include <vespa/storageapi/message/stat.h>
+#include <vespa/vespalib/gtest/gtest.h>
 #include <iostream>
 #include <string>
-#include <vespa/storageapi/message/stat.h>
 
 using document::test::makeDocumentBucket;
+using namespace ::testing;
 
 namespace storage {
 
-CPPUNIT_TEST_SUITE_REGISTRATION(StorageLinkTest);
+struct StorageLinkTest : public Test {
+    std::unique_ptr<DummyStorageLink> _feeder;
+    DummyStorageLink* _middle;
+    DummyStorageLink* _replier;
+
+    StorageLinkTest();
+
+    void SetUp() override;
+};
 
 StorageLinkTest::StorageLinkTest()
-    : _threadPool(1024),
-      _feeder(),
-      _middle(0),
-      _replier(0) {}
+    : _feeder(),
+      _middle(nullptr),
+      _replier(nullptr)
+{}
 
-void StorageLinkTest::setUp() {
-    _feeder.reset(new DummyStorageLink());
+void StorageLinkTest::SetUp() {
+    _feeder = std::make_unique<DummyStorageLink>();
     _middle = new DummyStorageLink();
     _replier = new DummyStorageLink();
     _feeder->push_back(StorageLink::UP(_middle));
@@ -27,7 +37,7 @@ void StorageLinkTest::setUp() {
     _replier->setAutoreply(true);
 }
 
-void StorageLinkTest::testPrinting() {
+TEST_F(StorageLinkTest, printing) {
     std::ostringstream actual;
     actual << *_feeder;
     std::string expected =
@@ -36,21 +46,19 @@ void StorageLinkTest::testPrinting() {
 "  DummyStorageLink(autoreply = off, dispatch = off, 0 commands, 0 replies)\n"
 "  DummyStorageLink(autoreply = on, dispatch = off, 0 commands, 0 replies)";
 
-    CPPUNIT_ASSERT_EQUAL(expected, actual.str());
+    EXPECT_EQ(expected, actual.str());
 }
 
-void StorageLinkTest::testNotImplemented() {
+TEST_F(StorageLinkTest, not_implemented) {
     _feeder->open();
       // Test that a message that nobody handles fails with NOT_IMPLEMENTED
     _replier->setIgnore(true);
-    _feeder->sendDown(api::StorageCommand::SP(
-                new api::StatBucketCommand(makeDocumentBucket(document::BucketId(0)), "")));
+    _feeder->sendDown(std::make_shared<api::StatBucketCommand>(makeDocumentBucket(document::BucketId(0)), ""));
     _feeder->close();
     _feeder->flush();
-    CPPUNIT_ASSERT_EQUAL((size_t) 1, _feeder->getNumReplies());
-    CPPUNIT_ASSERT_EQUAL(
-            dynamic_cast<api::StatBucketReply&>(
-                *_feeder->getReply(0)).getResult(),
+    ASSERT_EQ(1, _feeder->getNumReplies());
+    EXPECT_EQ(
+            dynamic_cast<api::StatBucketReply&>(*_feeder->getReply(0)).getResult(),
             api::ReturnCode(api::ReturnCode::NOT_IMPLEMENTED, "Statbucket"));
     _feeder->reset();
     _replier->setIgnore(false);