summaryrefslogtreecommitdiff
path: root/tests/libebook
diff options
context:
space:
mode:
authorMathias Hasselmann <mathias@openismus.com>2013-02-25 16:39:27 +0100
committerMathias Hasselmann <mathias@openismus.com>2013-02-25 16:45:23 +0100
commit087e69314ca2777305f0ba3ce32e6152806834df (patch)
tree6f47fd288fb03d137dd2e0362c59db2d4f01bcb1 /tests/libebook
parent42d8cfec593ea589294850883478951031dd9ec4 (diff)
downloadevolution-data-server-087e69314ca2777305f0ba3ce32e6152806834df.tar.gz
sqlitedb: Repair summary based eqphone_national
Two things were broken: We dropped the lookup number's leading plus when building the Sqlite query. Additionally the national phone number collation routine forgot to check country codes if the national number was equal: Obviously two fully qualified phone numbers with identical national number but different country code, do not match. Even if only national matching is requested.
Diffstat (limited to 'tests/libebook')
-rw-r--r--tests/libebook/client/test-client-custom-summary.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/libebook/client/test-client-custom-summary.c b/tests/libebook/client/test-client-custom-summary.c
index 7cb7a187a..b4b68db37 100644
--- a/tests/libebook/client/test-client-custom-summary.c
+++ b/tests/libebook/client/test-client-custom-summary.c
@@ -352,14 +352,6 @@ main (gint argc,
E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER, "+1 514-845-8436"),
1, suites[i].direct, suites[i].custom);
-#if 0
- /* FIXME: This test passes with the default summary, but fails in the custom summary.
- *
- * Because EBookBackendSexp uses a straiht-forward e_phone_number_compare_strings() method
- * of comparison, it's my feeling that the method used in EBookBackendSqliteDB needs to be
- * fixed (possibly by just using e_phone_number_compare_strings() directly in it's collation rule).
- */
-
/* Test that a query term with an arbitrary country code specified returns a vCard with an unspecified
* country code.
*
@@ -369,7 +361,6 @@ main (gint argc,
e_book_query_field_test (E_CONTACT_TEL,
E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER, "+49 514-845-8436"),
1, suites[i].direct, suites[i].custom);
-#endif
add_client_test (suites[i].prefix, "/EqPhone/Short", suites[i].func,
e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_EQUALS_SHORT_PHONE_NUMBER, "5423789"),