[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=22423ab

The following commit has been merged in the master branch:
commit 22423ab1fa7cd4dbaaf596eb25d6cfeae58773ab
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date:   Mon Jan 3 17:11:07 2011 +0000

    Add a TestBackdoors class to allow getting at internal data of classes for unit-tests. Add functions to it for testing the NepomukStorage class.
---
 kpeople/nepomuk-feeder/CMakeLists.txt              |  1 +
 kpeople/nepomuk-feeder/nepomuk-storage.h           |  2 ++
 .../{abstract-storage.cpp => test-backdoors.cpp}   | 23 ++++++++++++++++------
 .../{abstract-storage.cpp => test-backdoors.h}     | 23 +++++++++++-----------
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index c2f6660..b92bb19 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -53,6 +53,7 @@ set (nepomuktelepathyservice_static_SRCS
      contact.cpp
      abstract-storage.cpp
      nepomuk-storage.cpp
+     test-backdoors.cpp
 )
 
 kde4_add_library (nepomuktelepathyservice-static
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.h b/kpeople/nepomuk-feeder/nepomuk-storage.h
index b03eaed..d793875 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.h
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.h
@@ -101,6 +101,8 @@ private Q_SLOTS:
 private:
     Q_DISABLE_COPY(NepomukStorage);
 
+    friend class TestBackdoors;
+
     Nepomuk::ResourceManager *m_resourceManager;
     Nepomuk::PersonContact m_mePersonContact;
 
diff --git a/kpeople/nepomuk-feeder/abstract-storage.cpp b/kpeople/nepomuk-feeder/test-backdoors.cpp
similarity index 60%
copy from kpeople/nepomuk-feeder/abstract-storage.cpp
copy to kpeople/nepomuk-feeder/test-backdoors.cpp
index 1cc35fc..b1a853d 100644
--- a/kpeople/nepomuk-feeder/abstract-storage.cpp
+++ b/kpeople/nepomuk-feeder/test-backdoors.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of telepathy-nepomuk-service
  *
- * Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
+ * Copyright (C) 2010-2011 Collabora Ltd. <info at collabora.co.uk>
  *   @author George Goldberg <george.goldberg at collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,19 +19,30 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "abstract-storage.h"
+#include "test-backdoors.h"
 
-AbstractStorage::AbstractStorage(QObject* parent)
-  : QObject(parent)
+Nepomuk::PersonContact
+TestBackdoors::nepomukStorageMePersonContact(NepomukStorage *storage)
 {
+    Q_ASSERT(storage);
 
+    return storage->m_mePersonContact;
 }
 
-AbstractStorage::~AbstractStorage()
+QHash<QString, Nepomuk::IMAccount> &
+TestBackdoors::nepomukStorageAccounts(NepomukStorage *storage)
 {
+    Q_ASSERT(storage);
 
+    return storage->m_accounts;
 }
 
 
-#include "abstract-storage.h"
+QHash<ContactIdentifier, ContactResources> &
+TestBackdoors::nepomukStorageContacts(NepomukStorage *storage)
+{
+    Q_ASSERT(storage);
+
+    return storage->m_contacts;
+}
 
diff --git a/kpeople/nepomuk-feeder/abstract-storage.cpp b/kpeople/nepomuk-feeder/test-backdoors.h
similarity index 61%
copy from kpeople/nepomuk-feeder/abstract-storage.cpp
copy to kpeople/nepomuk-feeder/test-backdoors.h
index 1cc35fc..d6ec486 100644
--- a/kpeople/nepomuk-feeder/abstract-storage.cpp
+++ b/kpeople/nepomuk-feeder/test-backdoors.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of telepathy-nepomuk-service
  *
- * Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
+ * Copyright (C) 2010-2011 Collabora Ltd. <info at collabora.co.uk>
  *   @author George Goldberg <george.goldberg at collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,19 +19,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "abstract-storage.h"
+#ifndef TELEPATHY_NEPOMUK_SERVICE_TEST_BACKDOORS_H
+#define TELEPATHY_NEPOMUK_SERVICE_TEST_BACKDOORS_H
 
-AbstractStorage::AbstractStorage(QObject* parent)
-  : QObject(parent)
-{
+#include "nepomuk-storage.h"
 
-}
+class KDE_EXPORT TestBackdoors {
+public:
+    static Nepomuk::PersonContact nepomukStorageMePersonContact(NepomukStorage *storage);
+    static QHash<QString, Nepomuk::IMAccount>& nepomukStorageAccounts(NepomukStorage *storage);
+    static QHash<ContactIdentifier, ContactResources>& nepomukStorageContacts(NepomukStorage *storage);
+};
 
-AbstractStorage::~AbstractStorage()
-{
 
-}
-
-
-#include "abstract-storage.h"
+#endif  // Header guard
 

-- 
ktp-common-internals packaging