maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testing: Google testcases must work with and without libphonenumber support in EDS 

"primary 80" ends up being recognized as phone number, adding the E.164
parameter if (and only if) EDS was compiled with libphonenumber support
(Debian Jessie!). Adding that breaks the comparison, so avoid the situation
by updating to a string which is not a phone number.
This commit is contained in:
Patrick Ohly 2014-10-10 03:11:04 -07:00
parent 86ef9e515f
commit bce3ebdbf9
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/local-synced
View File

@ -39,7 +39,7 @@ TEL;TYPE=WORK;TYPE=FAX:businessfax 4
TEL;TYPE=HOME;TYPE=FAX:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
X-AIM:AIM JOHN
X-YAHOO:YAHOO JDOE
X-ICQ:ICQ JD
@ -127,7 +127,7 @@ TEL;TYPE=WORK;TYPE=FAX;X-EVOLUTION-UI-SLOT=4:businessfax 4
TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=5:homefax 5
TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=6:pager 6
TEL;TYPE=CAR;X-EVOLUTION-UI-SLOT=7:car 7
TEL;TYPE=PREF;X-EVOLUTION-UI-SLOT=8:primary 80
TEL;TYPE=PREF;X-EVOLUTION-UI-SLOT=8:primary 8xx
X-AIM;X-EVOLUTION-UI-SLOT=1:AIM JOHN
X-YAHOO;X-EVOLUTION-UI-SLOT=2:YAHOO JDOE
X-ICQ;X-EVOLUTION-UI-SLOT=3:ICQ JD
@ -213,7 +213,7 @@ TEL;TYPE=WORK;TYPE=FAX;X-EVOLUTION-UI-SLOT=4:businessfax 4
TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=5:homefax 5
TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=6:pager 6
TEL;TYPE=CAR;X-EVOLUTION-UI-SLOT=7:car 7
TEL;TYPE=PREF;X-EVOLUTION-UI-SLOT=8:primary 80
TEL;TYPE=PREF;X-EVOLUTION-UI-SLOT=8:primary 8xx
X-AIM;X-EVOLUTION-UI-SLOT=1:AIM JOHN
X-YAHOO;X-EVOLUTION-UI-SLOT=2:YAHOO JDOE
X-ICQ;X-EVOLUTION-UI-SLOT=3:ICQ JD

2
test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/modify-local
View File

@ -13,7 +13,7 @@ for i in $IN/*; do
# Modify second and third contact by changing a field.
# The second contact will also get modified locally.
perl -e '$_ = join("", <>); if (/John [23] Doe/) {' \
-e 's/primary 8/primary 80/;' \
-e 's/primary 8/primary 8xx/;' \
-e 's/END:VCARD/BDAY:2006-01-01\r\nEMAIL:new local email\r\nEND:VCARD/;' \
-e 'print;' \
-e '}' \

2
test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/modify-remote
View File

@ -20,7 +20,7 @@ for i in $IN/*; do
#
# Each -e generates a line break, so no \n is necessary inside the expanded vCard.
perl -e '$_ = join("", <>); if (/John [12] Doe/) {' \
-e 's/primary 8/primary 80/;' \
-e 's/primary 8/primary 8xx/;' \
-e 's!END:VCARD!BDAY:2006-01-08\r' \
-e 'TEL;TYPE=HOME:new remote tel 1\r' \
-e 'tel2.TEL:new remote tel 2\r' \

6
test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/remote-synced
View File

@ -21,7 +21,7 @@ TEL;TYPE=FAX,WORK:businessfax 4
TEL;TYPE=FAX,HOME:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
EMAIL;TYPE=WORK:john.doe@work.com
EMAIL;TYPE=HOME:john.doe@home.priv
EMAIL:john.doe@other.world
@ -133,7 +133,7 @@ TEL;TYPE=FAX,WORK:businessfax 4
TEL;TYPE=FAX,HOME:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
EMAIL;TYPE=WORK:john.doe@work.com
EMAIL;TYPE=HOME:john.doe@home.priv
EMAIL:john.doe@other.world
@ -245,7 +245,7 @@ TEL;TYPE=FAX,WORK:businessfax 4
TEL;TYPE=FAX,HOME:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
EMAIL;TYPE=WORK:john.doe@work.com
EMAIL;TYPE=HOME:john.doe@home.priv
EMAIL:john.doe@other.world

6
test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/local-synced
View File

@ -39,7 +39,7 @@ TEL;TYPE=WORK;TYPE=FAX:businessfax 4
TEL;TYPE=HOME;TYPE=FAX:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
X-AIM:AIM JOHN
X-YAHOO:YAHOO JDOE
X-ICQ:ICQ JD
@ -127,7 +127,7 @@ TEL;TYPE=WORK;TYPE=FAX:businessfax 4
TEL;TYPE=HOME;TYPE=FAX:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
X-AIM:AIM JOHN
X-YAHOO:YAHOO JDOE
X-ICQ:ICQ JD
@ -214,7 +214,7 @@ TEL;TYPE=WORK;TYPE=FAX;X-EVOLUTION-UI-SLOT=4:businessfax 4
TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=5:homefax 5
TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=6:pager 6
TEL;TYPE=CAR;X-EVOLUTION-UI-SLOT=7:car 7
TEL;TYPE=PREF;X-EVOLUTION-UI-SLOT=8:primary 80
TEL;TYPE=PREF;X-EVOLUTION-UI-SLOT=8:primary 8xx
X-AIM;X-EVOLUTION-UI-SLOT=1:AIM JOHN
X-YAHOO;X-EVOLUTION-UI-SLOT=2:YAHOO JDOE
X-ICQ;X-EVOLUTION-UI-SLOT=3:ICQ JD

2
test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/modify-local
View File

@ -14,7 +14,7 @@ for i in $IN/*; do
# The second contact will also get modified locally.
# Add a different BDAY than the peer.
perl -e '$_ = join("", <>); if (/John [23] Doe/) {' \
-e 's/primary 8/primary 80/;' \
-e 's/primary 8/primary 8xx/;' \
-e 's/END:VCARD/BDAY:2006-01-01\r\nEMAIL:new local email\r\nEND:VCARD/;' \
-e 'print;' \
-e '}' \

2
test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/modify-remote
View File

@ -20,7 +20,7 @@ for i in $IN/*; do
#
# Each -e generates a line break, so no \n is necessary inside the expanded vCard.
perl -e '$_ = join("", <>); if (/John [12] Doe/) {' \
-e 's/primary 8/primary 80/;' \
-e 's/primary 8/primary 8xx/;' \
-e 's!END:VCARD!BDAY:2006-01-08\r' \
-e 'TEL;TYPE=HOME:new remote tel 1\r' \
-e 'tel2.TEL:new remote tel 2\r' \

6
test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/remote-synced
View File

@ -21,7 +21,7 @@ TEL;TYPE=FAX,WORK:businessfax 4
TEL;TYPE=FAX,HOME:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
EMAIL;TYPE=WORK:john.doe@work.com
EMAIL;TYPE=HOME:john.doe@home.priv
EMAIL:john.doe@other.world
@ -133,7 +133,7 @@ TEL;TYPE=FAX,WORK:businessfax 4
TEL;TYPE=FAX,HOME:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
EMAIL;TYPE=WORK:john.doe@work.com
EMAIL;TYPE=HOME:john.doe@home.priv
EMAIL:john.doe@other.world
@ -245,7 +245,7 @@ TEL;TYPE=FAX,WORK:businessfax 4
TEL;TYPE=FAX,HOME:homefax 5
TEL;TYPE=PAGER:pager 6
TEL;TYPE=CAR:car 7
TEL;TYPE=PREF:primary 80
TEL;TYPE=PREF:primary 8xx
EMAIL;TYPE=WORK:john.doe@work.com
EMAIL;TYPE=HOME:john.doe@home.priv
EMAIL:john.doe@other.world