[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=376948c

The following commit has been merged in the master branch:
commit 376948c18ec35e570c0a1707bf0b6901064885c0
Author: Vishesh Handa <handa.vish at gmail.com>
Date:   Thu Mar 15 15:40:08 2012 +0530

    Include the tests again
    
    * Generate the ontologies, but only for the tests
    * Change includes from TelepathyQt4 to TelepathyQt
---
 kpeople/nepomuk-feeder/CMakeLists.txt            |  2 +-
 kpeople/nepomuk-feeder/tests/CMakeLists.txt      | 11 ++++++++++-
 kpeople/nepomuk-feeder/tests/account-test.cpp    |  6 +++---
 kpeople/nepomuk-feeder/tests/account-test.h      |  4 ++--
 kpeople/nepomuk-feeder/tests/controller-test.cpp |  4 ++--
 kpeople/nepomuk-feeder/tests/controller-test.h   |  2 +-
 kpeople/nepomuk-feeder/tests/storage-test.cpp    | 14 +++++++-------
 7 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index 946d069..cbde23f 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -118,5 +118,5 @@ install_ontology (telepathy telepathy)
 find_package (KTelepathyTestLib)
 
 if (KTelepathyTestLib_DIR)
-    #add_subdirectory(tests)
+    add_subdirectory(tests)
 endif (KTelepathyTestLib_DIR)
diff --git a/kpeople/nepomuk-feeder/tests/CMakeLists.txt b/kpeople/nepomuk-feeder/tests/CMakeLists.txt
index 2360c46..2f5ee80 100644
--- a/kpeople/nepomuk-feeder/tests/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/tests/CMakeLists.txt
@@ -18,6 +18,15 @@ add_dependencies(lcov-check lcov-reset)
 # Setup test environment first
 ktelepathy_setup_test_environment()
 
+nepomuk_add_ontology_classes (common_SRCS
+                              ONTOLOGIES
+                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig
+                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
+                          #   ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig
+                          #   ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nmo.trig
+                              ${CMAKE_SOURCE_DIR}/telepathy.trig
+)
+
 # Create our static base test library
 #kde4_add_library(tid-base-tests STATIC tid-base-test.cpp)
 #target_link_libraries(tid-base-tests
@@ -36,7 +45,7 @@ add_ktelepathy_dbus_test(ControllerTest ${CMAKE_CURRENT_BINARY_DIR}/controller-t
 
 ################################
 # Storage test
-kde4_add_executable(storage-test storage-test.cpp)
+kde4_add_executable(storage-test storage-test.cpp ${common_SRCS})
 target_link_libraries(storage-test
                       ${KTELEPATHYTESTLIB_LIBRARIES}
                       ${QT_QTTEST_LIBRARY}
diff --git a/kpeople/nepomuk-feeder/tests/account-test.cpp b/kpeople/nepomuk-feeder/tests/account-test.cpp
index f46b622..fda647c 100644
--- a/kpeople/nepomuk-feeder/tests/account-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/account-test.cpp
@@ -30,9 +30,9 @@
 
 #include <QtTest/QSignalSpy>
 
-#include <TelepathyQt4/PendingAccount>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/PendingAccount>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
 
 AccountTest::AccountTest(QObject *parent)
 : Test(parent),
diff --git a/kpeople/nepomuk-feeder/tests/account-test.h b/kpeople/nepomuk-feeder/tests/account-test.h
index dd53b39..3feee7f 100644
--- a/kpeople/nepomuk-feeder/tests/account-test.h
+++ b/kpeople/nepomuk-feeder/tests/account-test.h
@@ -25,8 +25,8 @@
 
 #include <KTelepathy/TestLib/Test>
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountManager>
 
 class Account;
 
diff --git a/kpeople/nepomuk-feeder/tests/controller-test.cpp b/kpeople/nepomuk-feeder/tests/controller-test.cpp
index 4e6d447..aec56e2 100644
--- a/kpeople/nepomuk-feeder/tests/controller-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/controller-test.cpp
@@ -30,8 +30,8 @@
 
 #include <QtCore/QTimer>
 
-#include <TelepathyQt4/PendingAccount>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/PendingAccount>
+#include <TelepathyQt/PendingReady>
 
 
 ConstructorDestructorFakeStorage::ConstructorDestructorFakeStorage(ControllerTest *test)
diff --git a/kpeople/nepomuk-feeder/tests/controller-test.h b/kpeople/nepomuk-feeder/tests/controller-test.h
index fdff9e2..cdf690c 100644
--- a/kpeople/nepomuk-feeder/tests/controller-test.h
+++ b/kpeople/nepomuk-feeder/tests/controller-test.h
@@ -26,7 +26,7 @@
 
 #include <KTelepathy/TestLib/Test>
 
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
 
 class Controller;
 
diff --git a/kpeople/nepomuk-feeder/tests/storage-test.cpp b/kpeople/nepomuk-feeder/tests/storage-test.cpp
index a2f48f7..7ac366a 100644
--- a/kpeople/nepomuk-feeder/tests/storage-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/storage-test.cpp
@@ -23,22 +23,22 @@
 
 #include "test-backdoors.h"
 
-#include "ontologies/contactgroup.h"
-#include "ontologies/imcapability.h"
-#include "ontologies/nco.h"
-#include "ontologies/pimo.h"
-#include "ontologies/dataobject.h"
+#include "contactgroup.h"
+#include "imcapability.h"
+#include "dataobject.h"
 
 #include <KDebug>
 
 #include <Nepomuk/Resource>
 #include <Nepomuk/ResourceManager>
+#include <Nepomuk/Vocabulary/NCO>
+#include <Nepomuk/Vocabulary/PIMO>
 #include <Nepomuk/Thing>
 
 #include <qtest_kde.h>
 
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/ContactCapabilities>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/ContactCapabilities>
 
 class FakeContactCapabilities : public Tp::ContactCapabilities {
 

-- 
ktp-common-internals packaging