[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=244e32c

The following commit has been merged in the master branch:
commit 244e32c5f9997e7ae8e02c7915cf1f18b69332e2
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date:   Mon Jan 3 22:45:09 2011 +0000

    Tidy up deletion of objects in test cases.
---
 kpeople/nepomuk-feeder/tests/controller-test.cpp | 8 ++------
 kpeople/nepomuk-feeder/tests/controller-test.h   | 1 -
 kpeople/nepomuk-feeder/tests/storage-test.cpp    | 2 ++
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/kpeople/nepomuk-feeder/tests/controller-test.cpp b/kpeople/nepomuk-feeder/tests/controller-test.cpp
index 7c73b84..e961f1a 100644
--- a/kpeople/nepomuk-feeder/tests/controller-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/controller-test.cpp
@@ -81,12 +81,6 @@ void OnNewAccountFakeStorage::createAccount(const QString &path,
     m_test->onNewAccountOnAccountCreatedStorage();
 }
 
-void OnNewAccountFakeStorage::destroyAccount(const QString &path)
-{
-    Q_UNUSED(path);
-    kDebug();
-}
-
 
 ControllerTest::ControllerTest(QObject *parent)
   : Test(parent),
@@ -218,7 +212,9 @@ void ControllerTest::cleanupTestCase()
 
     // Clear re-used member variables.
     if (m_controller) {
+        connect(m_controller, SIGNAL(destroyed()), mLoop, SLOT(quit()));
         m_controller->deleteLater();
+        mLoop->exec();
         m_controller = 0;
     }
 
diff --git a/kpeople/nepomuk-feeder/tests/controller-test.h b/kpeople/nepomuk-feeder/tests/controller-test.h
index 4fd9da9..bd53f30 100644
--- a/kpeople/nepomuk-feeder/tests/controller-test.h
+++ b/kpeople/nepomuk-feeder/tests/controller-test.h
@@ -100,7 +100,6 @@ public:
 
 public Q_SLOTS:
     virtual void createAccount(const QString &path, const QString &id, const QString &protocol);
-    virtual void destroyAccount(const QString &path);
 
 private:
     ControllerTest *m_test;
diff --git a/kpeople/nepomuk-feeder/tests/storage-test.cpp b/kpeople/nepomuk-feeder/tests/storage-test.cpp
index 5c60b29..822eae2 100644
--- a/kpeople/nepomuk-feeder/tests/storage-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/storage-test.cpp
@@ -337,7 +337,9 @@ void StorageTest::cleanupTestCase()
 
     // Clear re-used member variables.
     if (m_storage) {
+        connect(m_storage, SIGNAL(destroyed()), mLoop, SLOT(quit()));
         m_storage->deleteLater();
+        mLoop->exec();
         m_storage = 0;
     }
 }

-- 
ktp-common-internals packaging