[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=c2a4913

The following commit has been merged in the master branch:
commit c2a49137d34321564326198e3203d17de2957378
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date:   Tue Jan 4 22:09:29 2011 +0000

    Fix misunderstanding about init/cleanupTestCase vs init/cleanup.
---
 kpeople/nepomuk-feeder/tests/controller-test.cpp | 18 +++++++++++++++---
 kpeople/nepomuk-feeder/tests/controller-test.h   |  2 ++
 kpeople/nepomuk-feeder/tests/storage-test.cpp    | 14 ++++++++++++--
 kpeople/nepomuk-feeder/tests/storage-test.h      |  2 ++
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/kpeople/nepomuk-feeder/tests/controller-test.cpp b/kpeople/nepomuk-feeder/tests/controller-test.cpp
index e961f1a..4f37eb4 100644
--- a/kpeople/nepomuk-feeder/tests/controller-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/controller-test.cpp
@@ -99,6 +99,11 @@ void ControllerTest::initTestCase()
     initTestCaseImpl();
 }
 
+void ControllerTest::init()
+{
+    initImpl();
+}
+
 void ControllerTest::testConstructorDestructor()
 {
     // First step of this test is to create an account on the AM already.
@@ -118,9 +123,11 @@ void ControllerTest::testConstructorDestructor()
     // Next test is to destroy the controller, and check the account is destroyed too.
     constructorDestructorAccountDestroyed = false;
     m_controller->shutdown();
-    m_controller->deleteLater();
 
     connect(m_controller, SIGNAL(destroyed()), SLOT(constructorDestructorOnControllerDestroyed()));
+    m_controller->deleteLater();
+    m_controller = 0;
+
     QCOMPARE(mLoop->exec(), 3);
     QVERIFY(constructorDestructorAccountDestroyed);
 }
@@ -206,9 +213,9 @@ void ControllerTest::onNewAccountOnAccountCreatedStorage()
     mLoop->exit(2);
 }
 
-void ControllerTest::cleanupTestCase()
+void ControllerTest::cleanup()
 {
-    cleanupTestCaseImpl();
+    cleanupImpl();
 
     // Clear re-used member variables.
     if (m_controller) {
@@ -221,6 +228,11 @@ void ControllerTest::cleanupTestCase()
     m_accountManager.reset();
 }
 
+void ControllerTest::cleanupTestCase()
+{
+    cleanupTestCaseImpl();
+}
+
 
 QTEST_KDEMAIN(ControllerTest, GUI)
 
diff --git a/kpeople/nepomuk-feeder/tests/controller-test.h b/kpeople/nepomuk-feeder/tests/controller-test.h
index bd53f30..89b2bee 100644
--- a/kpeople/nepomuk-feeder/tests/controller-test.h
+++ b/kpeople/nepomuk-feeder/tests/controller-test.h
@@ -55,11 +55,13 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void initTestCase();
+    void init();
 
     void testConstructorDestructor();
     void testOnNewAccount();
   //  void testSignalRelays();
 
+    void cleanup();
     void cleanupTestCase();
 
 private:
diff --git a/kpeople/nepomuk-feeder/tests/storage-test.cpp b/kpeople/nepomuk-feeder/tests/storage-test.cpp
index 7836833..a2a4df8 100644
--- a/kpeople/nepomuk-feeder/tests/storage-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/storage-test.cpp
@@ -44,6 +44,11 @@ void StorageTest::initTestCase()
     initTestCaseImpl();
 }
 
+void StorageTest::init()
+{
+    initImpl();
+}
+
 void StorageTest::testConstructorDestructor()
 {
     // First test constructing the NepomukStorage on a Nepomuk database with no relevant
@@ -955,9 +960,9 @@ void StorageTest::testSetContactSubscriptionState()
     pC2.remove();
 }
 
-void StorageTest::cleanupTestCase()
+void StorageTest::cleanup()
 {
-    cleanupTestCaseImpl();
+    cleanupImpl();
 
     // Clear re-used member variables.
     if (m_storage) {
@@ -968,6 +973,11 @@ void StorageTest::cleanupTestCase()
     }
 }
 
+void StorageTest::cleanupTestCase()
+{
+    cleanupTestCaseImpl();
+}
+
 
 QTEST_KDEMAIN(StorageTest, GUI)
 
diff --git a/kpeople/nepomuk-feeder/tests/storage-test.h b/kpeople/nepomuk-feeder/tests/storage-test.h
index 7d1f5c2..247049a 100644
--- a/kpeople/nepomuk-feeder/tests/storage-test.h
+++ b/kpeople/nepomuk-feeder/tests/storage-test.h
@@ -38,6 +38,7 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void initTestCase();
+    void init();
 
     void testConstructorDestructor();
     void testCreateAccount();
@@ -52,6 +53,7 @@ private Q_SLOTS:
     void testSetContactPublishState();
     void testSetContactSubscriptionState();
 
+    void cleanup();
     void cleanupTestCase();
 
 private:

-- 
ktp-common-internals packaging