From 62e5c57333d0ac9d3f242d3d9318478cab659488 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 14 Jun 2016 20:05:50 +0200 Subject: Fixed build. We already exported that symbol as a non-template class in the dummy resource code. --- tests/clientapitest.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp index 7f9f422..da0b52a 100644 --- a/tests/clientapitest.cpp +++ b/tests/clientapitest.cpp @@ -10,16 +10,16 @@ #include "facadefactory.h" template -class DummyResourceFacade : public Sink::StoreFacade +class TestDummyResourceFacade : public Sink::StoreFacade { public: - static std::shared_ptr> registerFacade(const QByteArray &instanceIdentifier = QByteArray()) + static std::shared_ptr> registerFacade(const QByteArray &instanceIdentifier = QByteArray()) { - static QMap>> map; - auto facade = std::make_shared>(); + static QMap>> map; + auto facade = std::make_shared>(); map.insert(instanceIdentifier, facade); bool alwaysReturnFacade = instanceIdentifier.isEmpty(); - Sink::FacadeFactory::instance().registerFacade>("dummyresource", [alwaysReturnFacade](const QByteArray &instanceIdentifier) { + Sink::FacadeFactory::instance().registerFacade>("dummyresource", [alwaysReturnFacade](const QByteArray &instanceIdentifier) { if (alwaysReturnFacade) { return map.value(QByteArray()); } @@ -27,7 +27,7 @@ public: }); return facade; } - ~DummyResourceFacade(){}; + ~TestDummyResourceFacade(){}; KAsync::Job create(const T &domainObject) Q_DECL_OVERRIDE { return KAsync::null(); @@ -96,7 +96,7 @@ private slots: void testLoad() { - auto facade = DummyResourceFacade::registerFacade(); + auto facade = TestDummyResourceFacade::registerFacade(); facade->results << QSharedPointer::create("resource", "id", 0, QSharedPointer::create()); ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); @@ -121,7 +121,7 @@ private slots: void testModelSingle() { - auto facade = DummyResourceFacade::registerFacade(); + auto facade = TestDummyResourceFacade::registerFacade(); facade->results << QSharedPointer::create("resource", "id", 0, QSharedPointer::create()); ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); @@ -135,7 +135,7 @@ private slots: void testModelNested() { - auto facade = DummyResourceFacade::registerFacade(); + auto facade = TestDummyResourceFacade::registerFacade(); auto folder = QSharedPointer::create("resource", "id", 0, QSharedPointer::create()); auto subfolder = QSharedPointer::create("resource", "subId", 0, QSharedPointer::create()); subfolder->setProperty("parent", "id"); @@ -158,7 +158,7 @@ private slots: void testModelSignals() { - auto facade = DummyResourceFacade::registerFacade(); + auto facade = TestDummyResourceFacade::registerFacade(); auto folder = QSharedPointer::create("resource", "id", 0, QSharedPointer::create()); auto subfolder = QSharedPointer::create("resource", "subId", 0, QSharedPointer::create()); subfolder->setProperty("parent", "id"); @@ -180,7 +180,7 @@ private slots: void testModelNestedLive() { - auto facade = DummyResourceFacade::registerFacade(); + auto facade = TestDummyResourceFacade::registerFacade(); auto folder = QSharedPointer::create("dummyresource.instance1", "id", 0, QSharedPointer::create()); auto subfolder = QSharedPointer::create("dummyresource.instance1", "subId", 0, QSharedPointer::create()); @@ -234,9 +234,9 @@ private slots: void testLoadMultiResource() { - auto facade1 = DummyResourceFacade::registerFacade("dummyresource.instance1"); + auto facade1 = TestDummyResourceFacade::registerFacade("dummyresource.instance1"); facade1->results << QSharedPointer::create("resource1", "id", 0, QSharedPointer::create()); - auto facade2 = DummyResourceFacade::registerFacade("dummyresource.instance2"); + auto facade2 = TestDummyResourceFacade::registerFacade("dummyresource.instance2"); facade2->results << QSharedPointer::create("resource2", "id", 0, QSharedPointer::create()); ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); ResourceConfig::addResource("dummyresource.instance2", "dummyresource"); @@ -260,7 +260,7 @@ private slots: void testImperativeLoad() { - auto facade = DummyResourceFacade::registerFacade(); + auto facade = TestDummyResourceFacade::registerFacade(); facade->results << QSharedPointer::create("resource", "id", 0, QSharedPointer::create()); ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); -- cgit v1.2.3