From: <dg...@su...> - 2009-01-06 18:04:53
|
Author: henrik Date: Tue Jan 6 19:04:29 2009 New Revision: 5045 URL: http://www.opensync.org/changeset/5045 Log: Added test cases for three slow syncs Added: plugins/mozilla-sync/trunk/tests/blackbox_test_abook_slow3.sh (contents, props changed) plugins/mozilla-sync/trunk/tests/blackbox_test_cal_slow3.sh (contents, props changed) Modified: plugins/mozilla-sync/trunk/tests/CMakeLists.txt Modified: plugins/mozilla-sync/trunk/tests/CMakeLists.txt ============================================================================== --- plugins/mozilla-sync/trunk/tests/CMakeLists.txt Tue Jan 6 17:08:42 2009 (r5044) +++ plugins/mozilla-sync/trunk/tests/CMakeLists.txt Tue Jan 6 19:04:29 2009 (r5045) @@ -25,6 +25,7 @@ CONFIGURE_FILE( "blackbox_test_init_osynctool.sh" "tests/blackbox_test_init_osynctool.sh" COPYONLY) CONFIGURE_FILE( "blackbox_test_abook_vcard_compare.sh" "tests/blackbox_test_abook_vcard_compare.sh" COPYONLY) CONFIGURE_FILE( "blackbox_test_abook_slow_slow.sh" "tests/blackbox_test_abook_slow_slow.sh" COPYONLY) +CONFIGURE_FILE( "blackbox_test_abook_slow3.sh" "tests/blackbox_test_abook_slow3.sh" COPYONLY) CONFIGURE_FILE( "blackbox_test_abook_slow_fast.sh" "tests/blackbox_test_abook_slow_fast.sh" COPYONLY) CONFIGURE_FILE( "blackbox_test_abook_add.sh" "tests/blackbox_test_abook_add.sh" COPYONLY) CONFIGURE_FILE( "blackbox_test_abook_delete.sh" "tests/blackbox_test_abook_delete.sh" COPYONLY) @@ -32,6 +33,7 @@ CONFIGURE_FILE( "blackbox_test_init_sunbird.sh" "tests/blackbox_test_init_sunbird.sh" COPYONLY) CONFIGURE_FILE( "blackbox_test_cal_slow_slow.sh" "tests/blackbox_test_cal_slow_slow.sh" COPYONLY) +CONFIGURE_FILE( "blackbox_test_cal_slow3.sh" "tests/blackbox_test_cal_slow3.sh" COPYONLY) CONFIGURE_FILE( "blackbox_test_cal_slow_fast.sh" "tests/blackbox_test_cal_slow_fast.sh" COPYONLY) CONFIGURE_FILE( "abook.mab" "tests/abook.mab" COPYONLY) @@ -48,10 +50,12 @@ ADD_TEST( blackbox_test_init_osynctool "blackbox_test_init_osynctool.sh" ) ADD_TEST( blackbox_test_abook_vcard_compare "blackbox_test_abook_vcard_compare.sh" ) ADD_TEST( blackbox_test_abook_slow_slow "blackbox_test_abook_slow_slow.sh" ) +ADD_TEST( blackbox_test_abook_slow3 "blackbox_test_abook_slow3.sh" ) ADD_TEST( blackbox_test_abook_slow_fast "blackbox_test_abook_slow_fast.sh" ) ADD_TEST( blackbox_test_abook_add "blackbox_test_abook_add.sh" ) ADD_TEST( blackbox_test_abook_delete "blackbox_test_abook_delete.sh" ) ADD_TEST( blackbox_test_abook_fmod "blackbox_test_abook_fmod.sh" ) ADD_TEST( blackbox_test_init_sunbird "blackbox_test_init_sunbird.sh" ) ADD_TEST( blackbox_test_cal_slow_slow "blackbox_test_cal_slow_slow.sh" ) +ADD_TEST( blackbox_test_cal_slow3 "blackbox_test_cal_slow3.sh" ) ADD_TEST( blackbox_test_cal_slow_fast "blackbox_test_cal_slow_fast.sh" ) Added: plugins/mozilla-sync/trunk/tests/blackbox_test_abook_slow3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ plugins/mozilla-sync/trunk/tests/blackbox_test_abook_slow3.sh Tue Jan 6 19:04:29 2009 (r5045) @@ -0,0 +1,69 @@ +#!/bin/bash + +# ====================================================== +# This file is part of the mozilla-sync plugin for OpenSync +# See http://www.KaarPoSoft.dk/bluezync +# $Id$ +# ====================================================== + +# Test slow sync followed by TWO slow syncs + +SCRIPT_NAME=`basename $0`; SCRIPT_NAME=${SCRIPT_NAME%.sh} +SRC_DIR=`(cd \`dirname $0\`; pwd)` +source "${SRC_DIR}/blackbox_test_common.shinc" + +initialize_test "Three slow syncs" +initialize_thunderbird +initialize_osynctool + +VCARD_DIR_BASE="${SRC_DIR}/blackbox_test_abook_vcard_base" + +# Create a directory with VCard addresses +# Slow sync it into Thunderbird +banner_step "First slow sync" +GROUP_NAME_1="${SCRIPT_NAME}_slow1" +copy_dir VCARD_DIR_1 vcard_orig "${VCARD_DIR_BASE}" +create_msync_group_abook_file "${GROUP_NAME_1}" abook.mab "${VCARD_DIR_1}" +msync_sync "${GROUP_NAME_1}" + +# Verify that the sync did not change the VCard directory +banner_step "Compare vcards for first slow sync" +compare_vcard_dirs "${VCARD_DIR_BASE}" "${VCARD_DIR_1}" + +# Slow sync Thunderbird to a new VCard directory in a new group +# And verify that the contents are the same as in the initial VCard directory +banner_step "Compare addressbook for first slow sync" +GROUP_NAME_1C="${SCRIPT_NAME}_compare1" +make_temp_dir VCARD_DIR_1C compare1 +create_msync_group_abook_file "${GROUP_NAME_1C}" abook.mab "${VCARD_DIR_1C}" +msync_sync "${GROUP_NAME_1C}" +compare_vcard_dirs "${VCARD_DIR_1}" "${VCARD_DIR_1C}" + +# Now do a second slow sync to see that this works +banner_step "Second slow sync" +GROUP_NAME_2="${SCRIPT_NAME}_slow2" +copy_dir VCARD_DIR_2 vcard_orig "${VCARD_DIR_BASE}" +create_msync_group_abook_file "${GROUP_NAME_2}" abook.mab "${VCARD_DIR_2}" +msync_sync "${GROUP_NAME_2}" + +# Verify that the second slow sync did not change the VCard directory +banner_step "Compare vcards for second slow sync" +compare_vcard_dirs "${VCARD_DIR_BASE}" "${VCARD_DIR_2}" + +# Slow sync Thunderbird to a new VCard directory in a new group +# And verify that the contents are the same as in the initial VCard directory +banner_step "Compare addressbook for second slow sync" +GROUP_NAME_2C="${SCRIPT_NAME}_compare2" +make_temp_dir VCARD_DIR_2C compare2 +create_msync_group_abook_file "${GROUP_NAME_2C}" abook.mab "${VCARD_DIR_2C}" +msync_sync "${GROUP_NAME_2C}" +compare_vcard_dirs "${VCARD_DIR_2}" "${VCARD_DIR_2C}" + +# Slow sync again to same dir, and make sure that the contents are not changed +banner_step "Compare third slow sync" +GROUP_NAME_3="${SCRIPT_NAME}_compare3" +create_msync_group_abook_file "${GROUP_NAME_3}" abook.mab "${VCARD_DIR_2C}" +msync_sync "${GROUP_NAME_3}" +compare_vcard_dirs "${VCARD_DIR_2}" "${VCARD_DIR_2C}" + +success_exit Added: plugins/mozilla-sync/trunk/tests/blackbox_test_cal_slow3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ plugins/mozilla-sync/trunk/tests/blackbox_test_cal_slow3.sh Tue Jan 6 19:04:29 2009 (r5045) @@ -0,0 +1,69 @@ +#!/bin/bash + +# ====================================================== +# This file is part of the mozilla-sync plugin for OpenSync +# See http://www.KaarPoSoft.dk/bluezync +# $Id$ +# ====================================================== + +# Test slow sync followed by TWO slow syncs + +SCRIPT_NAME=`basename $0`; SCRIPT_NAME=${SCRIPT_NAME%.sh} +SRC_DIR=`(cd \`dirname $0\`; pwd)` +source "${SRC_DIR}/blackbox_test_common.shinc" + +initialize_test "Three Calendar slow syncs" +initialize_sunbird +initialize_osynctool + +VCARD_DIR_BASE="${SRC_DIR}/blackbox_test_cal_vcard_base" + +# Create a directory with VCard events +# Slow sync it into Thunderbird +banner_step "First Calendar slow sync" +GROUP_NAME_1="${SCRIPT_NAME}_slow1" +copy_dir VCARD_DIR_1 vcard_orig "${VCARD_DIR_BASE}" +create_msync_group_cal_file "${GROUP_NAME_1}" 1 "${VCARD_DIR_1}" +msync_sync "${GROUP_NAME_1}" + +# Verify that the sync did not change the VCard directory +banner_step "Compare vcards for first slow sync" +compare_vcard_dirs "${VCARD_DIR_BASE}" "${VCARD_DIR_1}" + +# Slow sync Thunderbird to a new VCard directory in a new group +# And verify that the contents are the same as in the initial VCard directory +banner_step "Compare calendar for first slow sync" +GROUP_NAME_1C="${SCRIPT_NAME}_compare1" +make_temp_dir VCARD_DIR_1C compare1 +create_msync_group_cal_file "${GROUP_NAME_1C}" 1 "${VCARD_DIR_1C}" +msync_sync "${GROUP_NAME_1C}" +compare_vcard_dirs "${VCARD_DIR_1}" "${VCARD_DIR_1C}" + +# Now do a second slow sync to see that this works +banner_step "Second slow sync" +GROUP_NAME_2="${SCRIPT_NAME}_slow2" +copy_dir VCARD_DIR_2 vcard_orig "${VCARD_DIR_BASE}" +create_msync_group_cal_file "${GROUP_NAME_2}" 1 "${VCARD_DIR_2}" +msync_sync "${GROUP_NAME_2}" + +# Verify that the second slow sync did not change the VCard directory +banner_step "Compare vcards for second slow sync" +compare_vcard_dirs "${VCARD_DIR_BASE}" "${VCARD_DIR_2}" + +# Slow sync Thunderbird to a new VCard directory in a new group +# And verify that the contents are the same as in the initial VCard directory +banner_step "Compare calendar for second slow sync" +GROUP_NAME_2C="${SCRIPT_NAME}_compare2" +make_temp_dir VCARD_DIR_2C compare2 +create_msync_group_cal_file "${GROUP_NAME_2C}" 1 "${VCARD_DIR_2C}" +msync_sync "${GROUP_NAME_2C}" +compare_vcard_dirs "${VCARD_DIR_2}" "${VCARD_DIR_2C}" + +# Slow sync again to same dir, and make sure that the contents are not changed +banner_step "Compare third slow sync" +GROUP_NAME_3="${SCRIPT_NAME}_compare3" +create_msync_group_cal_file "${GROUP_NAME_3}" 1 "${VCARD_DIR_2C}" +msync_sync "${GROUP_NAME_3}" +compare_vcard_dirs "${VCARD_DIR_2}" "${VCARD_DIR_2C}" + +success_exit |