diff --git a/akonadi/tests/CMakeLists.txt b/akonadi/tests/CMakeLists.txt index 84575a216..ef91d474a 100644 --- a/akonadi/tests/CMakeLists.txt +++ b/akonadi/tests/CMakeLists.txt @@ -1,117 +1,116 @@ if(${EXECUTABLE_OUTPUT_PATH}) set( PREVIOUS_EXEC_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) else(${EXECUTABLE_OUTPUT_PATH}) set( PREVIOUS_EXEC_OUTPUT_PATH . ) endif(${EXECUTABLE_OUTPUT_PATH}) set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) include_directories( ${CMAKE_SOURCE_DIR}/akonadi ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ ${Boost_INCLUDE_DIR} ${AKONADI_INCLUDE_DIR} ) # add testrunner (application for managing a self-contained test # environment) add_subdirectory(testrunner) # add benchmarker add_subdirectory(benchmarker) # convenience macro to add akonadi demo application macro(add_akonadi_demo _source) set(_test ${_source}) get_filename_component(_name ${_source} NAME_WE) kde4_add_executable(${_name} TEST ${_test}) target_link_libraries(${_name} akonadi-kde akonadi-kmime ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS}) endmacro(add_akonadi_demo) # convenience macro to add akonadi qtestlib unit-tests macro(add_akonadi_test _source) set(_test ${_source}) get_filename_component(_name ${_source} NAME_WE) kde4_add_unit_test(${_name} TESTNAME akonadi-${_name} ${_test}) target_link_libraries(${_name} akonadi-kde akonadi-kmime ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${AKONADI_COMMON_LIBRARIES}) endmacro(add_akonadi_test) # convenience macro to add akonadi testrunner unit-tests macro(add_akonadi_isolated_test _source) set(_test ${_source}) get_filename_component(_name ${_source} NAME_WE) kde4_add_executable(${_name} TEST ${_test}) target_link_libraries(${_name} akonadi-kde akonadi-kmime ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${AKONADI_COMMON_LIBRARIES}) # based on kde4_add_unit_test if (WIN32) get_target_property( _loc ${_name} LOCATION ) set(_executable ${_loc}.bat) set(_testrunner ${PREVIOUS_EXEC_OUTPUT_PATH}/akonaditest.bat) else (WIN32) set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_name}) set(_testrunner ${PREVIOUS_EXEC_OUTPUT_PATH}/akonaditest) endif (WIN32) if (UNIX) set(_executable ${_executable}.shell) set(_testrunner ${_testrunner}.shell) endif (UNIX) add_test( akonadi-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-db.xml ${_executable} ) add_test( akonadi-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-fs.xml ${_executable} ) #add_test( akonadi-sqlite-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite.xml ${_executable} ) endmacro(add_akonadi_isolated_test) # demo applications add_akonadi_demo(itemdumper.cpp) add_akonadi_demo(subscriber.cpp) add_akonadi_demo(headfetcher.cpp) add_akonadi_demo(agentinstancewidgettest.cpp) add_akonadi_demo(agenttypewidgettest.cpp) add_akonadi_demo(pluginloadertest.cpp) add_akonadi_demo(selftester.cpp) kde4_add_executable( akonadi-firstrun TEST ../firstrun.cpp firstrunner.cpp ) target_link_libraries( akonadi-firstrun akonadi-kde ${KDE4_KDEUI_LIBS} ) # qtestlib unit tests add_akonadi_test(imapparsertest.cpp) add_akonadi_test(imapsettest.cpp) add_akonadi_test(itemhydratest.cpp) add_akonadi_test(itemtest.cpp) add_akonadi_test(itemserializertest.cpp) add_akonadi_test(mimetypecheckertest.cpp) -add_akonadi_test(notificationmessagetest.cpp) add_akonadi_test(protocolhelpertest.cpp) # testrunner tests add_akonadi_isolated_test(testenvironmenttest.cpp) add_akonadi_isolated_test(autoincrementtest.cpp) add_akonadi_isolated_test(collectionjobtest.cpp) add_akonadi_isolated_test(collectionpathresolvertest.cpp) add_akonadi_isolated_test(collectionattributetest.cpp) add_akonadi_isolated_test(itemfetchtest.cpp) add_akonadi_isolated_test(itemappendtest.cpp) add_akonadi_isolated_test(itemstoretest.cpp) add_akonadi_isolated_test(itemdeletetest.cpp) add_akonadi_isolated_test(monitortest.cpp) add_akonadi_isolated_test(searchjobtest.cpp) add_akonadi_isolated_test(changerecordertest.cpp) add_akonadi_isolated_test(resourcetest.cpp) add_akonadi_isolated_test(subscriptiontest.cpp) add_akonadi_isolated_test(transactiontest.cpp) add_akonadi_isolated_test(itemcopytest.cpp) add_akonadi_isolated_test(itemmovetest.cpp) add_akonadi_isolated_test(collectioncopytest.cpp) add_akonadi_isolated_test(collectionmovetest.cpp) add_akonadi_isolated_test(itemsynctest.cpp) add_akonadi_isolated_test(linktest.cpp) add_akonadi_isolated_test(cachetest.cpp) add_akonadi_isolated_test(servermanagertest.cpp) add_akonadi_isolated_test(collectioncreator.cpp) add_akonadi_isolated_test(itembenchmark.cpp) diff --git a/akonadi/tests/notificationmessagetest.cpp b/akonadi/tests/notificationmessagetest.cpp deleted file mode 100644 index 6534092c4..000000000 --- a/akonadi/tests/notificationmessagetest.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* - Copyright (c) 2007 Volker Krause - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public - License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. -*/ - -#include "notificationmessagetest.h" -#include "notificationmessagetest.moc" - -#include - -#include - -QTEST_KDEMAIN( NotificationMessageTest, NoGUI ) - -using namespace Akonadi; - -void NotificationMessageTest::testCompress() -{ - NotificationMessage::List list; - NotificationMessage msg; - msg.setType( NotificationMessage::Item ); - msg.setOperation( NotificationMessage::Add ); - - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 1 ); - - msg.setOperation( NotificationMessage::Modify ); - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 1 ); - QCOMPARE( list.first().operation(), NotificationMessage::Add ); - - msg.setOperation( NotificationMessage::Remove ); - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 2 ); // should be 2 for collections, 0 for items? -} - -void NotificationMessageTest::testCompress2() -{ - NotificationMessage::List list; - NotificationMessage msg; - msg.setType( NotificationMessage::Item ); - msg.setOperation( NotificationMessage::Modify ); - - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 1 ); - - msg.setOperation( NotificationMessage::Remove ); - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 1 ); - QCOMPARE( list.first().operation(), NotificationMessage::Remove ); -} - -void NotificationMessageTest::testCompress3() -{ - NotificationMessage::List list; - NotificationMessage msg; - msg.setType( NotificationMessage::Item ); - msg.setOperation( NotificationMessage::Modify ); - - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 1 ); - - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 1 ); -} - -void NotificationMessageTest::testNoCompress() -{ - NotificationMessage::List list; - NotificationMessage msg; - msg.setType( NotificationMessage::Item ); - msg.setOperation( NotificationMessage::Modify ); - - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 1 ); - - msg.setType( NotificationMessage::Collection ); - NotificationMessage::appendAndCompress( list, msg ); - QCOMPARE( list.count(), 2 ); -} diff --git a/akonadi/tests/notificationmessagetest.h b/akonadi/tests/notificationmessagetest.h deleted file mode 100644 index 819b3bdfa..000000000 --- a/akonadi/tests/notificationmessagetest.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (c) 2007 Volker Krause - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public - License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. -*/ - -#ifndef AKONADI_NOTIFICATIONMESSAGETEST_H -#define AKONADI_NOTIFICATIONMESSAGETEST_H - -#include - -class NotificationMessageTest : public QObject -{ - Q_OBJECT - private slots: - void testCompress(); - void testCompress2(); - void testCompress3(); - void testNoCompress(); -}; - - -#endif