EBookClient tests: Use async apis to open the client for every async test.

15 files changed, 82 insertions, 62 deletions

diff --git a/tests/libebook/client/test-client-add-and-get-async.c b/tests/libebook/client/test-client-add-and-get-async.c
index f34dd84a6..c1dc84a59 100644
--- a/tests/libebook/client/test-client-add-and-get-async.c
+++ b/tests/libebook/client/test-client-add-and-get-async.c
@@ -6,7 +6,7 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 #define N_CONTACTS 5
 
diff --git a/tests/libebook/client/test-client-add-and-get-sync.c b/tests/libebook/client/test-client-add-and-get-sync.c
index 4f7d07281..a323bbfb0 100644
--- a/tests/libebook/client/test-client-add-and-get-sync.c
+++ b/tests/libebook/client/test-client-add-and-get-sync.c
@@ -6,7 +6,7 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
 
 #define N_CONTACTS 6
 
diff --git a/tests/libebook/client/test-client-add-contact.c b/tests/libebook/client/test-client-add-contact.c
index b3a7af55a..3ff28d5fa 100644
--- a/tests/libebook/client/test-client-add-contact.c
+++ b/tests/libebook/client/test-client-add-contact.c
@@ -6,7 +6,8 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync  = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 static void
 test_add_contact_sync (ETestServerFixture *fixture,
@@ -71,14 +72,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/AddContact/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_add_contact_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/AddContact/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_add_contact_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-get-contact-uids.c b/tests/libebook/client/test-client-get-contact-uids.c
index 97b1290e4..012e0b404 100644
--- a/tests/libebook/client/test-client-get-contact-uids.c
+++ b/tests/libebook/client/test-client-get-contact-uids.c
@@ -6,8 +6,10 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-static ETestServerClosure direct_book_closure = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync         = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async        = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync  = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 static void
 test_get_contact_uids_sync (ETestServerFixture *fixture,
@@ -99,28 +101,28 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/GetContactUids/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_get_contact_uids_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/GetContactUids/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_get_contact_uids_async,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/GetContactUids/Sync",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_sync,
 		e_test_server_utils_setup,
 		test_get_contact_uids_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/GetContactUids/Async",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_async,
 		e_test_server_utils_setup,
 		test_get_contact_uids_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-get-contact.c b/tests/libebook/client/test-client-get-contact.c
index f11818cdf..2f750fc85 100644
--- a/tests/libebook/client/test-client-get-contact.c
+++ b/tests/libebook/client/test-client-get-contact.c
@@ -6,8 +6,10 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-static ETestServerClosure direct_book_closure = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync         = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async        = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync  = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 static void
 test_get_contact_sync (ETestServerFixture *fixture,
@@ -74,28 +76,28 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/GetContact/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_get_contact_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/GetContact/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_get_contact_async,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/GetContact/Sync",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_sync,
 		e_test_server_utils_setup,
 		test_get_contact_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/GetContact/Async",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_async,
 		e_test_server_utils_setup,
 		test_get_contact_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-get-view.c b/tests/libebook/client/test-client-get-view.c
index 846f0e2aa..df8fbca72 100644
--- a/tests/libebook/client/test-client-get-view.c
+++ b/tests/libebook/client/test-client-get-view.c
@@ -6,8 +6,10 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-static ETestServerClosure direct_book_closure = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync         = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async        = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync  = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 static void
 objects_added (EBookClientView *view,
@@ -149,28 +151,28 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/GetBookClientView/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_get_view_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/GetBookClientView/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_get_view_async,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/GetBookClientView/Sync",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_sync,
 		e_test_server_utils_setup,
 		test_get_view_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/GetBookClientView/Async",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_async,
 		e_test_server_utils_setup,
 		test_get_view_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-modify-contact.c b/tests/libebook/client/test-client-modify-contact.c
index ae20908bf..61ae72df0 100644
--- a/tests/libebook/client/test-client-modify-contact.c
+++ b/tests/libebook/client/test-client-modify-contact.c
@@ -6,7 +6,8 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync  = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 #define EMAIL_ADD "foo@bar.com"
 
@@ -135,14 +136,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/ModifyContact/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_modify_contact_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/ModifyContact/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_modify_contact_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-refresh.c b/tests/libebook/client/test-client-refresh.c
index 654c47952..b9525665d 100644
--- a/tests/libebook/client/test-client-refresh.c
+++ b/tests/libebook/client/test-client-refresh.c
@@ -7,7 +7,8 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync  = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 /* asynchronous callback with a main-loop running */
 static void
@@ -81,14 +82,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/Refresh/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_refresh_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/Refresh/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_refresh_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-remove-contact-by-uid.c b/tests/libebook/client/test-client-remove-contact-by-uid.c
index f19ac0075..250b8d654 100644
--- a/tests/libebook/client/test-client-remove-contact-by-uid.c
+++ b/tests/libebook/client/test-client-remove-contact-by-uid.c
@@ -5,7 +5,8 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync  = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 static void
 test_remove_contact_by_uid_sync (ETestServerFixture *fixture,
@@ -97,14 +98,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/RemoveContactByUid/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_remove_contact_by_uid_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/RemoveContactByUid/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_remove_contact_by_uid_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-remove-contact.c b/tests/libebook/client/test-client-remove-contact.c
index 2579a533c..3153c02df 100644
--- a/tests/libebook/client/test-client-remove-contact.c
+++ b/tests/libebook/client/test-client-remove-contact.c
@@ -6,8 +6,10 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-static ETestServerClosure direct_book_closure = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync         = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async        = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync  = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 static void
 check_removed_contact (EBookClient *book_client,
@@ -120,14 +122,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/RemoveContact/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_remove_contact_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/RemoveContact/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_remove_contact_async,
 		e_test_server_utils_teardown);
@@ -138,14 +140,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/DirectAccess/RemoveContact/Sync",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_sync,
 		e_test_server_utils_setup,
 		test_remove_contact_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/RemoveContact/Async",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_async,
 		e_test_server_utils_setup,
 		test_remove_contact_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-remove-contacts.c b/tests/libebook/client/test-client-remove-contacts.c
index 5d8d4a4bd..51998d1b3 100644
--- a/tests/libebook/client/test-client-remove-contacts.c
+++ b/tests/libebook/client/test-client-remove-contacts.c
@@ -5,7 +5,8 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync  = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 static void
 check_removed (EBookClient *book_client,
@@ -129,14 +130,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/RemoveContacts/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_remove_contacts_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/RemoveContacts/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_remove_contacts_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-revision-view.c b/tests/libebook/client/test-client-revision-view.c
index eaf902fab..ac1403dae 100644
--- a/tests/libebook/client/test-client-revision-view.c
+++ b/tests/libebook/client/test-client-revision-view.c
@@ -6,7 +6,8 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync  = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 #define N_TEST_CONTACTS 4
 
@@ -225,14 +226,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/RevisionView/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_revision_view_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/RevisionView/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_revision_view_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-suppress-notifications.c b/tests/libebook/client/test-client-suppress-notifications.c
index d745d9e89..271db707a 100644
--- a/tests/libebook/client/test-client-suppress-notifications.c
+++ b/tests/libebook/client/test-client-suppress-notifications.c
@@ -6,8 +6,10 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-static ETestServerClosure direct_book_closure = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync         = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async        = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync  = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 #define NOTIFICATION_WAIT 2000
 
@@ -190,28 +192,28 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/SuppressNotifications/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_suppress_notifications_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/SuppressNotifications/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_suppress_notifications_async,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/SuppressNotifications/Sync",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_sync,
 		e_test_server_utils_setup,
 		test_suppress_notifications_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/SuppressNotifications/Async",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_async,
 		e_test_server_utils_setup,
 		test_suppress_notifications_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-uid-only-view.c b/tests/libebook/client/test-client-uid-only-view.c
index 819d97206..b1f973f47 100644
--- a/tests/libebook/client/test-client-uid-only-view.c
+++ b/tests/libebook/client/test-client-uid-only-view.c
@@ -11,8 +11,10 @@ typedef struct {
 	gboolean uids_only;
 } UIDOnlyClosure;
 
-static UIDOnlyClosure book_closure_all_data = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 }, FALSE };
-static UIDOnlyClosure book_closure_uids_only = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 }, TRUE };
+static UIDOnlyClosure book_closure_all_data_sync   = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE }, FALSE };
+static UIDOnlyClosure book_closure_all_data_async  = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE },  FALSE };
+static UIDOnlyClosure book_closure_uids_only_sync  = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE }, TRUE };
+static UIDOnlyClosure book_closure_uids_only_async = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE },  TRUE };
 
 #define N_TEST_CONTACTS 4
 
@@ -309,14 +311,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/UidOnlyView/Sync/AllData",
 		ETestServerFixture,
-		&book_closure_all_data,
+		&book_closure_all_data_sync,
 		e_test_server_utils_setup,
 		test_get_view_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/UidOnlyView/Sync/UidsOnly",
 		ETestServerFixture,
-		&book_closure_uids_only,
+		&book_closure_uids_only_sync,
 		e_test_server_utils_setup,
 		test_get_view_sync,
 		e_test_server_utils_teardown);
@@ -324,14 +326,14 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/UidOnlyView/Async/AllData",
 		ETestServerFixture,
-		&book_closure_all_data,
+		&book_closure_all_data_async,
 		e_test_server_utils_setup,
 		test_get_view_async,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/UidOnlyView/Async/UidsOnly",
 		ETestServerFixture,
-		&book_closure_uids_only,
+		&book_closure_uids_only_async,
 		e_test_server_utils_setup,
 		test_get_view_async,
 		e_test_server_utils_teardown);
diff --git a/tests/libebook/client/test-client-view-operations.c b/tests/libebook/client/test-client-view-operations.c
index 86de774b0..e24e09b2a 100644
--- a/tests/libebook/client/test-client-view-operations.c
+++ b/tests/libebook/client/test-client-view-operations.c
@@ -8,8 +8,10 @@
 #include "client-test-utils.h"
 #include "e-test-server-utils.h"
 
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-static ETestServerClosure direct_book_closure = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure_sync         = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async        = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync  = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
 
 #define N_THREADS  5
 #define N_CONTACTS 5
@@ -381,28 +383,28 @@ main (gint argc,
 	g_test_add (
 		"/EBookClient/ConcurrentViews/Sync",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_sync,
 		e_test_server_utils_setup,
 		test_concurrent_views_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/ConcurrentViews/Async",
 		ETestServerFixture,
-		&book_closure,
+		&book_closure_async,
 		e_test_server_utils_setup,
 		test_concurrent_views_async,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/ConcurrentViews/Sync",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_sync,
 		e_test_server_utils_setup,
 		test_concurrent_views_sync,
 		e_test_server_utils_teardown);
 	g_test_add (
 		"/EBookClient/DirectAccess/ConcurrentViews/Async",
 		ETestServerFixture,
-		&direct_book_closure,
+		&book_closure_direct_async,
 		e_test_server_utils_setup,
 		test_concurrent_views_async,
 		e_test_server_utils_teardown);