[Opensync-commits] r5137 - plugins/mozilla-sync/trunk/tests

[<dg...@su...>]

Author: henrik
Date: Wed Jan 14 01:47:58 2009
New Revision: 5137
URL: http://www.opensync.org/changeset/5137

Log:
Update to make sure that we have the right <Preferred> format

Modified:
   plugins/mozilla-sync/trunk/tests/blackbox_test_abook_vcard_compare.sh
   plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in

Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_abook_vcard_compare.sh
==============================================================================
--- plugins/mozilla-sync/trunk/tests/blackbox_test_abook_vcard_compare.sh	Wed Jan 14 00:48:41 2009	(r5136)
+++ plugins/mozilla-sync/trunk/tests/blackbox_test_abook_vcard_compare.sh	Wed Jan 14 01:47:58 2009	(r5137)
@@ -26,7 +26,7 @@
 GROUP_NAME="${SCRIPT_NAME}"
 copy_dir VCARD_DIR_1 vcard_orig "${VCARD_DIR_BASE}"
 make_temp_dir VCARD_DIR_2 compare
-create_msync_group_file_file "${GROUP_NAME}" "${VCARD_DIR_1}" "${VCARD_DIR_2}"
+create_msync_group_file_file "${GROUP_NAME}" "${VCARD_DIR_1}" "${VCARD_DIR_2}" vcard21
 msync_sync "${GROUP_NAME}"
 compare_vcard_dirs "${VCARD_DIR_1}" "${VCARD_DIR_2}" \
 	"This probably means, that the VCARD format in file-sync has changed"

Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in
==============================================================================
--- plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in	Wed Jan 14 00:48:41 2009	(r5136)
+++ plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in	Wed Jan 14 01:47:58 2009	(r5137)
@@ -371,10 +371,11 @@
 	local MEMBER=$2
 	local VCARD_DIR=$3
 	local OBJTYPE=$4
+	local PREFERRED=$5
 
 	myecho "Configuring [file-sync] member for [${STEP}]"
 
-msync --configure "${GROUP_NAME}" "${MEMBER}" <<EOF_2 || \
+msync --configure "${GROUP_NAME}" "${MEMBER}" <<EOF_3 || \
 	error_exit "Could not configure [file-sync] member for [${STEP}]" 1
 <?xml version="1.0"?>
 <config version="1.0">
@@ -385,6 +386,7 @@
         <Format>
           <Name>file</Name>
         </Format>
+        <Preferred>${PREFERRED}</Preferred>
       </Formats>
       <Name></Name>
       <MIME></MIME>
@@ -394,7 +396,7 @@
     </Resource>
   </Resources>
 </config>
-EOF_2
+EOF_3
 }
 
 
@@ -404,6 +406,7 @@
 	local GROUP_NAME=$1
 	local VCARD_DIR_1=$2
 	local VCARD_DIR_2=$3
+	local PREFERRED=$4
 
 	myecho "Creating and configuring group [${GROUP_NAME}]"
 
@@ -414,8 +417,8 @@
 	msync --addmember "${GROUP_NAME}" "file-sync" || 
 		error_exit "Could not add group member [file-sync] to [${GROUP_NAME}] for [${STEP}]" $?
 
-	configure_msync_member_file  "${GROUP_NAME}" 1 "${VCARD_DIR_1}" contact
-	configure_msync_member_file  "${GROUP_NAME}" 2 "${VCARD_DIR_2}" contact
+	configure_msync_member_file  "${GROUP_NAME}" 1 "${VCARD_DIR_1}" contact "${PREFERRED}"
+	configure_msync_member_file  "${GROUP_NAME}" 2 "${VCARD_DIR_2}" contact "${PREFERRED}"
 
 	msync --discover "${GROUP_NAME}" ||
 		error_exit "Could not discover group [${GROUP_NAME}] for [${STEP}]" 1
@@ -440,7 +443,7 @@
 		error_exit "Could not add group member [file-sync] to [${GROUP_NAME}] for [${STEP}]" $?
 
 	configure_msync_member_abook "${GROUP_NAME}" 1 "${ABOOK}"
-	configure_msync_member_file  "${GROUP_NAME}" 2 "${VCARD_DIR}" contact
+	configure_msync_member_file  "${GROUP_NAME}" 2 "${VCARD_DIR}" contact vcard21
 
 	msync --discover "${GROUP_NAME}" ||
 		error_exit "Could not discover group [${GROUP_NAME}] for [${STEP}]" 1
@@ -465,7 +468,7 @@
 		error_exit "Could not add group member [file-sync] to [${GROUP_NAME}] for [${STEP}]" $?
 
 	configure_msync_member_cal "${GROUP_NAME}" 1 "${CAL}"
-	configure_msync_member_file  "${GROUP_NAME}" 2 "${VCARD_DIR}" event
+	configure_msync_member_file  "${GROUP_NAME}" 2 "${VCARD_DIR}" event vevent10
 
 	msync --discover "${GROUP_NAME}" ||
 		error_exit "Could not discover group [${GROUP_NAME}] for [${STEP}]" 1