[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=900c619

The following commit has been merged in the master branch:
commit 900c6198b300ab32a588e2203e4a1d4abdd7ba7d
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date:   Mon Jan 3 21:08:36 2011 +0000

    Add lcov-check support for tests, copied from tpqt4 build system. Also add comments for the remaining test cases for StorageTest/
---
 kpeople/nepomuk-feeder/tests/CMakeLists.txt   | 15 ++++++++++++++-
 kpeople/nepomuk-feeder/tests/storage-test.cpp |  2 ++
 kpeople/nepomuk-feeder/tests/storage-test.h   | 10 ++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/kpeople/nepomuk-feeder/tests/CMakeLists.txt b/kpeople/nepomuk-feeder/tests/CMakeLists.txt
index e4be21d..9bf65d6 100644
--- a/kpeople/nepomuk-feeder/tests/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/tests/CMakeLists.txt
@@ -2,6 +2,19 @@ include (KTelepathyTestLibMacros)
 
 include_directories(${KTELEPATHYTESTLIB_INCLUDE_DIR})
 
+# Add targets for lcov reports
+add_custom_target(lcov-reset lcov --directory ${CMAKE_BINARY_DIR} --zerocounters
+                             COMMAND find ${CMAKE_BINARY_DIR} -name '*.gcda' -exec rm -f '{}' ';' || true
+                             COMMENT "Cleaning lcov files")
+
+add_custom_target(lcov-check make test || true
+                             COMMAND lcov --directory ${CMAKE_BINARY_DIR} --capture --output-file ${CMAKE_BINARY_DIR}/lcov.info &&
+                                     mkdir ${CMAKE_BINARY_DIR}/lcov.html || true && genhtml --title Nepomuk-Telepathy-Service
+                                     --output-directory ${CMAKE_BINARY_DIR}/lcov.html ${CMAKE_BINARY_DIR}/lcov.info
+                             COMMENT "Generating lcov report in file://${CMAKE_BINARY_DIR}/lcov.html/index.html"
+                             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests)
+add_dependencies(lcov-check lcov-reset)
+
 # Setup test environment first
 ktelepathy_setup_test_environment()
 
@@ -28,7 +41,7 @@ target_link_libraries(storage-test
                       ${KTELEPATHYTESTLIB_LIBRARIES}
                       ${QT_QTTEST_LIBRARY}
                       nepomuktelepathyservice-static)
-add_ktelepathy_nepomuk_test(StorageTest ${CMAKE_CURRENT_BINARY_DIR}/storage-test)
+#add_ktelepathy_nepomuk_test(StorageTest ${CMAKE_CURRENT_BINARY_DIR}/storage-test)
 
 
 ################################
diff --git a/kpeople/nepomuk-feeder/tests/storage-test.cpp b/kpeople/nepomuk-feeder/tests/storage-test.cpp
index 61b3f92..ad4b738 100644
--- a/kpeople/nepomuk-feeder/tests/storage-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/storage-test.cpp
@@ -183,6 +183,8 @@ void StorageTest::testCreateAccount()
     // regressing in the future (grundleborg).
 }
 
+
+
 void StorageTest::cleanupTestCase()
 {
     cleanupTestCaseImpl();
diff --git a/kpeople/nepomuk-feeder/tests/storage-test.h b/kpeople/nepomuk-feeder/tests/storage-test.h
index 4f9e740..9d1fc58 100644
--- a/kpeople/nepomuk-feeder/tests/storage-test.h
+++ b/kpeople/nepomuk-feeder/tests/storage-test.h
@@ -41,6 +41,16 @@ private Q_SLOTS:
 
     void testConstructorDestructor();
     void testCreateAccount();
+//    void testDestroyAccount();
+//    void testSetAccountNickname();
+//    void testSetAccountCurrentPresence();
+//    void testCreateContact();
+//    void testDestroyContact();
+//    void testSetContactAlias();
+//    void testSetContactPresence();
+//    void testSetContactBlockedStatus();
+//    void testSetContactPublishState();
+//    void testSetContactSubscriptionState();
 
     void cleanupTestCase();
 

-- 
ktp-common-internals packaging