diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-06-14 20:05:50 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-06-14 20:05:50 +0200 |
commit | 62e5c57333d0ac9d3f242d3d9318478cab659488 (patch) | |
tree | fa6d02630786a6331c431906626c827939ada037 /tests/clientapitest.cpp | |
parent | 077edcc5bb569d2786f5cf80c1648451871668b8 (diff) | |
download | sink-62e5c57333d0ac9d3f242d3d9318478cab659488.tar.gz sink-62e5c57333d0ac9d3f242d3d9318478cab659488.zip |
Fixed build.
We already exported that symbol as a non-template class in the dummy
resource code.
Diffstat (limited to 'tests/clientapitest.cpp')
-rw-r--r-- | tests/clientapitest.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
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 @@ | |||
10 | #include "facadefactory.h" | 10 | #include "facadefactory.h" |
11 | 11 | ||
12 | template <typename T> | 12 | template <typename T> |
13 | class DummyResourceFacade : public Sink::StoreFacade<T> | 13 | class TestDummyResourceFacade : public Sink::StoreFacade<T> |
14 | { | 14 | { |
15 | public: | 15 | public: |
16 | static std::shared_ptr<DummyResourceFacade<T>> registerFacade(const QByteArray &instanceIdentifier = QByteArray()) | 16 | static std::shared_ptr<TestDummyResourceFacade<T>> registerFacade(const QByteArray &instanceIdentifier = QByteArray()) |
17 | { | 17 | { |
18 | static QMap<QByteArray, std::shared_ptr<DummyResourceFacade<T>>> map; | 18 | static QMap<QByteArray, std::shared_ptr<TestDummyResourceFacade<T>>> map; |
19 | auto facade = std::make_shared<DummyResourceFacade<T>>(); | 19 | auto facade = std::make_shared<TestDummyResourceFacade<T>>(); |
20 | map.insert(instanceIdentifier, facade); | 20 | map.insert(instanceIdentifier, facade); |
21 | bool alwaysReturnFacade = instanceIdentifier.isEmpty(); | 21 | bool alwaysReturnFacade = instanceIdentifier.isEmpty(); |
22 | Sink::FacadeFactory::instance().registerFacade<T, DummyResourceFacade<T>>("dummyresource", [alwaysReturnFacade](const QByteArray &instanceIdentifier) { | 22 | Sink::FacadeFactory::instance().registerFacade<T, TestDummyResourceFacade<T>>("dummyresource", [alwaysReturnFacade](const QByteArray &instanceIdentifier) { |
23 | if (alwaysReturnFacade) { | 23 | if (alwaysReturnFacade) { |
24 | return map.value(QByteArray()); | 24 | return map.value(QByteArray()); |
25 | } | 25 | } |
@@ -27,7 +27,7 @@ public: | |||
27 | }); | 27 | }); |
28 | return facade; | 28 | return facade; |
29 | } | 29 | } |
30 | ~DummyResourceFacade(){}; | 30 | ~TestDummyResourceFacade(){}; |
31 | KAsync::Job<void> create(const T &domainObject) Q_DECL_OVERRIDE | 31 | KAsync::Job<void> create(const T &domainObject) Q_DECL_OVERRIDE |
32 | { | 32 | { |
33 | return KAsync::null<void>(); | 33 | return KAsync::null<void>(); |
@@ -96,7 +96,7 @@ private slots: | |||
96 | 96 | ||
97 | void testLoad() | 97 | void testLoad() |
98 | { | 98 | { |
99 | auto facade = DummyResourceFacade<Sink::ApplicationDomain::Event>::registerFacade(); | 99 | auto facade = TestDummyResourceFacade<Sink::ApplicationDomain::Event>::registerFacade(); |
100 | facade->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 100 | facade->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
101 | ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); | 101 | ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); |
102 | 102 | ||
@@ -121,7 +121,7 @@ private slots: | |||
121 | 121 | ||
122 | void testModelSingle() | 122 | void testModelSingle() |
123 | { | 123 | { |
124 | auto facade = DummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade(); | 124 | auto facade = TestDummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade(); |
125 | facade->results << QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 125 | facade->results << QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
126 | ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); | 126 | ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); |
127 | 127 | ||
@@ -135,7 +135,7 @@ private slots: | |||
135 | 135 | ||
136 | void testModelNested() | 136 | void testModelNested() |
137 | { | 137 | { |
138 | auto facade = DummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade(); | 138 | auto facade = TestDummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade(); |
139 | auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 139 | auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
140 | auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 140 | auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
141 | subfolder->setProperty("parent", "id"); | 141 | subfolder->setProperty("parent", "id"); |
@@ -158,7 +158,7 @@ private slots: | |||
158 | 158 | ||
159 | void testModelSignals() | 159 | void testModelSignals() |
160 | { | 160 | { |
161 | auto facade = DummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade(); | 161 | auto facade = TestDummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade(); |
162 | auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 162 | auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
163 | auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 163 | auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
164 | subfolder->setProperty("parent", "id"); | 164 | subfolder->setProperty("parent", "id"); |
@@ -180,7 +180,7 @@ private slots: | |||
180 | 180 | ||
181 | void testModelNestedLive() | 181 | void testModelNestedLive() |
182 | { | 182 | { |
183 | auto facade = DummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade(); | 183 | auto facade = TestDummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade(); |
184 | auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 184 | auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
185 | auto subfolder = | 185 | auto subfolder = |
186 | QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 186 | QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
@@ -234,9 +234,9 @@ private slots: | |||
234 | 234 | ||
235 | void testLoadMultiResource() | 235 | void testLoadMultiResource() |
236 | { | 236 | { |
237 | auto facade1 = DummyResourceFacade<Sink::ApplicationDomain::Event>::registerFacade("dummyresource.instance1"); | 237 | auto facade1 = TestDummyResourceFacade<Sink::ApplicationDomain::Event>::registerFacade("dummyresource.instance1"); |
238 | facade1->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource1", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 238 | facade1->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource1", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
239 | auto facade2 = DummyResourceFacade<Sink::ApplicationDomain::Event>::registerFacade("dummyresource.instance2"); | 239 | auto facade2 = TestDummyResourceFacade<Sink::ApplicationDomain::Event>::registerFacade("dummyresource.instance2"); |
240 | facade2->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource2", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 240 | facade2->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource2", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
241 | ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); | 241 | ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); |
242 | ResourceConfig::addResource("dummyresource.instance2", "dummyresource"); | 242 | ResourceConfig::addResource("dummyresource.instance2", "dummyresource"); |
@@ -260,7 +260,7 @@ private slots: | |||
260 | 260 | ||
261 | void testImperativeLoad() | 261 | void testImperativeLoad() |
262 | { | 262 | { |
263 | auto facade = DummyResourceFacade<Sink::ApplicationDomain::Event>::registerFacade(); | 263 | auto facade = TestDummyResourceFacade<Sink::ApplicationDomain::Event>::registerFacade(); |
264 | facade->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); | 264 | facade->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create()); |
265 | ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); | 265 | ResourceConfig::addResource("dummyresource.instance1", "dummyresource"); |
266 | 266 | ||