Convert remaining CppUnit tests to GTest

Move base message sender stub out to common test module to
avoid artificial dependency from persistence tests to the
distributor tests.

1 files changed, 11 insertions, 20 deletions

diff --git a/storage/src/tests/common/hostreporter/versionreportertest.cpp b/storage/src/tests/common/hostreporter/versionreportertest.cpp
index dd58493f540..ee8fe2a5ff3 100644
--- a/storage/src/tests/common/hostreporter/versionreportertest.cpp
+++ b/storage/src/tests/common/hostreporter/versionreportertest.cpp
@@ -1,38 +1,29 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
+
+#include "util.h"
 #include <vespa/storage/common/hostreporter/versionreporter.h>
-#include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/vespalib/util/jsonstream.h>
-#include "util.h"
+#include <vespa/vespalib/gtest/gtest.h>
+#include <gmock/gmock.h>
 
-LOG_SETUP(".test.versionreporter");
+using namespace ::testing;
 
 namespace storage {
 namespace {
+
 using Object = vespalib::JsonStream::Object;
 using End = vespalib::JsonStream::End;
-}
 
-struct VersionReporterTest : public CppUnit::TestFixture
-{
-    void testVersionReporter();
-
-    CPPUNIT_TEST_SUITE(VersionReporterTest);
-    CPPUNIT_TEST(testVersionReporter);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(VersionReporterTest);
+}
 
-void
-VersionReporterTest::testVersionReporter()
-{
+TEST(VersionReporterTest, version_reporter) {
     VersionReporter versionReporter;
     vespalib::Slime slime;
     util::reporterToSlime(versionReporter,  slime);
     std::string version = slime.get()["vtag"]["version"].asString().make_string().c_str();
-    CPPUNIT_ASSERT(version.length() > 2);
-    CPPUNIT_ASSERT(version.find(".") > 0);
+    EXPECT_GT(version.size(), 2);
+    EXPECT_THAT(version, HasSubstr("."));
 }
+
 } // storage