Moved all libebook/client tests to have a namespace

Avoid naming conflicts when installing tests into ${pkglibexecdir}/installed-tests

25 files changed, 96 insertions, 96 deletions

diff --git a/tests/libebook/client/Makefile.am b/tests/libebook/client/Makefile.am
index fd75c237c..bbe3fc66c 100644
--- a/tests/libebook/client/Makefile.am
+++ b/tests/libebook/client/Makefile.am
@@ -35,30 +35,30 @@ libclient_test_utils_la_LIBADD = \
 
 # Should be kept ordered approximately from least to most difficult/complex
 TESTS = \
-	test-client-refresh \
-	test-client-add-contact \
-	test-client-get-contact \
-	test-client-get-contact-uids \
-	test-client-modify-contact \
-	test-client-remove-contact \
-	test-client-remove-contact-by-uid \
-	test-client-remove-contacts \
-	test-client-add-and-get-sync \
-	test-client-add-and-get-async \
-	test-client-self \
-	test-client-preserve-uid \
-	test-client-photo-is-uri \
-	test-client-e164-param \
-        test-client-custom-summary \
-	test-client-get-revision \
-	test-client-write-write \
-	test-client-get-view \
-	test-client-uid-only-view \
-	test-client-revision-view \
-	test-client-view-operations \
-	test-client-suppress-notifications \
-	test-client-cursor-create \
-	test-client-cursor-operations \
+	test-book-client-refresh \
+	test-book-client-add-contact \
+	test-book-client-get-contact \
+	test-book-client-get-contact-uids \
+	test-book-client-modify-contact \
+	test-book-client-remove-contact \
+	test-book-client-remove-contact-by-uid \
+	test-book-client-remove-contacts \
+	test-book-client-add-and-get-sync \
+	test-book-client-add-and-get-async \
+	test-book-client-self \
+	test-book-client-preserve-uid \
+	test-book-client-photo-is-uri \
+	test-book-client-e164-param \
+        test-book-client-custom-summary \
+	test-book-client-get-revision \
+	test-book-client-write-write \
+	test-book-client-get-view \
+	test-book-client-uid-only-view \
+	test-book-client-revision-view \
+	test-book-client-view-operations \
+	test-book-client-suppress-notifications \
+	test-book-client-cursor-create \
+	test-book-client-cursor-operations \
 	$(NULL)
 
 # The noinst tests are functional tests, not unit tests.
@@ -79,54 +79,54 @@ TEST_LIBS = \
 	$(EVOLUTION_ADDRESSBOOK_LIBS) \
 	$(NULL)
 
-test_client_add_and_get_sync_LDADD=$(TEST_LIBS)
-test_client_add_and_get_sync_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_add_and_get_async_LDADD=$(TEST_LIBS)
-test_client_add_and_get_async_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_add_contact_LDADD=$(TEST_LIBS)
-test_client_add_contact_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_preserve_uid_LDADD=$(TEST_LIBS)
-test_client_preserve_uid_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_get_contact_LDADD=$(TEST_LIBS)
-test_client_get_contact_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_get_contact_uids_LDADD=$(TEST_LIBS)
-test_client_get_contact_uids_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_e164_param_LDADD=$(TEST_LIBS)
-test_client_e164_param_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_custom_summary_LDADD=$(TEST_LIBS)
-test_client_custom_summary_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_get_revision_LDADD=$(TEST_LIBS)
-test_client_get_revision_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_get_view_LDADD=$(TEST_LIBS)
-test_client_get_view_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_uid_only_view_LDADD=$(TEST_LIBS)
-test_client_uid_only_view_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_revision_view_LDADD=$(TEST_LIBS)
-test_client_revision_view_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_view_operations_LDADD=$(TEST_LIBS)
-test_client_view_operations_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_suppress_notifications_LDADD=$(TEST_LIBS)
-test_client_suppress_notifications_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_modify_contact_LDADD=$(TEST_LIBS)
-test_client_modify_contact_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_refresh_LDADD=$(TEST_LIBS)
-test_client_refresh_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_remove_contact_LDADD=$(TEST_LIBS)
-test_client_remove_contact_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_remove_contact_by_uid_LDADD=$(TEST_LIBS)
-test_client_remove_contact_by_uid_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_remove_contacts_LDADD=$(TEST_LIBS)
-test_client_remove_contacts_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_photo_is_uri_LDADD=$(TEST_LIBS)
-test_client_photo_is_uri_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_write_write_LDADD=$(TEST_LIBS)
-test_client_write_write_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_self_LDADD=$(TEST_LIBS)
-test_client_self_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_cursor_create_LDADD=$(TEST_LIBS)
-test_client_cursor_create_CPPFLAGS=$(TEST_CPPFLAGS)
-test_client_cursor_operations_LDADD=$(TEST_LIBS)
-test_client_cursor_operations_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_add_and_get_sync_LDADD=$(TEST_LIBS)
+test_book_client_add_and_get_sync_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_add_and_get_async_LDADD=$(TEST_LIBS)
+test_book_client_add_and_get_async_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_add_contact_LDADD=$(TEST_LIBS)
+test_book_client_add_contact_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_preserve_uid_LDADD=$(TEST_LIBS)
+test_book_client_preserve_uid_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_get_contact_LDADD=$(TEST_LIBS)
+test_book_client_get_contact_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_get_contact_uids_LDADD=$(TEST_LIBS)
+test_book_client_get_contact_uids_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_e164_param_LDADD=$(TEST_LIBS)
+test_book_client_e164_param_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_custom_summary_LDADD=$(TEST_LIBS)
+test_book_client_custom_summary_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_get_revision_LDADD=$(TEST_LIBS)
+test_book_client_get_revision_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_get_view_LDADD=$(TEST_LIBS)
+test_book_client_get_view_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_uid_only_view_LDADD=$(TEST_LIBS)
+test_book_client_uid_only_view_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_revision_view_LDADD=$(TEST_LIBS)
+test_book_client_revision_view_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_view_operations_LDADD=$(TEST_LIBS)
+test_book_client_view_operations_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_suppress_notifications_LDADD=$(TEST_LIBS)
+test_book_client_suppress_notifications_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_modify_contact_LDADD=$(TEST_LIBS)
+test_book_client_modify_contact_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_refresh_LDADD=$(TEST_LIBS)
+test_book_client_refresh_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_remove_contact_LDADD=$(TEST_LIBS)
+test_book_client_remove_contact_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_remove_contact_by_uid_LDADD=$(TEST_LIBS)
+test_book_client_remove_contact_by_uid_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_remove_contacts_LDADD=$(TEST_LIBS)
+test_book_client_remove_contacts_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_photo_is_uri_LDADD=$(TEST_LIBS)
+test_book_client_photo_is_uri_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_write_write_LDADD=$(TEST_LIBS)
+test_book_client_write_write_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_self_LDADD=$(TEST_LIBS)
+test_book_client_self_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_cursor_create_LDADD=$(TEST_LIBS)
+test_book_client_cursor_create_CPPFLAGS=$(TEST_CPPFLAGS)
+test_book_client_cursor_operations_LDADD=$(TEST_LIBS)
+test_book_client_cursor_operations_CPPFLAGS=$(TEST_CPPFLAGS)
 
 -include $(top_srcdir)/git.mk
 
@@ -136,37 +136,37 @@ test_client_cursor_operations_CPPFLAGS=$(TEST_CPPFLAGS)
 @EDS_INSTALLED_TESTS_RULE@
 
 # Here we list all the $(TESTS) except
-# for test-client-cursor-operations, that
+# for test-book-client-cursor-operations, that
 # test requires that we set the locale
 # on the system bus, or set EDS_TESTING=1
 # both in the test environment AND the D-Bus
 # session environment.
 #
-# test-client-self also fails for some reason
+# test-book-client-self also fails for some reason
 # when running installed, not sure why.
 INSTALLED_TESTS = \
-	test-client-refresh \
-	test-client-add-contact \
-	test-client-get-contact \
-	test-client-get-contact-uids \
-	test-client-modify-contact \
-	test-client-remove-contact \
-	test-client-remove-contact-by-uid \
-	test-client-remove-contacts \
-	test-client-add-and-get-sync \
-	test-client-add-and-get-async \
-	test-client-preserve-uid \
-	test-client-photo-is-uri \
-	test-client-e164-param \
-        test-client-custom-summary \
-	test-client-get-revision \
-	test-client-write-write \
-	test-client-get-view \
-	test-client-uid-only-view \
-	test-client-revision-view \
-	test-client-view-operations \
-	test-client-suppress-notifications \
-	test-client-cursor-create \
+	test-book-client-refresh \
+	test-book-client-add-contact \
+	test-book-client-get-contact \
+	test-book-client-get-contact-uids \
+	test-book-client-modify-contact \
+	test-book-client-remove-contact \
+	test-book-client-remove-contact-by-uid \
+	test-book-client-remove-contacts \
+	test-book-client-add-and-get-sync \
+	test-book-client-add-and-get-async \
+	test-book-client-preserve-uid \
+	test-book-client-photo-is-uri \
+	test-book-client-e164-param \
+        test-book-client-custom-summary \
+	test-book-client-get-revision \
+	test-book-client-write-write \
+	test-book-client-get-view \
+	test-book-client-uid-only-view \
+	test-book-client-revision-view \
+	test-book-client-view-operations \
+	test-book-client-suppress-notifications \
+	test-book-client-cursor-create \
 	$(NULL)
 
 INSTALLED_TESTS_TYPE = session-exclusive
diff --git a/tests/libebook/client/test-client-add-and-get-async.c b/tests/libebook/client/test-book-client-add-and-get-async.c
index c1dc84a59..c1dc84a59 100644
--- a/tests/libebook/client/test-client-add-and-get-async.c
+++ b/tests/libebook/client/test-book-client-add-and-get-async.c
diff --git a/tests/libebook/client/test-client-add-and-get-sync.c b/tests/libebook/client/test-book-client-add-and-get-sync.c
index a323bbfb0..a323bbfb0 100644
--- a/tests/libebook/client/test-client-add-and-get-sync.c
+++ b/tests/libebook/client/test-book-client-add-and-get-sync.c
diff --git a/tests/libebook/client/test-client-add-contact.c b/tests/libebook/client/test-book-client-add-contact.c
index 3ff28d5fa..3ff28d5fa 100644
--- a/tests/libebook/client/test-client-add-contact.c
+++ b/tests/libebook/client/test-book-client-add-contact.c
diff --git a/tests/libebook/client/test-client-cursor-create.c b/tests/libebook/client/test-book-client-cursor-create.c
index ea4a266bd..ea4a266bd 100644
--- a/tests/libebook/client/test-client-cursor-create.c
+++ b/tests/libebook/client/test-book-client-cursor-create.c
diff --git a/tests/libebook/client/test-client-cursor-operations.c b/tests/libebook/client/test-book-client-cursor-operations.c
index 37694d1b8..37694d1b8 100644
--- a/tests/libebook/client/test-client-cursor-operations.c
+++ b/tests/libebook/client/test-book-client-cursor-operations.c
diff --git a/tests/libebook/client/test-client-custom-summary.c b/tests/libebook/client/test-book-client-custom-summary.c
index df4cdd0e9..df4cdd0e9 100644
--- a/tests/libebook/client/test-client-custom-summary.c
+++ b/tests/libebook/client/test-book-client-custom-summary.c
diff --git a/tests/libebook/client/test-client-e164-param.c b/tests/libebook/client/test-book-client-e164-param.c
index 45f86516c..45f86516c 100644
--- a/tests/libebook/client/test-client-e164-param.c
+++ b/tests/libebook/client/test-book-client-e164-param.c
diff --git a/tests/libebook/client/test-client-get-contact-uids.c b/tests/libebook/client/test-book-client-get-contact-uids.c
index 012e0b404..012e0b404 100644
--- a/tests/libebook/client/test-client-get-contact-uids.c
+++ b/tests/libebook/client/test-book-client-get-contact-uids.c
diff --git a/tests/libebook/client/test-client-get-contact.c b/tests/libebook/client/test-book-client-get-contact.c
index 2f750fc85..2f750fc85 100644
--- a/tests/libebook/client/test-client-get-contact.c
+++ b/tests/libebook/client/test-book-client-get-contact.c
diff --git a/tests/libebook/client/test-client-get-revision.c b/tests/libebook/client/test-book-client-get-revision.c
index d5e392b8e..d5e392b8e 100644
--- a/tests/libebook/client/test-client-get-revision.c
+++ b/tests/libebook/client/test-book-client-get-revision.c
diff --git a/tests/libebook/client/test-client-get-view.c b/tests/libebook/client/test-book-client-get-view.c
index df8fbca72..df8fbca72 100644
--- a/tests/libebook/client/test-client-get-view.c
+++ b/tests/libebook/client/test-book-client-get-view.c
diff --git a/tests/libebook/client/test-client-modify-contact.c b/tests/libebook/client/test-book-client-modify-contact.c
index 371345e8e..371345e8e 100644
--- a/tests/libebook/client/test-client-modify-contact.c
+++ b/tests/libebook/client/test-book-client-modify-contact.c
diff --git a/tests/libebook/client/test-client-photo-is-uri.c b/tests/libebook/client/test-book-client-photo-is-uri.c
index 0c5d4e5ce..0c5d4e5ce 100644
--- a/tests/libebook/client/test-client-photo-is-uri.c
+++ b/tests/libebook/client/test-book-client-photo-is-uri.c
diff --git a/tests/libebook/client/test-client-preserve-uid.c b/tests/libebook/client/test-book-client-preserve-uid.c
index 28e8e8521..28e8e8521 100644
--- a/tests/libebook/client/test-client-preserve-uid.c
+++ b/tests/libebook/client/test-book-client-preserve-uid.c
diff --git a/tests/libebook/client/test-client-refresh.c b/tests/libebook/client/test-book-client-refresh.c
index 57ee0b762..57ee0b762 100644
--- a/tests/libebook/client/test-client-refresh.c
+++ b/tests/libebook/client/test-book-client-refresh.c
diff --git a/tests/libebook/client/test-client-remove-contact-by-uid.c b/tests/libebook/client/test-book-client-remove-contact-by-uid.c
index 250b8d654..250b8d654 100644
--- a/tests/libebook/client/test-client-remove-contact-by-uid.c
+++ b/tests/libebook/client/test-book-client-remove-contact-by-uid.c
diff --git a/tests/libebook/client/test-client-remove-contact.c b/tests/libebook/client/test-book-client-remove-contact.c
index 3153c02df..3153c02df 100644
--- a/tests/libebook/client/test-client-remove-contact.c
+++ b/tests/libebook/client/test-book-client-remove-contact.c
diff --git a/tests/libebook/client/test-client-remove-contacts.c b/tests/libebook/client/test-book-client-remove-contacts.c
index 51998d1b3..51998d1b3 100644
--- a/tests/libebook/client/test-client-remove-contacts.c
+++ b/tests/libebook/client/test-book-client-remove-contacts.c
diff --git a/tests/libebook/client/test-client-revision-view.c b/tests/libebook/client/test-book-client-revision-view.c
index 21ecc7aae..21ecc7aae 100644
--- a/tests/libebook/client/test-client-revision-view.c
+++ b/tests/libebook/client/test-book-client-revision-view.c
diff --git a/tests/libebook/client/test-client-self.c b/tests/libebook/client/test-book-client-self.c
index ee69a6761..ee69a6761 100644
--- a/tests/libebook/client/test-client-self.c
+++ b/tests/libebook/client/test-book-client-self.c
diff --git a/tests/libebook/client/test-client-suppress-notifications.c b/tests/libebook/client/test-book-client-suppress-notifications.c
index 271db707a..271db707a 100644
--- a/tests/libebook/client/test-client-suppress-notifications.c
+++ b/tests/libebook/client/test-book-client-suppress-notifications.c
diff --git a/tests/libebook/client/test-client-uid-only-view.c b/tests/libebook/client/test-book-client-uid-only-view.c
index 46f3f9442..46f3f9442 100644
--- a/tests/libebook/client/test-client-uid-only-view.c
+++ b/tests/libebook/client/test-book-client-uid-only-view.c
diff --git a/tests/libebook/client/test-client-view-operations.c b/tests/libebook/client/test-book-client-view-operations.c
index e24e09b2a..e24e09b2a 100644
--- a/tests/libebook/client/test-client-view-operations.c
+++ b/tests/libebook/client/test-book-client-view-operations.c
diff --git a/tests/libebook/client/test-client-write-write.c b/tests/libebook/client/test-book-client-write-write.c
index 4fc29ee69..4fc29ee69 100644
--- a/tests/libebook/client/test-client-write-write.c
+++ b/tests/libebook/client/test-book-client-write-write.c