[evolution-data-server/openismus-work-master: 113/137] Fixing test-client-custom-summary for merge state.

[Tristan Van Berkom <tvb src gnome org>]

commit 93489d4c20f04023245e0d374f744626ae43050a
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Sat Oct 12 02:09:42 2013 +0200

    Fixing test-client-custom-summary for merge state.
    
    Currently we are pulling in all changes except for transliterated
    query types, so we need to push the transliterated query testing
    vcard (which was formerly custom-13) to a later date.
    
    This patch moves custom-16.vcf -> 15, 15 -> 14 and 14 to 13.

 tests/libebook/Makefile.am                         |    1 -
 tests/libebook/client/test-client-custom-summary.c |    2 +-
 tests/libebook/data/vcards/custom-13.vcf           |    6 ++++++
 tests/libebook/data/vcards/custom-14.vcf           |    6 +++---
 tests/libebook/data/vcards/custom-15.vcf           |    6 +++---
 tests/libebook/data/vcards/custom-16.vcf           |    6 ------
 6 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/tests/libebook/Makefile.am b/tests/libebook/Makefile.am
index f6c9d6c..dc3663d 100644
--- a/tests/libebook/Makefile.am
+++ b/tests/libebook/Makefile.am
@@ -97,7 +97,6 @@ EXTRA_DIST = \
        $(srcdir)/data/vcards/custom-13.vcf     \
        $(srcdir)/data/vcards/custom-14.vcf     \
        $(srcdir)/data/vcards/custom-15.vcf     \
-       $(srcdir)/data/vcards/custom-16.vcf     \
        $(NULL)
 
 test_ebook_commit_contact_LDADD=$(TEST_LIBS)
diff --git a/tests/libebook/client/test-client-custom-summary.c 
b/tests/libebook/client/test-client-custom-summary.c
index 1e268e5..889a6dd 100644
--- a/tests/libebook/client/test-client-custom-summary.c
+++ b/tests/libebook/client/test-client-custom-summary.c
@@ -69,7 +69,7 @@ static ETestServerClosure setup_default_closure = { E_TEST_SERVER_ADDRESS_BOOK,
 #  define CHECK_UNSUPPORTED_ERROR(data) (((ClientTestData *)(data))->phone_number_query != FALSE)
 #endif
 
-#define N_CONTACTS 16
+#define N_CONTACTS 15
 
 
 typedef struct {
diff --git a/tests/libebook/data/vcards/custom-13.vcf b/tests/libebook/data/vcards/custom-13.vcf
new file mode 100644
index 0000000..878def9
--- /dev/null
+++ b/tests/libebook/data/vcards/custom-13.vcf
@@ -0,0 +1,6 @@
+BEGIN:VCARD
+UID:custom-13
+N:Murphey;Eddie
+TEL;HOME:408 765-5050
+EMAIL;TYPE=home,work:eddie murphey usa
+END:VCARD
diff --git a/tests/libebook/data/vcards/custom-14.vcf b/tests/libebook/data/vcards/custom-14.vcf
index 5b549e1..d064757 100644
--- a/tests/libebook/data/vcards/custom-14.vcf
+++ b/tests/libebook/data/vcards/custom-14.vcf
@@ -1,6 +1,6 @@
 BEGIN:VCARD
 UID:custom-14
-N:Murphey;Eddie
-TEL;HOME:408 765-5050
-EMAIL;TYPE=home,work:eddie murphey usa
+N:Turner;Tina
+TEL;HOME:+1 408 765-5050
+EMAIL;TYPE=home,work:tina turner net
 END:VCARD
diff --git a/tests/libebook/data/vcards/custom-15.vcf b/tests/libebook/data/vcards/custom-15.vcf
index 3e59b7e..4e72cf3 100644
--- a/tests/libebook/data/vcards/custom-15.vcf
+++ b/tests/libebook/data/vcards/custom-15.vcf
@@ -1,6 +1,6 @@
 BEGIN:VCARD
 UID:custom-15
-N:Turner;Tina
-TEL;HOME:+1 408 765-5050
-EMAIL;TYPE=home,work:tina turner net
+N:Crawley;Alister
+TEL;HOME:+49 408 765-5050
+EMAIL;TYPE=home,work:777 starry sect
 END:VCARD