From 9e967283190d36510fbcf73a79cc239dc696ec85 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 7 Jul 2015 03:13:12 +0200
Subject: Remove externallyManaged hack now that we use std::shared_ptr

---
 tests/clientapitest.cpp | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

(limited to 'tests')

diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 30c52fc..081e6ad 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -106,13 +106,12 @@ private Q_SLOTS:
 
     void testLoad()
     {
-        DummyResourceFacade facade;
-        facade.results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
+        auto facade = std::make_shared<DummyResourceFacade>();
+        facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
 
         Akonadi2::FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>("dummyresource",
-            [&facade](bool &externallyManaged) {
-                externallyManaged = true;
-                return &facade;
+            [facade]() {
+                return facade;
             }
         );
 
@@ -127,13 +126,12 @@ private Q_SLOTS:
 
     void testLiveQuery()
     {
-        DummyResourceFacade facade;
-        facade.results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
+        auto facade = std::make_shared<DummyResourceFacade>();
+        facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
 
         Akonadi2::FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>("dummyresource",
-            [&facade](bool &externallyManaged){
-                externallyManaged = true;
-                return &facade;
+            [facade](){
+                return facade;
             }
         );
 
@@ -146,22 +144,20 @@ private Q_SLOTS:
         QCOMPARE(result.size(), 1);
 
         //Enter a second result
-        facade.results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
-        qWarning() << &facade;
-        QVERIFY(facade.notifier);
-        facade.notifier->revisionChanged(2);
+        facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
+        QVERIFY(facade->notifier);
+        facade->notifier->revisionChanged(2);
         QTRY_COMPARE(result.size(), 2);
     }
 
     void testQueryLifetime()
     {
-        DummyResourceFacade facade;
-        facade.results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
+        auto facade = std::make_shared<DummyResourceFacade>();
+        facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
 
         Akonadi2::FacadeFactory::instance().registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>("dummyresource",
-            [&facade](bool &externallyManaged){
-                externallyManaged = true;
-                return &facade;
+            [facade](){
+                return facade;
             }
         );
 
@@ -175,7 +171,7 @@ private Q_SLOTS:
             QCOMPARE(result.size(), 1);
         }
         //It's running in a separate thread, so we have to wait for a moment.
-        QTRY_VERIFY(!facade.capturedResultProvider);
+        QTRY_VERIFY(!facade->capturedResultProvider);
     }
 
 };
-- 
cgit v1.2.3