[evolution-data-server/openismus-work-3-8: 17/121] test-utils: Added argumement to the fixture closure data to open async

[Tristan Van Berkom <tvb src gnome org>]

commit bf3deb21a62e4cdab8fc2bdd70dbc581294982e3
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Wed Apr 24 16:56:02 2013 +0900

    test-utils: Added argumement to the fixture closure data to open async
    
    If a closure specifies async then the EBookClient or ECalClient will be
    opened using async APIs instead of sync APIs.

 tests/test-server-utils/e-test-server-utils.c |  113 ++++++++++++++++++++-----
 tests/test-server-utils/e-test-server-utils.h |    1 +
 2 files changed, 91 insertions(+), 23 deletions(-)
---
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index 0de33cc..bd1b1e8 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -137,6 +137,54 @@ client_weak_notify (gpointer data,
 }
 
 static void
+e_test_server_utils_client_ready (GObject *source_object,
+                                 GAsyncResult *res,
+                                 gpointer user_data)
+{
+       FixturePair *pair = (FixturePair *)user_data;
+       GError *error = NULL;
+
+       switch (pair->closure->type) {
+       case E_TEST_SERVER_ADDRESS_BOOK:
+               pair->fixture->service.book_client = (EBookClient *)
+                       e_book_client_connect_finish (res, &error);
+
+               if (!pair->fixture->service.book_client)
+                       g_error ("Unable to create the test book: %s", error->message);
+
+               g_object_weak_ref (G_OBJECT (pair->fixture->service.book_client),
+                                  client_weak_notify, pair->fixture);
+               break;
+       case E_TEST_SERVER_DIRECT_ADDRESS_BOOK:
+               pair->fixture->service.book_client = (EBookClient *)
+                       e_book_client_connect_direct_finish (res, &error);
+
+               if (!pair->fixture->service.book_client)
+                       g_error ("Unable to create the test book: %s", error->message);
+
+               g_object_weak_ref (G_OBJECT (pair->fixture->service.book_client),
+                                  client_weak_notify, pair->fixture);
+               break;
+       case E_TEST_SERVER_CALENDAR:
+               pair->fixture->service.calendar_client = (ECalClient *)
+                       e_cal_client_connect_finish (res, &error);
+
+               if (!pair->fixture->service.calendar_client)
+                       g_error ("Unable to create the test calendar: %s", error->message);
+
+               g_object_weak_ref (G_OBJECT (pair->fixture->service.calendar_client),
+                                  client_weak_notify, pair->fixture);
+               break;
+       case E_TEST_SERVER_DEPRECATED_ADDRESS_BOOK:
+       case E_TEST_SERVER_DEPRECATED_CALENDAR:
+       case E_TEST_SERVER_NONE:
+               g_assert_not_reached ();
+       }
+
+       g_main_loop_quit (pair->fixture->loop);
+}
+
+static void
 e_test_server_utils_source_added (ESourceRegistry *registry,
                                   ESource *source,
                                   FixturePair *pair)
@@ -150,24 +198,35 @@ e_test_server_utils_source_added (ESourceRegistry *registry,
        case E_TEST_SERVER_ADDRESS_BOOK:
        case E_TEST_SERVER_DIRECT_ADDRESS_BOOK:
 
-               if (pair->closure->type == E_TEST_SERVER_DIRECT_ADDRESS_BOOK)
-                       pair->fixture->service.book_client = (EBookClient *)
-                               e_book_client_connect_direct_sync (pair->fixture->registry, source, NULL, 
&error);
-               else
-                       pair->fixture->service.book_client = (EBookClient *)
-                               e_book_client_connect_sync (source, NULL, &error);
+               if (pair->closure->type == E_TEST_SERVER_DIRECT_ADDRESS_BOOK) {
+                       if (pair->closure->use_async_connect)
+                               e_book_client_connect_direct (source, NULL, e_test_server_utils_client_ready, 
pair);
+                       else
+                               pair->fixture->service.book_client = (EBookClient *)
+                                       e_book_client_connect_direct_sync (pair->fixture->registry,
+                                                                          source, NULL, &error);
+               } else {
+
+                       if (pair->closure->use_async_connect)
+                               e_book_client_connect (source, NULL, e_test_server_utils_client_ready, pair);
+                       else
+                               pair->fixture->service.book_client = (EBookClient *)
+                                       e_book_client_connect_sync (source, NULL, &error);
+               }
 
-               if (!pair->fixture->service.book_client)
-                       g_error ("Unable to create the test book: %s", error->message);
+               if (!pair->closure->use_async_connect) {
+                       if (!pair->fixture->service.book_client)
+                               g_error ("Unable to create the test book: %s", error->message);
 
-               g_object_weak_ref (
-                       G_OBJECT (pair->fixture->service.book_client),
-                       client_weak_notify, pair->fixture);
+                       g_object_weak_ref (G_OBJECT (pair->fixture->service.book_client),
+                                          client_weak_notify, pair->fixture);
+               }
 
                break;
 
        case E_TEST_SERVER_DEPRECATED_ADDRESS_BOOK:
 
+               /* Dont bother testing the Async apis for deprecated APIs */
                pair->fixture->service.book = e_book_new (source, &error);
                if (!pair->fixture->service.book)
                        g_error ("Unable to create the test book: %s", error->message);
@@ -183,21 +242,28 @@ e_test_server_utils_source_added (ESourceRegistry *registry,
 
        case E_TEST_SERVER_CALENDAR:
 
-               pair->fixture->service.calendar_client = (ECalClient *)
-                       e_cal_client_connect_sync (
-                               source,
-                               pair->closure->calendar_source_type, NULL, &error);
-               if (!pair->fixture->service.calendar_client)
-                       g_error ("Unable to create the test calendar: %s", error->message);
+               if (pair->closure->use_async_connect) {
+                       e_cal_client_connect (source, pair->closure->calendar_source_type,
+                                             NULL, e_test_server_utils_client_ready, pair);
 
-               g_object_weak_ref (
-                       G_OBJECT (pair->fixture->service.calendar_client),
-                       client_weak_notify, pair->fixture);
+               } else {
+
+                       pair->fixture->service.calendar_client = (ECalClient *)
+                               e_cal_client_connect_sync (
+                                       source,
+                                       pair->closure->calendar_source_type, NULL, &error);
+                       if (!pair->fixture->service.calendar_client)
+                               g_error ("Unable to create the test calendar: %s", error->message);
+
+                       g_object_weak_ref (G_OBJECT (pair->fixture->service.calendar_client),
+                                          client_weak_notify, pair->fixture);
+               }
 
                break;
 
        case E_TEST_SERVER_DEPRECATED_CALENDAR:
 
+               /* Dont bother testing the Async apis for deprecated APIs */
                pair->fixture->service.calendar = e_cal_new (source, pair->closure->calendar_source_type);
                if (!pair->fixture->service.calendar)
                        g_error ("Unable to create the test calendar");
@@ -215,7 +281,8 @@ e_test_server_utils_source_added (ESourceRegistry *registry,
                return;
        }
 
-       g_main_loop_quit (pair->fixture->loop);
+       if (!pair->closure->use_async_connect)
+               g_main_loop_quit (pair->fixture->loop);
 }
 
 static gboolean
diff --git a/tests/test-server-utils/e-test-server-utils.h b/tests/test-server-utils/e-test-server-utils.h
index 4ba4a77..8978124 100644
--- a/tests/test-server-utils/e-test-server-utils.h
+++ b/tests/test-server-utils/e-test-server-utils.h
@@ -92,6 +92,7 @@ struct _ETestServerClosure {
        gint                     calendar_source_type;
        gboolean                 keep_work_directory;
        GDestroyNotify           destroy_closure_func;
+       gboolean                 use_async_connect;
 };
 
 /**