[evolution-data-server] tests: Verify more EBook queries

[Mathias Hasselmann <hasselmm src gnome org>]

commit f358f98697c63a27c3a50538519ae0bacb6e086c
Author: Mathias Hasselmann <mathias openismus com>
Date:   Wed Dec 5 13:48:12 2012 +0100

    tests: Verify more EBook queries

 tests/libebook/test-query.c |  144 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 133 insertions(+), 11 deletions(-)
---
diff --git a/tests/libebook/test-query.c b/tests/libebook/test-query.c
index 9561949..f2a155b 100644
--- a/tests/libebook/test-query.c
+++ b/tests/libebook/test-query.c
@@ -4,16 +4,73 @@
 #define QUERY_STRING1
 #define QUERY_STRING2
 
+typedef struct {
+	EBookQuery *query;
+	char *sexp;
+} TestData;
+
+static void
+normalize_space (char *str)
+{
+	while (*str) {
+		char *tail;
+
+		if (*str++ != ' ')
+			continue;
+
+		tail = str;
+
+		while (*tail == ' ')
+			++tail;
+
+		memmove (str, tail, strlen (tail) + 1);
+	}
+}
+
 static void
-test_sexp (gconstpointer data)
+test_query (gconstpointer data)
 {
-	EBookQuery *query = e_book_query_from_string (data);
-	char *sexp = e_book_query_to_string (query);
+	const TestData *const test = data;
+	EBookQuery *query;
+	char *sexp;
 
-	g_assert_cmpstr (data, ==, sexp);
+	sexp = e_book_query_to_string (test->query);
+	normalize_space (sexp);
 
+	g_assert_cmpstr (test->sexp, ==, sexp);
 	g_free (sexp);
+
+	query = e_book_query_from_string (test->sexp);
+	sexp = e_book_query_to_string (query);
 	e_book_query_unref (query);
+	normalize_space (sexp);
+
+	g_assert_cmpstr (test->sexp, ==, sexp);
+	g_free (sexp);
+}
+
+static void
+test_data_free (gpointer data)
+{
+	TestData *const test = data;
+
+	e_book_query_unref (test->query);
+	g_free (test->sexp);
+
+	g_slice_free (TestData, test);
+}
+
+static void
+add_query_test (const char *path,
+                EBookQuery *query,
+                const char *sexp)
+{
+	TestData *data = g_slice_new (TestData);
+
+	data->sexp = g_strdup (sexp);
+	data->query = query;
+
+	g_test_add_data_func_full (path, data, test_query, test_data_free);
 }
 
 gint
@@ -24,14 +81,79 @@ main (gint argc,
 
 	g_test_init (&argc, &argv, NULL);
 
-	g_test_add_data_func ("/libebook/test-query/sexp/exists",
-	                      "(exists \"full_name\")",
-	                      test_sexp);
-	g_test_add_data_func ("/libebook/test-query/sexp/contains",
-	                      "(contains \"full_name\" \"Miguel\")",
-	                      test_sexp);
+	add_query_test ("/libebook/test-query/sexp/all",
+	                e_book_query_any_field_contains (NULL),
+	                "(contains \"x-evolution-any-field\" \"\")");
+
+	add_query_test ("/libebook/test-query/sexp/any",
+	                e_book_query_any_field_contains ("liberty"),
+	                "(contains \"x-evolution-any-field\" \"liberty\")");
+
+	add_query_test ("/libebook/test-query/sexp/not",
+	                e_book_query_not (e_book_query_any_field_contains ("liberty"), TRUE),
+	                "(not (contains \"x-evolution-any-field\" \"liberty\"))");
+
+	add_query_test ("/libebook/test-query/sexp/and",
+	                e_book_query_andv (e_book_query_any_field_contains ("liberty"),
+	                                   e_book_query_any_field_contains ("friendship"),
+	                                   NULL),
+	                "(and (contains \"x-evolution-any-field\" \"liberty\")"
+	                    " (contains \"x-evolution-any-field\" \"friendship\")"
+	                    " )");
+
+	add_query_test ("/libebook/test-query/sexp/or",
+	                e_book_query_orv (e_book_query_any_field_contains ("liberty"),
+	                                  e_book_query_any_field_contains ("friendship"),
+	                                  NULL),
+	                "(or (contains \"x-evolution-any-field\" \"liberty\")"
+	                   " (contains \"x-evolution-any-field\" \"friendship\")"
+	                   " )");
+
+	add_query_test ("/libebook/test-query/sexp/exists",
+	                e_book_query_field_exists (E_CONTACT_FULL_NAME),
+	                "(exists \"full_name\")");
+
+	add_query_test ("/libebook/test-query/sexp/contains",
+	                e_book_query_field_test (E_CONTACT_FULL_NAME,
+	                                         E_BOOK_QUERY_CONTAINS,
+	                                         "Miguel"),
+	                "(contains \"full_name\" \"Miguel\")");
+
+	add_query_test ("/libebook/test-query/sexp/is",
+	                e_book_query_field_test (E_CONTACT_GIVEN_NAME,
+	                                         E_BOOK_QUERY_IS,
+	                                         "Miguel"),
+	                "(is \"given_name\" \"Miguel\")");
+
+	add_query_test ("/libebook/test-query/sexp/beginswith",
+	                e_book_query_field_test (E_CONTACT_FULL_NAME,
+	                                         E_BOOK_QUERY_BEGINS_WITH,
+	                                         "Mig"),
+	                "(beginswith \"full_name\" \"Mig\")");
+
+	add_query_test ("/libebook/test-query/sexp/endswith",
+	                e_book_query_field_test (E_CONTACT_TEL,
+	                                         E_BOOK_QUERY_ENDS_WITH,
+	                                         "5423789"),
+	                "(endswith \"phone\" \"5423789\")");
+
+	add_query_test ("/libebook/test-query/sexp/eqphone",
+
+	                e_book_query_orv (e_book_query_field_test (E_CONTACT_TEL,
+	                                                           E_BOOK_QUERY_EQUALS_PHONE_NUMBER,
+	                                                           "+1-2215423789"),
+	                                  e_book_query_field_test (E_CONTACT_TEL,
+	                                                           E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER,
+	                                                           "2215423789"),
+	                                  e_book_query_field_test (E_CONTACT_TEL,
+	                                                           E_BOOK_QUERY_EQUALS_SHORT_PHONE_NUMBER,
+	                                                           "5423789"),
+	                                  NULL),
 
-	/* XXX come on, add more here */
+	                "(or (eqphone \"phone\" \"+1-2215423789\")"
+	                   " (eqphone_national \"phone\" \"2215423789\")"
+	                   " (eqphone_short \"phone\" \"5423789\")"
+	                   " )");
 
 	return g_test_run ();
 }