1 files changed, 27 insertions, 20 deletions
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp
index 54876b01b81..6cf0b53766f 100644
--- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp
+++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp
@@ -1,34 +1,41 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/persistence/conformancetest/conformancetest.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <vespa/document/repo/documenttyperepo.h>
 
-namespace storage {
-namespace spi {
+#include <vespa/log/log.h>
+LOG_SETUP("persistence_dummyimpl_conformance_test");
 
-struct DummyImplTest : public ConformanceTest {
-    struct Factory : public PersistenceFactory {
-        using Repo = document::DocumentTypeRepo;
+namespace storage::spi {
 
-        PersistenceProvider::UP
-        getPersistenceImplementation(const std::shared_ptr<const Repo>& repo, const Repo::DocumenttypesConfig&) override {
-            return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4));
-        }
+namespace {
 
-        bool supportsActiveState() const override { return true; }
-    };
+struct DummyPersistenceFactory : public ConformanceTest::PersistenceFactory {
+    using Repo = document::DocumentTypeRepo;
 
-    DummyImplTest()
-        : ConformanceTest(PersistenceFactory::UP(new Factory)) {}
+    PersistenceProvider::UP
+    getPersistenceImplementation(const std::shared_ptr<const Repo>& repo, const Repo::DocumenttypesConfig&) override {
+        return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4));
+    }
 
-    CPPUNIT_TEST_SUITE(DummyImplTest);
-    DEFINE_CONFORMANCE_TESTS();
-    CPPUNIT_TEST_SUITE_END();
+    bool supportsActiveState() const override { return true; }
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION(DummyImplTest);
+std::unique_ptr<ConformanceTest::PersistenceFactory>
+makeDummyPersistenceFactory(const std::string &)
+{
+    return std::make_unique<DummyPersistenceFactory>();
+}
 
-} // spi
-} // storage
+}
+
+}
+
+int
+main(int argc, char* argv[])
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    storage::spi::ConformanceTest::_factoryFactory = &storage::spi::makeDummyPersistenceFactory;
+    return RUN_ALL_TESTS();
+}