Menu
▾
▴
[Opensync-commits] r6008 - plugins/ldap-sync/tests
|
From: <svn...@op...> - 2010-01-14 20:56:19
|
Author: scriptor Date: Thu Jan 14 21:56:02 2010 New Revision: 6008 URL: http://www.opensync.org/changeset/6008 Log: 1. I have eliminated the different ldap-sync.conf* files in tests/. Instead, the ldap-sync.conf is now generated from tests/ldap-sync.conf.templ each time, with the variables being set in test.conf. Thus the configuration becomes easier, as it is now concentrated in tests/test.conf and tests/CMakeLists.txt. Different ldap-sync.conf files are right now necessary only in the check_plugin_auth script. So this file might be worth being checked in case of any problems. Besides, for debugging purposes the "debug" variable in tests/test.conf can be set to "yes". This saves an ldap-sync.conf_${test_name} in the build subdirectory, when the tests are run, so these files can be checked whether something is wrong, there. 2. I have added further tests regarding the files in tests/vcards, tests/vevents, tests/vtodos and tests/vnotes. Trying to write them into the LDAP tree reveals quite some issues, most of them located outside of the LDAP plugin. Among these problems is a) http://www.opensync.org/ticket/1176 element AlarmRepeat: Schemas validity error : Element 'AlarmRepeat': '' is not a valid value of the atomic type 'xs:integer'. ERROR: XMLFormat validation failed. EXIT_ERROR: osync_converter_invoke: XMLFormat validation failed. b) "company phoneöä" is invalid for the LDAP attribute "homePhone" ERROR: /home/a0037/dev/plugins/ldap-sync-jl/src/ldap_plugin.c:3143: LDAP ERROR: "Invalid syntax". homePhone: value #0 invalid per syntax /home/a0037/dev/plugins/ldap-sync-jl/src/ldap_plugin.c:3143: LDAP ERROR: "Invalid syntax". homePhone: value #0 invalid per syntax /home/a0037/dev/plugins/ldap-sync-jl/src/ldap_plugin.c:3143: This error occurred with id = evo2-umlaute.vcf, chtype = 1 dn: uid=evo2-umlaute.vcf,ou=addressbook,dc=example,dc=com cn: Titleö Firstä Middleü Lastß Suffixö givenName: Firstä homePhone: company phoneöä homePostalAddress: Multiline street multiline cityäüööüä mail: workemailö o: organization objectClass: inetOrgPerson sn: Titleö Firstä Middleü Lastß Suffixö uid: evo2-umlaute.vcf c) Several validation errors regarding object type "event": element event: Schemas validity error : Element 'event': Missing child element(s ). Expected is one of ( AlarmAudio, AlarmDisplay, AlarmEmail, AlarmProcedure, Attach, Attendee, CalendarScale, Categories, Class, Comment ). ERROR: XMLFormat validation failed. EXIT_ERROR: osync_converter_invoke: XMLFormat validation failed. (occurred, for example, with evolution2-1-hour-alarm2.vcf) element Timezone: Schemas validity error : Element 'Timezone': This element is not expected. Expected is one of ( Uid, Url, Version ). ERROR: XMLFormat validation failed. EXIT_ERROR: osync_converter_invoke: XMLFormat validation failed. (occurred, for example, with evolution2-todo-full1.vcf) element Attendee: Schemas validity error : Element 'Attendee', attribute 'Status': The attribute 'Status' is not allowed. element Content: Schemas validity error : Element 'Content': [facet 'enumeration'] The value 'NEEDS_ACTION' is not an element of the set {'NEEDS-ACTION', 'COMPLETED', 'IN-PROCESS', 'CANCELLED'}. element Content: Schemas validity error : Element 'Content': 'NEEDS_ACTION' is not a valid value of the atomic type 'TodoStatusValue'. ERROR: XMLFormat validation failed. EXIT_ERROR: osync_converter_invoke: XMLFormat validation failed. (occurred with kdepim-todoful1.vcs) d) Possible detector problem: Entity: line 1: parser error : Start tag expected, '<' not found BEGIN:VCALENDAR ^ ERROR: Could not parse XML. Well, a vevent is not an XML file. (occurred, for example, with evolution2-1-hour-alarm.vcf) e) ERROR: /home/a0037/dev/plugins/ldap-sync-jl/src/ldap_connect.c:4622: WARNING: Value of keyattribute ("documentIdentifier"): "20050306T005538Z-4378-1000-1-28@azrael" conflicts with identifier: "evolution2-todo-full2.vcf". 3. New display utility tests/show_ldap_tree to make the debugging easier. 4. I have fixed several smaller bugs in the test scripts. And cleaned them up a bit. Added: plugins/ldap-sync/tests/ldap-sync.conf.templ (contents, props changed) plugins/ldap-sync/tests/show_ldap_tree (contents, props changed) Deleted: plugins/ldap-sync/tests/check_osynctool_common.inc plugins/ldap-sync/tests/ldap-sync.conf plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_cram_md5_slapd plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_digest_md5_slapd plugins/ldap-sync/tests/ldap-sync.conf_external1_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_external1_slapd plugins/ldap-sync/tests/ldap-sync.conf_external2_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_external2_slapd plugins/ldap-sync/tests/ldap-sync.conf_gssapi_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_gssapi_slapd plugins/ldap-sync/tests/ldap-sync.conf_login_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_login_slapd plugins/ldap-sync/tests/ldap-sync.conf_ns-slapd_example plugins/ldap-sync/tests/ldap-sync.conf_ntlm_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_ntlm_slapd plugins/ldap-sync/tests/ldap-sync.conf_plain_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_plain_slapd plugins/ldap-sync/tests/ldap-sync.conf_simple_nsslapd plugins/ldap-sync/tests/ldap-sync.conf_simple_slapd plugins/ldap-sync/tests/ldap-sync.conf_slapd_example plugins/ldap-sync/tests/remove_ldifs Modified: plugins/ldap-sync/tests/CMakeLists.txt plugins/ldap-sync/tests/check_add_modify_delete_and_sync plugins/ldap-sync/tests/check_add_modify_delete_and_valgrind_and_sync plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_sync plugins/ldap-sync/tests/check_add_modify_delete_four_ldifs_and_valgrind_and_sync plugins/ldap-sync/tests/check_connect plugins/ldap-sync/tests/check_convert_from_to plugins/ldap-sync/tests/check_convert_from_to_many plugins/ldap-sync/tests/check_fastsync plugins/ldap-sync/tests/check_init plugins/ldap-sync/tests/check_ldap_add_entry plugins/ldap-sync/tests/check_ldap_base_entries_objtype plugins/ldap-sync/tests/check_ldap_delete_entry plugins/ldap-sync/tests/check_ldap_modify_entry plugins/ldap-sync/tests/check_ldap_read_entryCSN plugins/ldap-sync/tests/check_modify_and_fastsync plugins/ldap-sync/tests/check_mozldap_auth plugins/ldap-sync/tests/check_openldap_auth plugins/ldap-sync/tests/check_osyncplugin1 plugins/ldap-sync/tests/check_osynctool1 plugins/ldap-sync/tests/check_osynctool2 plugins/ldap-sync/tests/check_osynctool_add_file_and_slowsync plugins/ldap-sync/tests/check_osynctool_add_file_and_valgrind_and_slowsync plugins/ldap-sync/tests/check_osynctool_add_ldif_and_slowsync plugins/ldap-sync/tests/check_osynctool_add_ldif_and_valgrind_and_slowsync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_file_and_valgrind_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_four_files_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_four_files_and_valgrind_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_four_ldifs_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_four_ldifs_and_valgrind_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_sync plugins/ldap-sync/tests/check_osynctool_add_modify_delete_ldif_and_valgrind_and_sync plugins/ldap-sync/tests/check_osynctool_file1 plugins/ldap-sync/tests/check_plugin_auth plugins/ldap-sync/tests/check_slowsync plugins/ldap-sync/tests/check_stylesheet1 plugins/ldap-sync/tests/check_stylesheet2 plugins/ldap-sync/tests/check_stylesheet3 plugins/ldap-sync/tests/check_stylesheet4 plugins/ldap-sync/tests/check_stylesheet5 plugins/ldap-sync/tests/check_sync plugins/ldap-sync/tests/clean_up plugins/ldap-sync/tests/test.conf Modified: plugins/ldap-sync/tests/CMakeLists.txt ============================================================================== --- plugins/ldap-sync/tests/CMakeLists.txt Thu Jan 14 21:52:51 2010 (r6007) +++ plugins/ldap-sync/tests/CMakeLists.txt Thu Jan 14 21:56:02 2010 (r6008) @@ -13,28 +13,6 @@ SET ( SCHEMADIR "${LDAP_PLUGIN_OPENSYNC_SCHEMASDIR}" CACHE STRING "Path where any *.xml files are located.") -# Setting a custom timeout for ctest is a hassle. -# The only variable that seems to be considered by cmake/ctest is -# DART_TESTING_TIMEOUT. And this works ONLY, if one adds "FORCE". -# -# DART_TESTING_TIMEOUT must be set in CTestConfig.cmake rather than here. -# At least, it seems so... -IF (RUN_LONG_TESTS) - SET ( TIMEOUT 3600 CACHE STRING "General timeout value." FORCE ) -ELSE(RUN_LONG_TESTS) - SET ( TIMEOUT 600 CACHE STRING "General timeout value." FORCE ) -ENDIF(RUN_LONG_TESTS) - -SET ( CTEST_TEST_TIMEOUT ${TIMEOUT} CACHE STRING "The most natural variable for a timeout setting does NOT work. Great!" FORCE ) -SET ( CMAKE_LONG_TEST_TIMEOUT ${TIMEOUT} CACHE STRING "Does not work, either." FORCE ) -SET ( DART_TESTING_TIMEOUT ${TIMEOUT} CACHE STRING "Is there really no other way to set a timeout to the tests run by ctest?" FORCE ) -SET ( CTEST_TIME_LIMIT ${TIMEOUT} CACHE STRING "Taken from ChangeLog.txt in cmake-2.6.2... No chance." FORCE ) - - - - - - MESSAGE(STATUS "checking for xmllint...") FIND_PROGRAM( XMLLINT_EXECUTABLE xmllint ) IF (XMLLINT_EXECUTABLE) @@ -410,9 +388,9 @@ ADD_TEST( mozldap_auth_ntlm_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_NTLM_SLAPD" ) - # ADD_TEST( mozldap_auth_login_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_LOGIN_SLAPD" ) + ADD_TEST( mozldap_auth_login_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_LOGIN_SLAPD" ) - # ADD_TEST( mozldap_auth_plain_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_PLAIN_SLAPD" ) + ADD_TEST( mozldap_auth_plain_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_PLAIN_SLAPD" ) ADD_TEST( mozldap_auth_gssapi_slapd ${TESTDIR}/check_mozldap_auth "AUTH_MOZLDAP_GSSAPI_SLAPD" ) @@ -540,6 +518,9 @@ # Requires the LDAP server being configured in a way, that the # default settings in ldap-sync lead to 1. authentication, 2. write access. # +ADD_TEST( clean_up2 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + + ADD_TEST( check_init ${TESTDIR}/check_init "check_init" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) ADD_TEST( check_connect ${TESTDIR}/check_connect "check_connect" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) @@ -553,42 +534,42 @@ IF (RUN_AUTH_TESTS) - ADD_TEST( plugin_auth_simple_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_simple_slapd" ) + ADD_TEST( plugin_auth_simple_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_digest_md5_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_digest_md5_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_digest_md5_slapd" ) + ADD_TEST( plugin_auth_digest_md5_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_digest_md5_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_cram_md5_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_cram_md5_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_cram_md5_slapd" ) + ADD_TEST( plugin_auth_cram_md5_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_cram_md5_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_ntlm_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_ntlm_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_ntlm_slapd" ) + ADD_TEST( plugin_auth_ntlm_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_ntlm_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_login_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_login_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_login_slapd" ) + ADD_TEST( plugin_auth_login_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_login_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_plain_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_plain_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_plain_slapd" ) + ADD_TEST( plugin_auth_plain_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_plain_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_gssapi_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_gssapi_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_gssapi_slapd" ) + ADD_TEST( plugin_auth_gssapi_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_gssapi_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_external1_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_external1_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_external1_slapd" ) + ADD_TEST( plugin_auth_external1_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_external1_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_external2_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_external1_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_external2_slapd" ) + ADD_TEST( plugin_auth_external2_slapd ${TESTDIR}/check_plugin_auth "plugin_auth_external2_slapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_simple_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_simple_nsslapd" ) + ADD_TEST( plugin_auth_simple_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_nsslapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_digest_md5_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_digest_md5_nsslapd" ) + ADD_TEST( plugin_auth_digest_md5_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_digest_md5_nsslapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_cram_md5_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_cram_md5_nsslapd" ) + ADD_TEST( plugin_auth_cram_md5_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_cram_md5_nsslapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_ntlm_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_ntlm_nsslapd" ) + ADD_TEST( plugin_auth_ntlm_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_ntlm_nsslapd" ${CMAKE_BINARY_DIR} ) - # ADD_TEST( plugin_auth_login_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_login_nsslapd" ) + # ADD_TEST( plugin_auth_login_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_login_nsslapd" ${CMAKE_BINARY_DIR} ) - # ADD_TEST( plugin_auth_plain_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_plain_nsslapd" ) + # ADD_TEST( plugin_auth_plain_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_plain_nsslapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_gssapi_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_gssapi_nsslapd" ) + ADD_TEST( plugin_auth_gssapi_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_gssapi_nsslapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_external1_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_external1_nsslapd" ) + ADD_TEST( plugin_auth_external1_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_external1_nsslapd" ${CMAKE_BINARY_DIR} ) - ADD_TEST( plugin_auth_external2_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_simple_slapd" ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/tests/ldap-sync.conf_external2_nsslapd" ) + ADD_TEST( plugin_auth_external2_nsslapd ${TESTDIR}/check_plugin_auth "plugin_auth_external2_nsslapd" ${CMAKE_BINARY_DIR} ) ENDIF (RUN_AUTH_TESTS) @@ -603,44 +584,47 @@ IF (LDAPMODIFY_EXECUTABLE) IF (LDAPDELETE_EXECUTABLE) - ADD_TEST( add_mod_del_contact1_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact1_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods "--fastsync") + ADD_TEST( clean_up3 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + - ADD_TEST( add_mod_del_contact2_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact2_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods "--fastsync") + ADD_TEST( a_m_d_contact1_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact1_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods "--fastsync") - ADD_TEST( add_mod_del_event_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_event_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods "--fastsync") + ADD_TEST( a_m_d_contact2_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact2_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods "--fastsync") - ADD_TEST( add_mod_del_todo_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_todo_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods "--fastsync" ) + ADD_TEST( a_m_d_event_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_event_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods "--fastsync") - ADD_TEST( add_mod_del_note_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_note_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods "--fastsync") + ADD_TEST( a_m_d_todo_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_todo_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods "--fastsync" ) + ADD_TEST( a_m_d_note_and_fastsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_note_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods "--fastsync") - ADD_TEST( add_mod_del_contact1_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact1_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods "--sync") - ADD_TEST( add_mod_del_contact2_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact2_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods "--sync") + ADD_TEST( a_m_d_contact1_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact1_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods "--sync") - ADD_TEST( add_mod_del_event_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_event_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods "--sync") + ADD_TEST( a_m_d_contact2_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact2_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods "--sync") - ADD_TEST( add_mod_del_todo_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_todo_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods "--sync" ) + ADD_TEST( a_m_d_event_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_event_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods "--sync") - ADD_TEST( add_mod_del_note_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_note_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods "--sync") + ADD_TEST( a_m_d_todo_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_todo_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods "--sync" ) + ADD_TEST( a_m_d_note_and_sync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_note_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods "--sync") - ADD_TEST( add_mod_del_contact1_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact1_and_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods "--slowsync") - ADD_TEST( add_mod_del_contact2_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact2_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods "--slowsync") + ADD_TEST( a_m_d_contact1_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact1_and_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods "--slowsync") - ADD_TEST( add_mod_del_event_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_event_and_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods "--slowsync") + ADD_TEST( a_m_d_contact2_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_contact2_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods "--slowsync") - ADD_TEST( add_mod_del_todo_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_todo_and_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods "--slowsync" ) + ADD_TEST( a_m_d_event_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_event_and_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods "--slowsync") - ADD_TEST( add_mod_del_note_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_note_and_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods "--slowsync") + ADD_TEST( a_m_d_todo_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_todo_and_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods "--slowsync" ) + + ADD_TEST( a_m_d_note_and_slowsync ${TESTDIR}/check_add_modify_delete_and_sync "add_mod_del_note_and_slowsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods "--slowsync") - ADD_TEST( add_mod_del_all_four_objtypes_and_fastsync ${TESTDIR}/check_add_modify_delete_four_ldifs_and_sync "add_mod_del_all_four_objtypes_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods "--fastsync") + ADD_TEST( a_m_d_all_four_objtypes_and_fastsync ${TESTDIR}/check_add_modify_delete_four_ldifs_and_sync "add_mod_del_all_four_objtypes_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods "--fastsync") - ADD_TEST( add_mod_del_all_four_objtypes_and_sync ${TESTDIR}/check_add_modify_delete_four_ldifs_and_sync "add_mod_del_all_four_objtypes_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods "--sync") + ADD_TEST( a_m_d_all_four_objtypes_and_sync ${TESTDIR}/check_add_modify_delete_four_ldifs_and_sync "add_mod_del_all_four_objtypes_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods "--sync") - ADD_TEST( add_mod_del_all_four_objtypes_and_slowsync ${TESTDIR}/check_add_modify_delete_four_ldifs_and_sync "add_mod_del_all_four_objtypes_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods "--slowsync") + ADD_TEST( a_m_d_all_four_objtypes_and_slowsync ${TESTDIR}/check_add_modify_delete_four_ldifs_and_sync "add_mod_del_all_four_objtypes_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods "--slowsync") ENDIF (LDAPDELETE_EXECUTABLE) ENDIF (LDAPMODIFY_EXECUTABLE) @@ -655,18 +639,21 @@ IF (LDAPDELETE_EXECUTABLE) IF (VALGRIND_EXECUTABLE) - ADD_TEST( vg_add_mod_del_contact1_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_contact1_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) + ADD_TEST( clean_up4 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + - ADD_TEST( vg_add_mod_del_contact2_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_contact2_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) + ADD_TEST( vg_a_m_d_contact1_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_contact1_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) - ADD_TEST( vg_add_mod_del_event_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_event_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) + ADD_TEST( vg_a_m_d_contact2_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_contact2_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) - ADD_TEST( vg_add_mod_del_todo_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_todo_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) + ADD_TEST( vg_a_m_d_event_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_event_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) - ADD_TEST( vg_add_mod_del_note_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_note_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) + ADD_TEST( vg_a_m_d_todo_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_todo_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) + ADD_TEST( vg_a_m_d_note_and_fastsync ${TESTDIR}/check_add_modify_delete_and_valgrind_and_sync "valgrind_add_mod_del_note_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods "--fastsync" ${TESTDIR}/opensync.suppr ) - ADD_TEST( vg_add_mod_del_all_four_objtypes_and_fastsync ${TESTDIR}/check_add_modify_delete_four_ldifs_and_valgrind_and_sync "valgrind_add_mod_del_all_four_objtypes_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods "--fastsync") + + ADD_TEST( vg_a_m_d_all_four_objtypes_and_fastsync ${TESTDIR}/check_add_modify_delete_four_ldifs_and_valgrind_and_sync "valgrind_add_mod_del_all_four_objtypes_and_fastsync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods "--fastsync") ENDIF (VALGRIND_EXECUTABLE) ENDIF (LDAPDELETE_EXECUTABLE) @@ -682,65 +669,182 @@ IF (LDAPMODIFY_EXECUTABLE) IF (LDAPDELETE_EXECUTABLE) - ADD_TEST( osynctool_add_contact1_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_contact1_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.ldif" ) + ADD_TEST( clean_up5 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) - #ADD_TEST( osynctool_add_contact2_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_contact2_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.ldif" ) - ADD_TEST( osynctool_add_event_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_event_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.ldif" ) + ADD_TEST( otool_add_contact1_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_contact1_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.ldif" ) - ADD_TEST( osynctool_add_todo_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_todo_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.ldif" ) + #ADD_TEST( otool_add_contact2_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_contact2_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.ldif" ) - ADD_TEST( osynctool_add_note_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_note_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.ldif" ) + ADD_TEST( otool_add_event_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_event_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.ldif" ) + ADD_TEST( otool_add_todo_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_todo_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.ldif" ) - ADD_TEST( clean_up2 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + ADD_TEST( otool_add_note_ldif ${TESTDIR}/check_osynctool_add_ldif_and_slowsync "osynctool_add_note_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.ldif" ) - ADD_TEST( osynctool_add_contact1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_contact1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.xml" ) + ADD_TEST( clean_up6 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) - ADD_TEST( osynctool_add_contact2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_contact2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" ) - ADD_TEST( osynctool_add_event_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_event_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.xml" ) + ADD_TEST( otool_add_contact1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_contact1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.xml" ) - ADD_TEST( osynctool_add_todo_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_todo_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.xml" ) + ADD_TEST( otool_add_contact2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_contact2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" ) - ADD_TEST( osynctool_add_note1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_note1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.xml" ) + ADD_TEST( otool_add_event_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_event_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.xml" ) - ADD_TEST( osynctool_add_note2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_note2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note2.xml" ) + ADD_TEST( otool_add_todo_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_todo_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.xml" ) + ADD_TEST( otool_add_note1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_note1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.xml" ) + + ADD_TEST( otool_add_note2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_note2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note2.xml" ) + + + ADD_TEST( otool_add_evo2-full1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evo2-full1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-full1.vcf") + + ADD_TEST( otool_add_evo2-full2_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evo2-full2_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-full2.vcf") + + ADD_TEST( otool_add_evo2-multiline_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evo2-multiline_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-multiline.vcf") + + ADD_TEST( otool_add_evo2-photo_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evo2-photo_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-photo.vcf") + + ADD_TEST( otool_add_evo2-special_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evo2-special_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-special.vcf") + + ADD_TEST( otool_add_evo2-umlaute.vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evo2-umlaute_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-umlaute.vcf") + + ADD_TEST( otool_add_kdepim-full1-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-full1-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-full1-2.1.vcf") + + ADD_TEST( otool_add_kdepim-full1-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-full1-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-full1-3.0.vcf") + + ADD_TEST( otool_add_kdepim-full2-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-full2-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-full2-2.1.vcf") + + ADD_TEST( otool_add_kdepim-full2-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-full2-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-full2-3.0.vcf") + + ADD_TEST( otool_add_kdepim-multiline-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-multiline-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-multiline-2.1.vcf") + + ADD_TEST( otool_add_kdepim-multiline-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-multiline-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-multiline-3.0.vcf") + + ADD_TEST( otool_add_kdepim-nonuid-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-nonuid-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-nonuid-2.1.vcf") + + ADD_TEST( otool_add_kdepim-photo1-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-photo1-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-photo1-2.1.vcf") + + ADD_TEST( otool_add_kdepim-photo1-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-photo1-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-photo1-3.0.vcf") + + ADD_TEST( otool_add_kdepim-photo2-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-photo2-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-photo2-2.1.vcf") + + ADD_TEST( otool_add_kdepim-photo2-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-photo2-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-photo2-3.0.vcf") + + ADD_TEST( otool_add_kdepim-sound1-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-sound1-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-sound1-2.1.vcf") + + ADD_TEST( otool_add_kdepim-sound1-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-sound1-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-sound1-3.0.vcf") + + ADD_TEST( otool_add_kdepim-sound2-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-sound2-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-sound2-2.1.vcf") + + ADD_TEST( otool_add_kdepim-sound2-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-sound2-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-sound2-3.0.vcf") + + ADD_TEST( otool_add_kdepim-special-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-special-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-special-2.1.vcf") + + ADD_TEST( otool_add_kdepim-special-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-special-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-special-3.0.vcf") + + ADD_TEST( otool_add_kdepim-umlaute-2.1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-umlaute-2.1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-umlaute-2.1.vcf") + + ADD_TEST( otool_add_kdepim-umlaute-3.0_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-umlaute-3.0_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/kdepim-umlaute-3.0.vcf") + + + ADD_TEST( otool_add_evo2-1-hour-alarm2_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-1-hour-alarm2_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-1-hour-alarm2.vcf") + + ADD_TEST( otool_add_evo2-1-hour-alarm_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-1-hour-alarm_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-1-hour-alarm.vcf") + + ADD_TEST( otool_add_evo2-1-hour_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-1-hour_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-1-hour.vcf") + + ADD_TEST( otool_add_evo2-all-day2_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-all-day2_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-all-day2.vcf") + + ADD_TEST( otool_add_evo2-all-day_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-all-day_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-all-day.vcf") + + ADD_TEST( otool_add_evo2-evo2-recur-until_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-evo2-recur-until_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-evo2-recur-until.vcf") + + ADD_TEST( otool_add_evo2-free-busy_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-free-busy_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-free-busy.vcf") + + ADD_TEST( otool_add_evo2-full-special_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-full-special_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-full-special.vcf") + + ADD_TEST( otool_add_evo2-rec-every-year_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-rec-every-year_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-rec-every-year.vcf") + + ADD_TEST( otool_add_evo2-rec-except_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-rec-except_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-rec-except.vcf") + + ADD_TEST( otool_add_evo2-rec-forever_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-rec-forever_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-rec-forever.vcf") + + ADD_TEST( otool_add_evo2-rec-for_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-rec-for_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-rec-for.vcf") + + ADD_TEST( otool_add_evo2-rec-until_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-rec-until_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/evolution2-rec-until.vcf") + + ADD_TEST( otool_add_kdepim-1-hour-1.0_vcs ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-1-hour-1.0_vcs" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/kdepim-1-hour-1.0.vcs") + + ADD_TEST( otool_add_kdepim-1-hour-2.0_ics ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-1-hour-2.0_ics" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/vevents/kdepim-1-hour-2.0.ics") + + + ADD_TEST( otool_add_evo2-todo-full1_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-todo-full1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/evolution2-todo-full1.vcf") + + ADD_TEST( otool_add_evo2-todo-full2_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-todo-full2_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/evolution2-todo-full2.vcf") + + ADD_TEST( otool_add_evo2-todo-full3_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-todo-full3_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/evolution2-todo-full3.vcf") + + ADD_TEST( otool_add_evo2-todo-full4_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-todo-full4_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/evolution2-todo-full4.vcf") + + ADD_TEST( otool_add_evo2-todo-full5_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-todo-full5_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/evolution2-todo-full5.vcf") + + ADD_TEST( otool_add_evo2-todo-full6_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-todo-full6_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/evolution2-todo-full6.vcf") + + ADD_TEST( otool_add_evo2-todo-full7_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-todo-full7_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/evolution2-todo-full7.vcf") + + ADD_TEST( otool_add_evo2-todo-simple_vcf ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_evolution2-todo-simple_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/evolution2-todo-simple.vcf") + + ADD_TEST( otool_add_kdepim-todoful1_vcs ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_kdepim-todoful1_vcs" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/vtodos/kdepim-todoful1.vcs") - ADD_TEST( clean_up3 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + ADD_TEST( otool_add_vnote1-same_vnt ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_vnote1-same_vnt" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/vnotes/vnote1-same.vnt") - ADD_TEST( osynctool_add_mod_del_contact1_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_contact1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.xml" "${TESTDIR}/contact1.xml_modified" ) + ADD_TEST( otool_add_vnote1-similar_vnt ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_vnote1-similar_vnt" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/vnotes/vnote1-similar.vnt") - ADD_TEST( osynctool_add_mod_del_contact2_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_contact2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" "${TESTDIR}/contact2.xml_modified" ) + ADD_TEST( otool_add_vnote1_vnt ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_vnote1_vnt" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/vnotes/vnote1.vnt") - ADD_TEST( osynctool_add_mod_del_event_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_event_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.xml" "${TESTDIR}/event1.xml_modified" ) + ADD_TEST( otool_add_vnote2_vnt ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_vnote2_vnt" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/vnotes/vnote2.vnt") - ADD_TEST( osynctool_add_mod_del_todo_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_todo_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.xml" "${TESTDIR}/todo1.xml_modified" ) + ADD_TEST( otool_add_vnote3_vnt ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_vnote3_vnt" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/vnotes/vnote3.vnt") - ADD_TEST( osynctool_add_mod_del_note1_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_note1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.xml" "${TESTDIR}/note1.xml_modified" ) + ADD_TEST( otool_add_vnote-minimal_vnt ${TESTDIR}/check_osynctool_add_file_and_slowsync "osynctool_add_vnote-minimal_vnt" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/vnotes/vnote-minimal.vnt") - ADD_TEST( osynctool_add_mod_del_note2_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_note2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note2.xml" "${TESTDIR}/note2.xml_modified" ) - ADD_TEST( osynctool_add_mod_del_all_four_xmlfiles ${TESTDIR}/check_osynctool_add_modify_delete_four_files_and_sync "osynctool_add_mod_del_all_four_xmlfiles" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "${TESTDIR}/contact1.xml" "${TESTDIR}/event1.xml" "${TESTDIR}/todo1.xml" "${TESTDIR}/note1.xml" "${TESTDIR}/contact1.xml_modified" "${TESTDIR}/event1.xml_modified" "${TESTDIR}/todo1.xml_modified" "${TESTDIR}/note1.xml_modified" ) + ADD_TEST( clean_up7 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) - ADD_TEST( clean_up4 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + ADD_TEST( otool_a_m_d_contact1_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_contact1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.xml" "${TESTDIR}/contact1.xml_modified" ) + ADD_TEST( otool_a_m_d_contact2_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_contact2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" "${TESTDIR}/contact2.xml_modified" ) - ADD_TEST( osynctool_add_mod_del_contact1_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_contact1_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods ) + ADD_TEST( otool_a_m_d_event_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_event_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.xml" "${TESTDIR}/event1.xml_modified" ) - ADD_TEST( osynctool_add_mod_del_contact2_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_contact2_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods ) + ADD_TEST( otool_a_m_d_todo_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_todo_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.xml" "${TESTDIR}/todo1.xml_modified" ) - ADD_TEST( osynctool_add_mod_del_event_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_event_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods ) + ADD_TEST( otool_a_m_d_note1_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_note1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.xml" "${TESTDIR}/note1.xml_modified" ) - ADD_TEST( osynctool_add_mod_del_todo_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_todo_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods ) + ADD_TEST( otool_a_m_d_note2_xmlfile ${TESTDIR}/check_osynctool_add_modify_delete_file_and_sync "osynctool_add_mod_del_note2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note2.xml" "${TESTDIR}/note2.xml_modified" ) - ADD_TEST( osynctool_add_mod_del_note_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_note_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods ) + ADD_TEST( otool_a_m_d_all_four_xmlfiles ${TESTDIR}/check_osynctool_add_modify_delete_four_files_and_sync "osynctool_add_mod_del_all_four_xmlfiles" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "${TESTDIR}/contact1.xml" "${TESTDIR}/event1.xml" "${TESTDIR}/todo1.xml" "${TESTDIR}/note1.xml" "${TESTDIR}/contact1.xml_modified" "${TESTDIR}/event1.xml_modified" "${TESTDIR}/todo1.xml_modified" "${TESTDIR}/note1.xml_modified" ) - ADD_TEST( osynctool_add_mod_del_all_four_ldifs_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_four_ldifs_and_sync "osynctool_add_mod_del_all_four_ldifs_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods ) + + ADD_TEST( clean_up8 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + + + ADD_TEST( otool_a_m_d_contact1_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_contact1_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" ${TESTDIR}/contact1.ldif ${TESTDIR}/contact1_entrymods ) + + ADD_TEST( otool_a_m_d_contact2_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_contact2_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" ${TESTDIR}/contact2.ldif ${TESTDIR}/contact2_entrymods ) + + ADD_TEST( otool_a_m_d_event_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_event_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" ${TESTDIR}/event1.ldif ${TESTDIR}/event1_entrymods ) + + ADD_TEST( otool_a_m_d_todo_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_todo_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" ${TESTDIR}/todo1.ldif ${TESTDIR}/todo1_entrymods ) + + ADD_TEST( otool_a_m_d_note_ldif_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_ldif_and_sync "osynctool_add_mod_del_note_ldif_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" ${TESTDIR}/note1.ldif ${TESTDIR}/note1_entrymods ) + + ADD_TEST( otool_a_m_d_all_four_ldifs_and_sync ${TESTDIR}/check_osynctool_add_modify_delete_four_ldifs_and_sync "osynctool_add_mod_del_all_four_ldifs_and_sync" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TESTDIR}/contact1.ldif ${TESTDIR}/event1.ldif ${TESTDIR}/todo1.ldif ${TESTDIR}/note1.ldif ${TESTDIR}/contact1_entrymods ${TESTDIR}/event1_entrymods ${TESTDIR}/todo1_entrymods ${TESTDIR}/note1_entrymods ) ENDIF (LDAPDELETE_EXECUTABLE) @@ -759,68 +863,182 @@ IF (VALGRIND_EXECUTABLE) - ADD_TEST( clean_up5 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + ADD_TEST( clean_up9 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) - ADD_TEST( vg_osynctool_add_contact1_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_contact1_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.ldif" ) + ADD_TEST( vg_otool_add_contact1_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_contact1_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.ldif" ) - #ADD_TEST( vg_osynctool_add_contact2_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_contact2_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.ldif" ) + #ADD_TEST( vg_otool_add_contact2_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_contact2_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.ldif" ) - ADD_TEST( vg_osynctool_add_event_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_event_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.ldif" ) + ADD_TEST( vg_otool_add_event_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_event_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.ldif" ) - ADD_TEST( vg_osynctool_add_todo_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_todo_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.ldif" ) + ADD_TEST( vg_otool_add_todo_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_todo_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.ldif" ) - ADD_TEST( vg_osynctool_add_note_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_note_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.ldif" ) + ADD_TEST( vg_otool_add_note_ldif ${TESTDIR}/check_osynctool_add_ldif_and_valgrind_and_slowsync "valgrind_osynctool_add_note_ldif" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.ldif" ) - ADD_TEST( clean_up6 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + ADD_TEST( clean_up10 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) - ADD_TEST( vg_osynctool_add_contact1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_contact1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.xml" ) + ADD_TEST( vg_otool_add_contact1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_contact1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact1.xml" ) - ADD_TEST( vg_osynctool_add_contact2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_contact2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" ) + ADD_TEST( vg_otool_add_contact2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_contact2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/contact2.xml" ) - ADD_TEST( vg_osynctool_add_event_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_event_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.xml" ) + ADD_TEST( vg_otool_add_event_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_event_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "event" "${TESTDIR}/event1.xml" ) - ADD_TEST( vg_osynctool_add_todo_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_todo_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.xml" ) + ADD_TEST( vg_otool_add_todo_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_todo_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "todo" "${TESTDIR}/todo1.xml" ) - ADD_TEST( vg_osynctool_add_note1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_note1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.xml" ) + ADD_TEST( vg_otool_add_note1_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_note1_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note1.xml" ) - ADD_TEST( vg_osynctool_add_note2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_note2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note2.xml" ) + ADD_TEST( vg_otool_add_note2_xmlfile ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_note2_xmlfile" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "note" "${TESTDIR}/note2.xml" ) - ADD_TEST( clean_up7 ${TESTDIR}/clean_up ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) + ADD_TEST( vg_otool_add_evo2-full1_vcf ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_evo2-full1_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-full1.vcf") + + ADD_TEST( vg_otool_add_evo2-full2_vcf ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_add_evo2-full2_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-full2.vcf") + + ADD_TEST( vg_otool_add_evo2-multiline_vcf ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_evo2-multiline_vcf" ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} "contact" "${TESTDIR}/vcards/evo2-multiline.vcf") + + ADD_TEST( vg_otool_add_evo2-photo_vcf ${TESTDIR}/check_osynctool_add_file_and_valgrind_and_slowsync "valgrind_osynctool_evo2-photo_vcf" ${CMAKE_B... [truncated message content] |
