[evolution-data-server] Use `g_assert_true()` instead of `g_assert()` in the unit tests
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Use `g_assert_true()` instead of `g_assert()` in the unit tests
- Date: Wed, 29 Sep 2021 10:50:51 +0000 (UTC)
commit 64e61883c87067c137d43ea82419feb355010922
Author: Milan Crha <mcrha redhat com>
Date: Wed Sep 29 12:47:07 2021 +0200
Use `g_assert_true()` instead of `g_assert()` in the unit tests
The `g_assert()` can be disabled by `G_DISABLE_ASSERT` when compiling,
which is not desired for the unit tests, thus use the `g_assert_true()`
in the tests instead.
src/addressbook/libebook-contacts/e-vcard.c | 8 +-
tests/book-migration/test-migration.c | 2 +-
tests/libebook-contacts/test-contact-types.c | 8 +-
tests/libebook-contacts/test-phone-number.c | 74 ++++-----
tests/libebook-contacts/test-query.c | 4 +-
tests/libebook-contacts/test-untyped-phones.c | 6 +-
tests/libebook-contacts/test-vcard-parsing.c | 66 ++++----
tests/libebook/client/client-test-utils.c | 4 +-
.../client/test-book-client-cursor-operations.c | 10 +-
.../libebook/client/test-book-client-e164-param.c | 12 +-
.../libebook/client/test-book-client-get-contact.c | 2 +-
.../client/test-book-client-get-revision.c | 4 +-
.../client/test-book-client-modify-contact.c | 8 +-
.../client/test-book-client-photo-is-uri.c | 28 ++--
.../client/test-book-client-preserve-uid.c | 2 +-
tests/libebook/client/test-book-client-self.c | 2 +-
.../client/test-book-client-view-operations.c | 8 +-
tests/libebook/ebook-test-utils.c | 2 +-
tests/libebook/test-ebook-commit-contact.c | 8 +-
tests/libebook/test-ebook-get-book-view.c | 2 +-
tests/libebook/test-ebook-remove-contact.c | 2 +-
tests/libebook/test-ebook-remove-contacts.c | 4 +-
tests/libecal/test-cal-client-add-timezone.c | 4 +-
tests/libecal/test-cal-client-bulk-methods.c | 24 +--
.../libecal/test-cal-client-get-attachment-uris.c | 2 +-
tests/libecal/test-cal-client-get-free-busy.c | 8 +-
tests/libecal/test-cal-client-get-revision.c | 4 +-
tests/libecal/test-cal-client-modify-object.c | 4 +-
tests/libecal/test-cal-client-remove-object.c | 6 +-
tests/libecal/test-cal-client-revision-view.c | 4 +-
tests/libecal/test-cal-component.c | 130 ++++++++--------
tests/libecal/test-cal-recur.c | 20 +--
tests/libecal/test-cal-reminders.c | 2 +-
tests/libedata-book/data-test-utils.c | 8 +-
.../libedata-book/test-book-cache-create-cursor.c | 10 +-
.../test-book-cache-cursor-set-sexp.c | 6 +-
tests/libedata-book/test-book-cache-get-contact.c | 2 +-
tests/libedata-book/test-book-cache-offline.c | 170 ++++++++++-----------
tests/libedata-book/test-book-cache-utils.c | 6 +-
tests/libedata-book/test-book-meta-backend.c | 110 ++++++-------
tests/libedata-book/test-sqlite-create-cursor.c | 10 +-
tests/libedata-book/test-sqlite-cursor-set-sexp.c | 6 +-
tests/libedata-book/test-sqlite-get-contact.c | 2 +-
tests/libedata-cal/test-cal-cache-getters.c | 40 ++---
tests/libedata-cal/test-cal-cache-intervals.c | 22 +--
tests/libedata-cal/test-cal-cache-offline.c | 162 ++++++++++----------
tests/libedata-cal/test-cal-cache-search.c | 18 +--
tests/libedata-cal/test-cal-cache-utils.c | 4 +-
tests/libedata-cal/test-cal-meta-backend.c | 158 +++++++++----------
tests/libedata-cal/test-intervaltree.c | 16 +-
tests/libedataserver/e-user-prompter-test.c | 10 +-
tests/test-server-utils/e-test-server-utils.c | 22 +--
52 files changed, 628 insertions(+), 628 deletions(-)
---
diff --git a/src/addressbook/libebook-contacts/e-vcard.c b/src/addressbook/libebook-contacts/e-vcard.c
index d2898b13b..ee2f620be 100644
--- a/src/addressbook/libebook-contacts/e-vcard.c
+++ b/src/addressbook/libebook-contacts/e-vcard.c
@@ -60,7 +60,7 @@
* attr = e_vcard_get_attribute (vcard, "ADR");
*
* g_assert_cmpstr (e_vcard_attribute_get_name (attr), ==, "ADR");
- * g_assert (e_vcard_attribute_is_single_valued (attr) == FALSE);
+ * g_assert_true (e_vcard_attribute_is_single_valued (attr) == FALSE);
*
* param_values = e_vcard_attribute_get_param (attr, "TYPE");
* g_assert_cmpuint (g_list_length (param_values), ==, 1);
@@ -2799,9 +2799,9 @@ e_vcard_attribute_get_value_decoded (EVCardAttribute *attr)
* ]|
* the following holds true:
* |[
- * g_assert (e_vcard_attribute_has_type (attr, "WORK") == TRUE);
- * g_assert (e_vcard_attribute_has_type (attr, "voice") == TRUE);
- * g_assert (e_vcard_attribute_has_type (attr, "HOME") == FALSE);
+ * g_assert_true (e_vcard_attribute_has_type (attr, "WORK") == TRUE);
+ * g_assert_true (e_vcard_attribute_has_type (attr, "voice") == TRUE);
+ * g_assert_true (e_vcard_attribute_has_type (attr, "HOME") == FALSE);
* ]|
*
* Comparisons against @typestr are case-insensitive.
diff --git a/tests/book-migration/test-migration.c b/tests/book-migration/test-migration.c
index 20b0373e0..128b95df9 100644
--- a/tests/book-migration/test-migration.c
+++ b/tests/book-migration/test-migration.c
@@ -65,7 +65,7 @@ setup_migration_sandbox (const gchar *version)
src = g_build_filename (EDS_TEST_SQLITE_BOOKS, version, "contacts.db", NULL);
/* Create the directory for the database files */
- g_assert (g_mkdir_with_parents (dest_dir, 0755) == 0);
+ g_assert_true (g_mkdir_with_parents (dest_dir, 0755) == 0);
/* If there is a BDB for this version, copy it over */
if (g_file_test (src_bdb, G_FILE_TEST_IS_REGULAR)) {
diff --git a/tests/libebook-contacts/test-contact-types.c b/tests/libebook-contacts/test-contact-types.c
index 960addbb9..64afedcb8 100644
--- a/tests/libebook-contacts/test-contact-types.c
+++ b/tests/libebook-contacts/test-contact-types.c
@@ -46,7 +46,7 @@ test_undefined_field (TypesFixture *fixture,
gpointer test;
test = e_contact_get (fixture->contact, 6000 /* something suitably high. */);
- g_assert (test == NULL);
+ g_assert_true (test == NULL);
}
#endif
@@ -116,7 +116,7 @@ test_certificates (TypesFixture *fixture,
break;
}
- g_assert (ii == pgp_blob_length);
+ g_assert_true (ii == pgp_blob_length);
e_contact_cert_free (cert);
@@ -129,7 +129,7 @@ test_certificates (TypesFixture *fixture,
break;
}
- g_assert (ii == x509_blob_length);
+ g_assert_true (ii == x509_blob_length);
e_contact_cert_free (cert);
}
@@ -196,7 +196,7 @@ test_categories_initially_null_list (TypesFixture *fixture,
gpointer test;
test = e_contact_get (fixture->contact, E_CONTACT_CATEGORY_LIST);
- g_assert (test == NULL);
+ g_assert_true (test == NULL);
}
static void
diff --git a/tests/libebook-contacts/test-phone-number.c b/tests/libebook-contacts/test-phone-number.c
index 3b235d285..8245673da 100644
--- a/tests/libebook-contacts/test-phone-number.c
+++ b/tests/libebook-contacts/test-phone-number.c
@@ -204,12 +204,12 @@ test_parse_and_format (gconstpointer data)
g_assert_cmpstr (national, ==, test_data->national_number);
g_free (national);
- g_assert (parsed != NULL);
- g_assert (error == NULL);
+ g_assert_true (parsed != NULL);
+ g_assert_true (error == NULL);
for (i = 0; i < G_N_ELEMENTS (test_data->formatted_numbers); ++i) {
gchar *formatted = e_phone_number_to_string (parsed, i);
- g_assert (formatted != NULL);
+ g_assert_true (formatted != NULL);
g_assert_cmpstr (formatted, ==, test_data->formatted_numbers[i]);
g_free (formatted);
}
@@ -219,11 +219,11 @@ test_parse_and_format (gconstpointer data)
#else /* ENABLE_PHONENUMBER */
- g_assert (parsed == NULL);
- g_assert (error != NULL);
- g_assert (error->domain == E_PHONE_NUMBER_ERROR);
- g_assert (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
- g_assert (error->message != NULL);
+ g_assert_true (parsed == NULL);
+ g_assert_true (error != NULL);
+ g_assert_true (error->domain == E_PHONE_NUMBER_ERROR);
+ g_assert_true (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
+ g_assert_true (error->message != NULL);
#endif /* ENABLE_PHONENUMBER */
@@ -238,15 +238,15 @@ test_parse_bad_number (void)
parsed = e_phone_number_from_string ("+1-NOT-A-NUMBER", "US", &error);
- g_assert (parsed == NULL);
- g_assert (error != NULL);
- g_assert (error->domain == E_PHONE_NUMBER_ERROR);
+ g_assert_true (parsed == NULL);
+ g_assert_true (error != NULL);
+ g_assert_true (error->domain == E_PHONE_NUMBER_ERROR);
#ifdef ENABLE_PHONENUMBER
- g_assert (error->code == E_PHONE_NUMBER_ERROR_NOT_A_NUMBER);
+ g_assert_true (error->code == E_PHONE_NUMBER_ERROR_NOT_A_NUMBER);
#else /* ENABLE_PHONENUMBER */
- g_assert (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
+ g_assert_true (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
#endif /* ENABLE_PHONENUMBER */
- g_assert (error->message != NULL);
+ g_assert_true (error->message != NULL);
g_clear_error (&error);
}
@@ -266,8 +266,8 @@ test_parse_auto_region (void)
gchar *national;
gchar *formatted;
- g_assert (parsed != NULL);
- g_assert (error == NULL);
+ g_assert_true (parsed != NULL);
+ g_assert_true (error == NULL);
g_assert_cmpint (e_phone_number_get_country_code (parsed, &source), ==, 1);
g_assert_cmpuint (source, ==, E_PHONE_NUMBER_COUNTRY_FROM_DEFAULT);
@@ -285,11 +285,11 @@ test_parse_auto_region (void)
#else /* ENABLE_PHONENUMBER */
- g_assert (parsed == NULL);
- g_assert (error != NULL);
- g_assert (error->domain == E_PHONE_NUMBER_ERROR);
- g_assert (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
- g_assert (error->message != NULL);
+ g_assert_true (parsed == NULL);
+ g_assert_true (error != NULL);
+ g_assert_true (error->domain == E_PHONE_NUMBER_ERROR);
+ g_assert_true (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
+ g_assert_true (error->message != NULL);
g_clear_error (&error);
#endif /* ENABLE_PHONENUMBER */
@@ -323,16 +323,16 @@ test_compare_numbers (gconstpointer data)
#endif /* ENABLE_PHONENUMBER */
if (!error_expected) {
- g_assert (error == NULL);
+ g_assert_true (error == NULL);
} else {
- g_assert (error != NULL);
- g_assert (error->domain == E_PHONE_NUMBER_ERROR);
+ g_assert_true (error != NULL);
+ g_assert_true (error->domain == E_PHONE_NUMBER_ERROR);
#ifdef ENABLE_PHONENUMBER
- g_assert (error->code == E_PHONE_NUMBER_ERROR_NOT_A_NUMBER);
+ g_assert_true (error->code == E_PHONE_NUMBER_ERROR_NOT_A_NUMBER);
#else /* ENABLE_PHONENUMBER */
- g_assert (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
+ g_assert_true (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
#endif /* ENABLE_PHONENUMBER */
- g_assert (error->message != NULL);
+ g_assert_true (error->message != NULL);
g_clear_error (&error);
}
@@ -342,9 +342,9 @@ static void
test_supported (void)
{
#ifdef ENABLE_PHONENUMBER
- g_assert (e_phone_number_is_supported ());
+ g_assert_true (e_phone_number_is_supported ());
#else /* ENABLE_PHONENUMBER */
- g_assert (!e_phone_number_is_supported ());
+ g_assert_true (!e_phone_number_is_supported ());
#endif /* ENABLE_PHONENUMBER */
}
@@ -378,10 +378,10 @@ test_country_code_for_region (void)
code = e_phone_number_get_country_code_for_region ("CH", &error);
- g_assert (error != NULL);
- g_assert (error->domain == E_PHONE_NUMBER_ERROR);
- g_assert (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
- g_assert (error->message != NULL);
+ g_assert_true (error != NULL);
+ g_assert_true (error->domain == E_PHONE_NUMBER_ERROR);
+ g_assert_true (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
+ g_assert_true (error->message != NULL);
g_assert_cmpint (code, ==, 0);
#endif /* ENABLE_PHONENUMBER */
@@ -403,10 +403,10 @@ test_default_region (void)
#else /* ENABLE_PHONENUMBER */
- g_assert (error != NULL);
- g_assert (error->domain == E_PHONE_NUMBER_ERROR);
- g_assert (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
- g_assert (error->message != NULL);
+ g_assert_true (error != NULL);
+ g_assert_true (error->domain == E_PHONE_NUMBER_ERROR);
+ g_assert_true (error->code == E_PHONE_NUMBER_ERROR_NOT_IMPLEMENTED);
+ g_assert_true (error->message != NULL);
g_assert_cmpstr (country, ==, NULL);
#endif /* ENABLE_PHONENUMBER */
diff --git a/tests/libebook-contacts/test-query.c b/tests/libebook-contacts/test-query.c
index d76f25eb1..0127b1ed0 100644
--- a/tests/libebook-contacts/test-query.c
+++ b/tests/libebook-contacts/test-query.c
@@ -66,7 +66,7 @@ test_query (gconstpointer data)
EBookQuery *query;
gchar *sexp;
- g_assert (setlocale (CATEGORY, test->locale) != NULL);
+ g_assert_true (setlocale (CATEGORY, test->locale) != NULL);
sexp = e_book_query_to_string (test->query);
normalize_space (sexp);
@@ -74,7 +74,7 @@ test_query (gconstpointer data)
g_free (sexp);
query = e_book_query_from_string (test->sexp);
- g_assert (query != NULL);
+ g_assert_true (query != NULL);
sexp = e_book_query_to_string (query);
e_book_query_unref (query);
diff --git a/tests/libebook-contacts/test-untyped-phones.c b/tests/libebook-contacts/test-untyped-phones.c
index ba8194012..f5d2b8ac3 100644
--- a/tests/libebook-contacts/test-untyped-phones.c
+++ b/tests/libebook-contacts/test-untyped-phones.c
@@ -38,7 +38,7 @@ test_business (void)
contact = e_contact_new_from_vcard (VCARD);
phone = e_contact_get_const (contact, E_CONTACT_PHONE_BUSINESS);
- g_assert (phone != NULL);
+ g_assert_true (phone != NULL);
g_assert_cmpstr (phone, ==, "123-123-1234");
g_object_unref (contact);
@@ -53,7 +53,7 @@ test_other_phone (void)
contact = e_contact_new_from_vcard (VCARD);
phone = e_contact_get_const (contact, E_CONTACT_PHONE_OTHER);
- g_assert (phone != NULL);
+ g_assert_true (phone != NULL);
g_assert_cmpstr (phone, ==, "456-456-4567");
g_object_unref (contact);
@@ -68,7 +68,7 @@ test_other_fax (void)
contact = e_contact_new_from_vcard (VCARD);
phone = e_contact_get_const (contact, E_CONTACT_PHONE_OTHER_FAX);
- g_assert (phone != NULL);
+ g_assert_true (phone != NULL);
g_assert_cmpstr (phone, ==, "321-321-4321");
g_object_unref (contact);
diff --git a/tests/libebook-contacts/test-vcard-parsing.c b/tests/libebook-contacts/test-vcard-parsing.c
index 08d7b6559..f2ab8a52a 100644
--- a/tests/libebook-contacts/test-vcard-parsing.c
+++ b/tests/libebook-contacts/test-vcard-parsing.c
@@ -387,9 +387,9 @@ test_vcard_quoted_printable (void)
"67890=201234567890=201234567890=201234567890\r\n"
"END:VCARD\r\n";
- g_assert (test_vcard_qp_2_1_parsing (vcard_2_1_str, expected_text));
- g_assert (test_vcard_qp_2_1_saving (expected_text));
- g_assert (test_vcard_qp_3_0_saving (expected_text));
+ g_assert_true (test_vcard_qp_2_1_parsing (vcard_2_1_str, expected_text));
+ g_assert_true (test_vcard_qp_2_1_saving (expected_text));
+ g_assert_true (test_vcard_qp_3_0_saving (expected_text));
}
static const gchar *test_vcard_no_uid_str =
@@ -412,25 +412,25 @@ static const gchar *test_vcard_with_uid_str =
static void
test_vcard_with_uid (void)
{
- g_assert (test_vcard (test_vcard_with_uid_str));
+ g_assert_true (test_vcard (test_vcard_with_uid_str));
}
static void
test_vcard_without_uid (void)
{
- g_assert (test_vcard (test_vcard_no_uid_str));
+ g_assert_true (test_vcard (test_vcard_no_uid_str));
}
static void
test_contact_with_uid (void)
{
- g_assert (test_econtact (test_vcard_with_uid_str));
+ g_assert_true (test_econtact (test_vcard_with_uid_str));
}
static void
test_contact_without_uid (void)
{
- g_assert (test_econtact (test_vcard_no_uid_str));
+ g_assert_true (test_econtact (test_vcard_no_uid_str));
}
static void
@@ -442,30 +442,30 @@ test_phone_params_and_value (EContact *contact,
GList *attributes, *params, *link;
EVCardAttribute *attr = NULL;
- g_assert (E_IS_CONTACT (contact));
- g_assert (expected_value != NULL);
- g_assert (expected_value_type != NULL);
+ g_assert_true (E_IS_CONTACT (contact));
+ g_assert_true (expected_value != NULL);
+ g_assert_true (expected_value_type != NULL);
g_assert_nonnull (e_contact_get_const (contact, field_id));
g_assert_cmpstr (e_contact_get_const (contact, field_id), ==, expected_value);
attributes = e_contact_get_attributes (contact, field_id);
- g_assert (attributes != NULL);
- g_assert (attributes->next != NULL);
- g_assert (attributes->next->next != NULL);
- g_assert (attributes->next->next->next == NULL);
+ g_assert_true (attributes != NULL);
+ g_assert_true (attributes->next != NULL);
+ g_assert_true (attributes->next->next != NULL);
+ g_assert_true (attributes->next->next->next == NULL);
for (link = attributes; link; link = g_list_next (link)) {
gchar *value;
attr = link->data;
- g_assert (attr != NULL);
+ g_assert_true (attr != NULL);
value = e_vcard_attribute_get_value (attr);
- g_assert (value != NULL);
+ g_assert_true (value != NULL);
if (g_strcmp0 (value, expected_value) == 0) {
g_free (value);
@@ -476,25 +476,25 @@ test_phone_params_and_value (EContact *contact,
attr = NULL;
}
- g_assert (attr != NULL);
+ g_assert_true (attr != NULL);
- g_assert (e_vcard_attribute_get_name (attr) != NULL);
+ g_assert_true (e_vcard_attribute_get_name (attr) != NULL);
params = e_vcard_attribute_get_params (attr);
- g_assert (params != NULL);
- g_assert (params->next != NULL);
- g_assert (params->next->next == NULL);
+ g_assert_true (params != NULL);
+ g_assert_true (params->next != NULL);
+ g_assert_true (params->next->next == NULL);
for (link = params; link; link = g_list_next (link)) {
EVCardAttributeParam *param = link->data;
const gchar *name;
- g_assert (param != NULL);
+ g_assert_true (param != NULL);
name = e_vcard_attribute_param_get_name (param);
- g_assert (name != NULL);
- g_assert (g_ascii_strcasecmp (name, EVC_TYPE) == 0 ||
+ g_assert_true (name != NULL);
+ g_assert_true (g_ascii_strcasecmp (name, EVC_TYPE) == 0 ||
g_ascii_strcasecmp (name, EVC_X_E164) == 0);
if (g_ascii_strcasecmp (name, EVC_X_E164) == 0) {
@@ -503,12 +503,12 @@ test_phone_params_and_value (EContact *contact,
values = e_vcard_attribute_param_get_values (param);
- g_assert (values != NULL);
- g_assert (values->next == NULL || values->next->next == NULL);
+ g_assert_true (values != NULL);
+ g_assert_true (values->next == NULL || values->next->next == NULL);
value = values->data;
- g_assert (value != NULL);
+ g_assert_true (value != NULL);
g_assert_cmpstr (value, ==, expected_value);
if (values->next) {
@@ -523,15 +523,15 @@ test_phone_params_and_value (EContact *contact,
values = e_vcard_attribute_param_get_values (param);
- g_assert (values != NULL);
- g_assert (values->next != NULL);
- g_assert (values->next->next == NULL);
+ g_assert_true (values != NULL);
+ g_assert_true (values->next != NULL);
+ g_assert_true (values->next->next == NULL);
value1 = values->data;
value2 = values->next->data;
- g_assert (value1 != NULL);
- g_assert (value2 != NULL);
+ g_assert_true (value1 != NULL);
+ g_assert_true (value2 != NULL);
g_assert_cmpstr (value1, ==, expected_value_type);
g_assert_cmpstr (value2, ==, "VOICE");
}
@@ -558,7 +558,7 @@ test_contact_empty_value (void)
"TEL;X-EVOLUTION-E164=002233445566;TYPE=HOME,VOICE:002233445566\r\n"
"END:VCARD\r\n");
- g_assert (E_IS_CONTACT (contact));
+ g_assert_true (E_IS_CONTACT (contact));
test_phone_params_and_value (contact, E_CONTACT_PHONE_BUSINESS, "00123456789", "WORK");
test_phone_params_and_value (contact, E_CONTACT_PHONE_BUSINESS_2, "11123456789", "WORK");
diff --git a/tests/libebook/client/client-test-utils.c b/tests/libebook/client/client-test-utils.c
index 975c6fcbc..9c17b3bf1 100644
--- a/tests/libebook/client/client-test-utils.c
+++ b/tests/libebook/client/client-test-utils.c
@@ -147,7 +147,7 @@ add_contact_from_test_case_verify (EBookClient *book_client,
g_error ("get contact sync: %s", error->message);
/* verify the contact was added "successfully" (not thorough) */
- g_assert (contacts_are_equal_shallow (contact_orig, contact_final));
+ g_assert_true (contacts_are_equal_shallow (contact_orig, contact_final));
if (contact)
*contact = contact_final;
@@ -176,7 +176,7 @@ add_contact_verify (EBookClient *book_client,
g_error ("get contact sync: %s", error->message);
/* verify the contact was added "successfully" (not thorough) */
- g_assert (contacts_are_equal_shallow (contact, contact_final));
+ g_assert_true (contacts_are_equal_shallow (contact, contact_final));
g_object_unref (contact_final);
g_free (uid);
diff --git a/tests/libebook/client/test-book-client-cursor-operations.c
b/tests/libebook/client/test-book-client-cursor-operations.c
index 63845f060..f73ecf049 100644
--- a/tests/libebook/client/test-book-client-cursor-operations.c
+++ b/tests/libebook/client/test-book-client-cursor-operations.c
@@ -248,7 +248,7 @@ timeout_start (GMainContext *context,
GSource **source,
const gchar *error_message)
{
- g_assert (source && *source == NULL);
+ g_assert_true (source && *source == NULL);
if (!context)
context = g_main_context_default ();
@@ -264,7 +264,7 @@ timeout_start (GMainContext *context,
static void
timeout_cancel (GSource **source)
{
- g_assert (source && *source != NULL);
+ g_assert_true (source && *source != NULL);
g_source_destroy (*source);
g_source_unref (*source);
@@ -963,8 +963,8 @@ cursor_closure_step (CursorClosure *closure,
va_list args;
gint i;
- g_assert (expected <= N_SORTED_CONTACTS);
- g_assert (ABS (count) <= N_SORTED_CONTACTS);
+ g_assert_true (expected <= N_SORTED_CONTACTS);
+ g_assert_true (ABS (count) <= N_SORTED_CONTACTS);
test->type = CURSOR_TEST_STEP;
test->flags = flags;
@@ -1006,7 +1006,7 @@ cursor_closure_set_sexp (CursorClosure *closure,
{
CursorTestSetSexp *test = g_slice_new0 (CursorTestSetSexp);
- g_assert (query != NULL);
+ g_assert_true (query != NULL);
test->type = CURSOR_TEST_SET_SEXP;
test->sexp = e_book_query_to_string (query);
diff --git a/tests/libebook/client/test-book-client-e164-param.c
b/tests/libebook/client/test-book-client-e164-param.c
index c48a2cfae..52775cbda 100644
--- a/tests/libebook/client/test-book-client-e164-param.c
+++ b/tests/libebook/client/test-book-client-e164-param.c
@@ -92,11 +92,11 @@ test_add_e164_param (ETestServerFixture *fixture,
tel = e_vcard_get_attribute (E_VCARD (contact), EVC_TEL);
values = tel ? e_vcard_attribute_get_values (tel) : NULL;
- g_assert (values != NULL);
+ g_assert_true (values != NULL);
g_assert_cmpstr (values->data, ==, data->formatted_number);
values = e_vcard_attribute_get_param (tel, EVC_X_E164);
- g_assert (values == NULL);
+ g_assert_true (values == NULL);
if (!e_book_client_add_contact_sync (book_client, contact, E_BOOK_OPERATION_FLAG_NONE, &uid, NULL,
&error))
g_error ("Failed to add contact: %s", error->message);
@@ -111,19 +111,19 @@ test_add_e164_param (ETestServerFixture *fixture,
tel = e_vcard_get_attribute (E_VCARD (contact), EVC_TEL);
values = tel ? e_vcard_attribute_get_values (tel) : NULL;
- g_assert (values != NULL);
+ g_assert_true (values != NULL);
g_assert_cmpstr (values->data, ==, data->formatted_number);
values = e_vcard_attribute_get_param (tel, EVC_X_E164);
- g_assert (values != NULL);
+ g_assert_true (values != NULL);
g_assert_cmpstr (values->data, ==, data->national_number);
if (data->country_calling_code) {
- g_assert (values->next != NULL);
+ g_assert_true (values->next != NULL);
g_assert_cmpstr (values->next->data, ==, data->country_calling_code);
} else {
- g_assert (values->next == NULL);
+ g_assert_true (values->next == NULL);
}
}
diff --git a/tests/libebook/client/test-book-client-get-contact.c
b/tests/libebook/client/test-book-client-get-contact.c
index ff23b55e5..4a028b035 100644
--- a/tests/libebook/client/test-book-client-get-contact.c
+++ b/tests/libebook/client/test-book-client-get-contact.c
@@ -38,7 +38,7 @@ test_get_contact_sync (ETestServerFixture *fixture,
g_error ("Failed to get contact");
}
- g_assert (contact != NULL);
+ g_assert_true (contact != NULL);
g_object_unref (contact);
}
diff --git a/tests/libebook/client/test-book-client-get-revision.c
b/tests/libebook/client/test-book-client-get-revision.c
index bf837e273..35b7252d6 100644
--- a/tests/libebook/client/test-book-client-get-revision.c
+++ b/tests/libebook/client/test-book-client-get-revision.c
@@ -61,8 +61,8 @@ get_revision_compare_cycle (EBookClient *client)
g_error ("Error getting book revision: %s", error->message);
}
- g_assert (revision_before);
- g_assert (revision_after);
+ g_assert_true (revision_before);
+ g_assert_true (revision_after);
g_assert_cmpstr (revision_before, !=, revision_after);
g_message (
diff --git a/tests/libebook/client/test-book-client-modify-contact.c
b/tests/libebook/client/test-book-client-modify-contact.c
index 2759c3347..5b80d01c3 100644
--- a/tests/libebook/client/test-book-client-modify-contact.c
+++ b/tests/libebook/client/test-book-client-modify-contact.c
@@ -31,7 +31,7 @@ verify_premodify_and_prepare_contact (EContact *contact)
EVCardAttribute *attr;
/* ensure there is no email address to begin with, then add one */
- g_assert (!e_vcard_get_attribute (E_VCARD (contact), EVC_EMAIL));
+ g_assert_true (!e_vcard_get_attribute (E_VCARD (contact), EVC_EMAIL));
attr = e_vcard_attribute_new (NULL, EVC_EMAIL);
e_vcard_add_attribute_with_value (E_VCARD (contact), attr, EMAIL_ADD);
}
@@ -43,10 +43,10 @@ verify_modify (EContact *contact)
gchar *email_value;
attr = e_vcard_get_attribute (E_VCARD (contact), EVC_EMAIL);
- g_assert (attr != NULL);
- g_assert (e_vcard_attribute_is_single_valued (attr));
+ g_assert_true (attr != NULL);
+ g_assert_true (e_vcard_attribute_is_single_valued (attr));
email_value = e_vcard_attribute_get_value (attr);
- g_assert (!g_strcmp0 (email_value, EMAIL_ADD));
+ g_assert_true (!g_strcmp0 (email_value, EMAIL_ADD));
g_free (email_value);
}
diff --git a/tests/libebook/client/test-book-client-photo-is-uri.c
b/tests/libebook/client/test-book-client-photo-is-uri.c
index d32f825b5..02ceb319e 100644
--- a/tests/libebook/client/test-book-client-photo-is-uri.c
+++ b/tests/libebook/client/test-book-client-photo-is-uri.c
@@ -62,8 +62,8 @@ print_contact (EContact *contact)
{
EContactPhoto *photo = e_contact_get (contact, E_CONTACT_PHOTO);
- g_assert (photo != NULL);
- g_assert (photo->type == E_CONTACT_PHOTO_TYPE_URI);
+ g_assert_true (photo != NULL);
+ g_assert_true (photo->type == E_CONTACT_PHOTO_TYPE_URI);
g_print ("Test passed with photo uri: %s\n", photo->data.uri);
e_contact_photo_free (photo);
@@ -121,12 +121,12 @@ give_james_brown_micheal_jacksons_face (EBookClient *book)
if (!e_book_client_get_contact_sync (book, james_brown_uid, &james, NULL, &error))
g_error ("Unable to get james brown's contact information: %s", error->message);
- g_assert (micheal);
- g_assert (james);
+ g_assert_true (micheal);
+ g_assert_true (james);
micheal_face = e_contact_get (micheal, E_CONTACT_PHOTO);
g_assert_nonnull (micheal_face);
- g_assert (micheal_face->type == E_CONTACT_PHOTO_TYPE_URI);
+ g_assert_true (micheal_face->type == E_CONTACT_PHOTO_TYPE_URI);
james_face = e_contact_photo_new ();
james_face->type = E_CONTACT_PHOTO_TYPE_URI;
@@ -159,7 +159,7 @@ update_contact_inline (EBookClient *book,
if (!e_book_client_get_contact_sync (book, uid, &contact, NULL, &error))
g_error ("Unable to get contact: %s", error->message);
- g_assert (contact);
+ g_assert_true (contact);
data = g_base64_decode (photo_data, &length);
@@ -196,27 +196,27 @@ assert_uri_exists (EBookClient *book,
if (!e_book_client_get_contact_sync (book, uid, &contact, NULL, &error))
g_error ("Unable to get contact: %s", error->message);
- g_assert (contact);
+ g_assert_true (contact);
photo = e_contact_get (contact, E_CONTACT_PHOTO);
- g_assert (photo);
- g_assert (photo->type == E_CONTACT_PHOTO_TYPE_URI);
+ g_assert_true (photo);
+ g_assert_true (photo->type == E_CONTACT_PHOTO_TYPE_URI);
filename = g_filename_from_uri (photo->data.uri, NULL, NULL);
- g_assert (filename);
+ g_assert_true (filename);
/* The file should absolutely exist at this point */
- g_assert (g_file_test (filename, G_FILE_TEST_EXISTS));
+ g_assert_true (g_file_test (filename, G_FILE_TEST_EXISTS));
e_contact_photo_free (photo);
success = e_contact_inline_local_photos (contact, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
photo = e_contact_get (contact, E_CONTACT_PHOTO);
- g_assert (photo);
- g_assert (photo->type == E_CONTACT_PHOTO_TYPE_INLINED);
+ g_assert_true (photo);
+ g_assert_true (photo->type == E_CONTACT_PHOTO_TYPE_INLINED);
g_assert_cmpstr (e_contact_photo_get_mime_type (photo), ==, "image/png");
e_contact_photo_free (photo);
diff --git a/tests/libebook/client/test-book-client-preserve-uid.c
b/tests/libebook/client/test-book-client-preserve-uid.c
index dd7360a51..1b2b9685e 100644
--- a/tests/libebook/client/test-book-client-preserve-uid.c
+++ b/tests/libebook/client/test-book-client-preserve-uid.c
@@ -74,7 +74,7 @@ test_uid_conflict (ETestServerFixture *fixture,
e_contact_set (contact, E_CONTACT_UID, TEST_CONTACT_UID);
if (!e_book_client_add_contact_sync (book_client, contact, E_BOOK_OPERATION_FLAG_NONE, NULL, NULL,
&error)) {
- g_assert (g_error_matches (error, E_BOOK_CLIENT_ERROR,
E_BOOK_CLIENT_ERROR_CONTACT_ID_ALREADY_EXISTS));
+ g_assert_true (g_error_matches (error, E_BOOK_CLIENT_ERROR,
E_BOOK_CLIENT_ERROR_CONTACT_ID_ALREADY_EXISTS));
g_error_free (error);
} else
g_error ("Succeeded in adding two contacts with the same UID !");
diff --git a/tests/libebook/client/test-book-client-self.c b/tests/libebook/client/test-book-client-self.c
index 75e69232e..e31c7ec1d 100644
--- a/tests/libebook/client/test-book-client-self.c
+++ b/tests/libebook/client/test-book-client-self.c
@@ -70,7 +70,7 @@ test_set_self (ETestServerFixture *fixture,
}
/* Add contact to addressbook */
- g_assert (add_contact_from_test_case_verify (client, "simple-1", &loaded_contact));
+ g_assert_true (add_contact_from_test_case_verify (client, "simple-1", &loaded_contact));
/* Set contact as self */
if (!e_book_client_set_self (client, loaded_contact, &error))
diff --git a/tests/libebook/client/test-book-client-view-operations.c
b/tests/libebook/client/test-book-client-view-operations.c
index a9a5453bc..05b41dc8e 100644
--- a/tests/libebook/client/test-book-client-view-operations.c
+++ b/tests/libebook/client/test-book-client-view-operations.c
@@ -53,7 +53,7 @@ objects_added (EBookClientView *view,
{
const GSList *l;
- g_assert (g_thread_self () == data->thread);
+ g_assert_true (g_thread_self () == data->thread);
for (l = contacts; l; l = l->next) {
/* print_email (l->data); */
@@ -69,7 +69,7 @@ objects_modified (EBookClientView *view,
{
const GSList *l;
- g_assert (g_thread_self () == data->thread);
+ g_assert_true (g_thread_self () == data->thread);
for (l = contacts; l; l = l->next) {
/* print_email (l->data); */
@@ -83,7 +83,7 @@ objects_removed (EBookClientView *view,
{
const GSList *l;
- g_assert (g_thread_self () == data->thread);
+ g_assert_true (g_thread_self () == data->thread);
for (l = ids; l; l = l->next) {
/* printf (" Removed contact: %s\n", (gchar *) l->data); */
@@ -97,7 +97,7 @@ complete (EBookClientView *view,
const GError *error,
ThreadData *data)
{
- g_assert (g_thread_self () == data->thread);
+ g_assert_true (g_thread_self () == data->thread);
g_mutex_lock (&data->complete_mutex);
data->complete = TRUE;
diff --git a/tests/libebook/ebook-test-utils.c b/tests/libebook/ebook-test-utils.c
index 4078307c6..36777989d 100644
--- a/tests/libebook/ebook-test-utils.c
+++ b/tests/libebook/ebook-test-utils.c
@@ -125,7 +125,7 @@ ebook_test_utils_book_add_contact_from_test_case_verify (EBook *book,
contact_final = ebook_test_utils_book_get_contact (book, uid);
/* verify the contact was added "successfully" (not thorough) */
- g_assert (ebook_test_utils_contacts_are_equal_shallow (contact_orig, contact_final));
+ g_assert_true (ebook_test_utils_contacts_are_equal_shallow (contact_orig, contact_final));
if (contact)
*contact = g_object_ref (contact_final);
diff --git a/tests/libebook/test-ebook-commit-contact.c b/tests/libebook/test-ebook-commit-contact.c
index ed91f3f47..2d9caf04c 100644
--- a/tests/libebook/test-ebook-commit-contact.c
+++ b/tests/libebook/test-ebook-commit-contact.c
@@ -35,7 +35,7 @@ verify_precommit_and_prepare_contact (EContact *contact)
EVCardAttribute *attr;
/* ensure there is no email address to begin with, then add one */
- g_assert (!e_vcard_get_attribute (E_VCARD (contact), EVC_EMAIL));
+ g_assert_true (!e_vcard_get_attribute (E_VCARD (contact), EVC_EMAIL));
attr = e_vcard_attribute_new (NULL, EVC_EMAIL);
e_vcard_add_attribute_with_value (E_VCARD (contact), attr, EMAIL_ADD);
}
@@ -47,10 +47,10 @@ verify_commit (EContact *contact)
gchar *email_value;
attr = e_vcard_get_attribute (E_VCARD (contact), EVC_EMAIL);
- g_assert (attr != NULL);
- g_assert (e_vcard_attribute_is_single_valued (attr));
+ g_assert_true (attr != NULL);
+ g_assert_true (e_vcard_attribute_is_single_valued (attr));
email_value = e_vcard_attribute_get_value (attr);
- g_assert (!g_strcmp0 (email_value, EMAIL_ADD));
+ g_assert_true (!g_strcmp0 (email_value, EMAIL_ADD));
}
static gboolean
diff --git a/tests/libebook/test-ebook-get-book-view.c b/tests/libebook/test-ebook-get-book-view.c
index 91b406878..b61d2fd03 100644
--- a/tests/libebook/test-ebook-get-book-view.c
+++ b/tests/libebook/test-ebook-get-book-view.c
@@ -90,7 +90,7 @@ static void
get_book_view_cb (EBookTestClosure *closure)
{
GMainLoop *loop = closure->user_data;
- g_assert (closure->view);
+ g_assert_true (closure->view);
setup_and_start_view (closure->view, loop);
}
diff --git a/tests/libebook/test-ebook-remove-contact.c b/tests/libebook/test-ebook-remove-contact.c
index f5acb113e..40a89d8f4 100644
--- a/tests/libebook/test-ebook-remove-contact.c
+++ b/tests/libebook/test-ebook-remove-contact.c
@@ -36,7 +36,7 @@ test_remove_contact_sync (ETestServerFixture *fixture,
ebook_test_utils_book_remove_contact (book, uid);
e_book_get_contact (book, uid, &contact_final, NULL);
- g_assert (contact_final == NULL);
+ g_assert_true (contact_final == NULL);
test_print ("successfully added and removed contact '%s'\n", uid);
g_free (uid);
diff --git a/tests/libebook/test-ebook-remove-contacts.c b/tests/libebook/test-ebook-remove-contacts.c
index dd5ddb888..6f2601958 100644
--- a/tests/libebook/test-ebook-remove-contacts.c
+++ b/tests/libebook/test-ebook-remove-contacts.c
@@ -41,10 +41,10 @@ test_remove_contacts_sync (ETestServerFixture *fixture,
contact_final = NULL;
e_book_get_contact (book, uid_1, &contact_final, NULL);
- g_assert (contact_final == NULL);
+ g_assert_true (contact_final == NULL);
e_book_get_contact (book, uid_2, &contact_final, NULL);
- g_assert (contact_final == NULL);
+ g_assert_true (contact_final == NULL);
test_print ("successfully added and removed contacts\n");
diff --git a/tests/libecal/test-cal-client-add-timezone.c b/tests/libecal/test-cal-client-add-timezone.c
index 771738228..2c4542a8e 100644
--- a/tests/libecal/test-cal-client-add-timezone.c
+++ b/tests/libecal/test-cal-client-add-timezone.c
@@ -45,7 +45,7 @@ test_add_timezone_sync (ETestServerFixture *fixture,
property = i_cal_property_new_tzname (TZNAME_NEW);
i_cal_component_take_property (component, property);
zone = i_cal_timezone_new ();
- g_assert (i_cal_timezone_set_component (zone, component));
+ g_assert_true (i_cal_timezone_set_component (zone, component));
g_object_unref (component);
cal_client = E_TEST_SERVER_UTILS_SERVICE (fixture, ECalClient);
@@ -128,7 +128,7 @@ test_add_timezone_async (ETestServerFixture *fixture,
property = i_cal_property_new_tzname (TZNAME_NEW);
i_cal_component_take_property (component, property);
zone = i_cal_timezone_new ();
- g_assert (i_cal_timezone_set_component (zone, component));
+ g_assert_true (i_cal_timezone_set_component (zone, component));
g_object_unref (component);
cal_client = E_TEST_SERVER_UTILS_SERVICE (fixture, ECalClient);
diff --git a/tests/libecal/test-cal-client-bulk-methods.c b/tests/libecal/test-cal-client-bulk-methods.c
index 908f27d37..529933479 100644
--- a/tests/libecal/test-cal-client-bulk-methods.c
+++ b/tests/libecal/test-cal-client-bulk-methods.c
@@ -77,8 +77,8 @@ static void
check_removed (ECalClient *cal_client,
const GSList *uids)
{
- g_assert (cal_client != NULL);
- g_assert (uids != NULL);
+ g_assert_true (cal_client != NULL);
+ g_assert_true (uids != NULL);
while (uids) {
GError *error = NULL;
@@ -151,7 +151,7 @@ test_bulk_methods_sync (ECalClient *cal_client,
if (!e_cal_client_create_objects_sync (cal_client, icomps, E_CAL_OPERATION_FLAG_NONE, &uids, NULL,
&error))
g_error ("create objects sync: %s", error->message);
- g_assert (uids != NULL);
+ g_assert_true (uids != NULL);
g_assert_cmpint (g_slist_length (uids), ==, NB_COMPONENTS);
/* Update ICalComponents uids */
@@ -217,12 +217,12 @@ bulk_async_remove_objects_cb (GObject *source_object,
GError *error = NULL;
g_assert_nonnull (async_context);
- g_assert (E_IS_CAL_CLIENT (source_object));
- g_assert (async_context->cal_client == E_CAL_CLIENT (source_object));
+ g_assert_true (E_IS_CAL_CLIENT (source_object));
+ g_assert_true (async_context->cal_client == E_CAL_CLIENT (source_object));
success = e_cal_client_remove_objects_finish (async_context->cal_client, result, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
/* Check that the objects don't exist anymore */
check_removed (async_context->cal_client, async_context->uids);
@@ -240,12 +240,12 @@ bulk_async_modify_objects_cb (GObject *source_object,
GError *error = NULL;
g_assert_nonnull (async_context);
- g_assert (E_IS_CAL_CLIENT (source_object));
- g_assert (async_context->cal_client == E_CAL_CLIENT (source_object));
+ g_assert_true (E_IS_CAL_CLIENT (source_object));
+ g_assert_true (async_context->cal_client == E_CAL_CLIENT (source_object));
success = e_cal_client_modify_objects_finish (async_context->cal_client, result, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
/* Retrieve all the objects and check that they have been modified */
check_icomps_exist (async_context->cal_client, async_context->icomps);
@@ -269,12 +269,12 @@ bulk_async_create_objects_cb (GObject *source_object,
GError *error = NULL;
g_assert_nonnull (async_context);
- g_assert (E_IS_CAL_CLIENT (source_object));
- g_assert (async_context->cal_client == E_CAL_CLIENT (source_object));
+ g_assert_true (E_IS_CAL_CLIENT (source_object));
+ g_assert_true (async_context->cal_client == E_CAL_CLIENT (source_object));
success = e_cal_client_create_objects_finish (async_context->cal_client, result,
&async_context->uids, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (async_context->uids);
g_assert_cmpint (g_slist_length (async_context->uids), ==, NB_COMPONENTS);
diff --git a/tests/libecal/test-cal-client-get-attachment-uris.c
b/tests/libecal/test-cal-client-get-attachment-uris.c
index bc9e03e6b..4896515aa 100644
--- a/tests/libecal/test-cal-client-get-attachment-uris.c
+++ b/tests/libecal/test-cal-client-get-attachment-uris.c
@@ -87,7 +87,7 @@ manage_result (GSList *attachment_uris)
{
gboolean res;
- g_assert (attachment_uris != NULL);
+ g_assert_true (attachment_uris != NULL);
g_assert_cmpint (g_slist_length (attachment_uris), ==, 3);
res = g_slist_find_custom (attachment_uris, ATTACH1, g_str_equal)
diff --git a/tests/libecal/test-cal-client-get-free-busy.c b/tests/libecal/test-cal-client-get-free-busy.c
index 298d30a58..948c53139 100644
--- a/tests/libecal/test-cal-client-get-free-busy.c
+++ b/tests/libecal/test-cal-client-get-free-busy.c
@@ -175,8 +175,8 @@ test_get_free_busy_sync (ETestServerFixture *fixture,
wait_for_dbus_signal (fixture->loop);
- g_assert (received_free_busy_data);
- g_assert (freebusy_data);
+ g_assert_true (received_free_busy_data);
+ g_assert_true (freebusy_data);
g_slist_free_full (freebusy_data, g_object_unref);
}
@@ -198,8 +198,8 @@ async_get_free_busy_result_ready (GObject *source_object,
wait_for_dbus_signal (loop);
- g_assert (received_free_busy_data);
- g_assert (freebusy_data);
+ g_assert_true (received_free_busy_data);
+ g_assert_true (freebusy_data);
g_slist_free_full (freebusy_data, g_object_unref);
diff --git a/tests/libecal/test-cal-client-get-revision.c b/tests/libecal/test-cal-client-get-revision.c
index 9b38559f3..f82d2bf0f 100644
--- a/tests/libecal/test-cal-client-get-revision.c
+++ b/tests/libecal/test-cal-client-get-revision.c
@@ -73,8 +73,8 @@ get_revision_compare_cycle (ECalClient *client)
g_error ("Error getting calendar revision: %s", error->message);
}
- g_assert (revision_before);
- g_assert (revision_after);
+ g_assert_true (revision_before);
+ g_assert_true (revision_after);
g_assert_cmpstr (revision_before, !=, revision_after);
g_message (
diff --git a/tests/libecal/test-cal-client-modify-object.c b/tests/libecal/test-cal-client-modify-object.c
index 91c2a39a8..63b3bb397 100644
--- a/tests/libecal/test-cal-client-modify-object.c
+++ b/tests/libecal/test-cal-client-modify-object.c
@@ -73,7 +73,7 @@ test_modify_object_sync (ETestServerFixture *fixture,
setup_cal (cal_client);
uid = g_object_get_data (G_OBJECT (cal_client), "use-uid");
- g_assert (uid != NULL);
+ g_assert_true (uid != NULL);
if (!e_cal_client_get_object_sync (cal_client, uid, NULL, &icomp, NULL, &error))
g_error ("get object sync: %s", error->message);
@@ -131,7 +131,7 @@ test_modify_object_async (ETestServerFixture *fixture,
setup_cal (cal_client);
uid = g_object_get_data (G_OBJECT (cal_client), "use-uid");
- g_assert (uid != NULL);
+ g_assert_true (uid != NULL);
if (!e_cal_client_get_object_sync (cal_client, uid, NULL, &icomp, NULL, &error))
g_error ("get object sync: %s", error->message);
diff --git a/tests/libecal/test-cal-client-remove-object.c b/tests/libecal/test-cal-client-remove-object.c
index ac99e942b..c7ae433dc 100644
--- a/tests/libecal/test-cal-client-remove-object.c
+++ b/tests/libecal/test-cal-client-remove-object.c
@@ -65,7 +65,7 @@ test_remove_object_sync (ETestServerFixture *fixture,
cal_client = E_TEST_SERVER_UTILS_SERVICE (fixture, ECalClient);
uid = create_object (cal_client);
- g_assert (uid != NULL);
+ g_assert_true (uid != NULL);
if (!e_cal_client_remove_object_sync (cal_client, uid, NULL, E_CAL_OBJ_MOD_ALL,
E_CAL_OPERATION_FLAG_NONE, NULL, &error))
g_error ("remove object sync: %s", error->message);
@@ -100,7 +100,7 @@ test_remove_object_async (ETestServerFixture *fixture,
cal_client = E_TEST_SERVER_UTILS_SERVICE (fixture, ECalClient);
uid = create_object (cal_client);
- g_assert (uid != NULL);
+ g_assert_true (uid != NULL);
e_cal_client_remove_object (cal_client, uid, NULL, E_CAL_OBJ_MOD_ALL, E_CAL_OPERATION_FLAG_NONE,
NULL, async_remove_result_ready, fixture->loop);
g_free (uid);
@@ -123,7 +123,7 @@ test_remove_object_empty_uid (ETestServerFixture *fixture,
g_assert_error (
error, E_CAL_CLIENT_ERROR,
E_CAL_CLIENT_ERROR_OBJECT_NOT_FOUND);
- g_assert (!success);
+ g_assert_true (!success);
g_clear_error (&error);
}
diff --git a/tests/libecal/test-cal-client-revision-view.c b/tests/libecal/test-cal-client-revision-view.c
index 64c95c6ce..063f33226 100644
--- a/tests/libecal/test-cal-client-revision-view.c
+++ b/tests/libecal/test-cal-client-revision-view.c
@@ -102,7 +102,7 @@ objects_added_cb (GObject *object,
g_free (str_recurrence);
g_free (str_last_modified);
- g_assert (i_cal_component_get_summary (component) == NULL);
+ g_assert_true (i_cal_component_get_summary (component) == NULL);
}
subtest_passed (SUBTEST_OBJECTS_ADDED, loop);
@@ -136,7 +136,7 @@ objects_modified_cb (GObject *object,
g_free (str_recurrence);
g_free (str_last_modified);
- g_assert (i_cal_component_get_summary (component) == NULL);
+ g_assert_true (i_cal_component_get_summary (component) == NULL);
}
subtest_passed (SUBTEST_OBJECTS_MODIFIED, loop);
diff --git a/tests/libecal/test-cal-component.c b/tests/libecal/test-cal-component.c
index 124afb101..959a9dc0a 100644
--- a/tests/libecal/test-cal-component.c
+++ b/tests/libecal/test-cal-component.c
@@ -65,7 +65,7 @@ verify_ical_attach_list_equal (GSList *expected, /* ICalAttach * */
verify_ical_attach_equal (link1->data, link2->data);
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
}
static void
@@ -233,7 +233,7 @@ verify_struct_attendee_list_equal (GSList *expected, /* ECalComponentAttendee *
verify_struct_attendee_equal (link1->data, link2->data);
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
}
static void
@@ -267,7 +267,7 @@ verify_struct_id_equal (const ECalComponentId *expected,
g_assert_cmpstr (e_cal_component_id_get_uid (expected), ==, e_cal_component_id_get_uid (received));
g_assert_cmpstr (e_cal_component_id_get_rid (expected), ==, e_cal_component_id_get_rid (received));
g_assert_cmpint (e_cal_component_id_hash (expected), ==, e_cal_component_id_hash (received));
- g_assert (e_cal_component_id_equal (expected, received));
+ g_assert_true (e_cal_component_id_equal (expected, received));
}
static void
@@ -499,7 +499,7 @@ verify_struct_alarms_equal (const ECalComponentAlarms *expected,
verify_struct_alarm_instance_equal (link1->data, link2->data);
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
}
static void
@@ -790,8 +790,8 @@ test_component_struct_alarms (void)
verify_struct_alarms_equal (expected, received);
e_cal_component_alarms_free (received);
- g_assert (!e_cal_component_alarms_remove_instance (expected, GINT_TO_POINTER (123)));
- g_assert (e_cal_component_alarms_remove_instance (expected, instance));
+ g_assert_true (!e_cal_component_alarms_remove_instance (expected, GINT_TO_POINTER (123)));
+ g_assert_true (e_cal_component_alarms_remove_instance (expected, instance));
received = e_cal_component_alarms_copy (expected);
verify_struct_alarms_equal (expected, received);
@@ -1377,7 +1377,7 @@ test_component_struct_id (void)
received = e_cal_component_id_copy (expected);
verify_struct_id_equal (expected, received);
g_assert_cmpint (e_cal_component_id_hash (expected), ==, e_cal_component_id_hash
(received));
- g_assert (e_cal_component_id_equal (expected, received));
+ g_assert_true (e_cal_component_id_equal (expected, received));
e_cal_component_id_free (received);
e_cal_component_id_free (expected);
@@ -1625,11 +1625,11 @@ test_component_struct_parameter_bag (void)
param2 = e_cal_component_parameter_bag_get (bag, ii);
if (ii == 0) {
- g_assert (param != param2);
+ g_assert_true (param != param2);
g_assert_cmpint (i_cal_parameter_isa (param2), ==, I_CAL_CN_PARAMETER);
g_assert_cmpstr (i_cal_parameter_get_cn (param2), ==, "234");
} else {
- g_assert (param == param2);
+ g_assert_true (param == param2);
g_assert_cmpint (i_cal_parameter_isa (param2), ==, I_CAL_CUTYPE_PARAMETER);
g_assert_cmpint (i_cal_parameter_get_cutype (param2), ==, I_CAL_CUTYPE_ROOM);
}
@@ -1945,11 +1945,11 @@ test_component_struct_property_bag (void)
prop2 = e_cal_component_property_bag_get (bag, ii);
if (ii == 0) {
- g_assert (prop != prop2);
+ g_assert_true (prop != prop2);
g_assert_cmpint (i_cal_property_isa (prop2), ==, I_CAL_UID_PROPERTY);
g_assert_cmpstr (i_cal_property_get_uid (prop2), ==, "234");
} else {
- g_assert (prop == prop2);
+ g_assert_true (prop == prop2);
g_assert_cmpint (i_cal_property_isa (prop2), ==, I_CAL_STATUS_PROPERTY);
g_assert_cmpint (i_cal_property_get_status (prop2), ==, I_CAL_STATUS_CANCELLED);
}
@@ -2154,7 +2154,7 @@ verify_changes (ECalComponent *comp,
g_assert_nonnull (icalcomp);
clone = e_cal_component_new ();
g_assert_nonnull (clone);
- g_assert (e_cal_component_set_icalcomponent (clone, icalcomp));
+ g_assert_true (e_cal_component_set_icalcomponent (clone, icalcomp));
verify_func (clone, user_data);
g_object_unref (clone);
@@ -2273,7 +2273,7 @@ verify_component_categories (ECalComponent *comp,
g_assert_cmpstr (link1->data, ==, link2->data);
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
g_slist_free_full (expected, g_free);
g_slist_free_full (received, g_free);
@@ -2390,7 +2390,7 @@ verify_component_text_list (GSList * (* get_func) (ECalComponent *comp),
{
GSList *expected, *received, *link1, *link2;
- g_assert (get_func != NULL);
+ g_assert_true (get_func != NULL);
expected = user_data;
received = get_func (comp);
@@ -2408,7 +2408,7 @@ verify_component_text_list (GSList * (* get_func) (ECalComponent *comp),
verify_struct_text_equal (text1, text2);
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
g_slist_free_full (received, e_cal_component_text_free);
}
@@ -2429,8 +2429,8 @@ test_component_text_list (void (* set_func) (ECalComponent *comp,
ECalComponent *comp;
gint ii;
- g_assert (set_func != NULL);
- g_assert (verify_func != NULL);
+ g_assert_true (set_func != NULL);
+ g_assert_true (verify_func != NULL);
comp = e_cal_component_new_vtype (E_CAL_COMPONENT_EVENT);
g_assert_nonnull (comp);
@@ -2454,7 +2454,7 @@ verify_component_icaltime (ICalTime * (* get_func) (ECalComponent *comp),
{
ICalTime *expected, *received;
- g_assert (get_func != NULL);
+ g_assert_true (get_func != NULL);
expected = user_data;
received = get_func (comp);
@@ -2480,8 +2480,8 @@ test_component_icaltime (void (* set_func) (ECalComponent *comp,
ECalComponent *comp;
gint ii;
- g_assert (set_func != NULL);
- g_assert (verify_func != NULL);
+ g_assert_true (set_func != NULL);
+ g_assert_true (verify_func != NULL);
comp = e_cal_component_new_vtype (E_CAL_COMPONENT_EVENT);
g_assert_nonnull (comp);
@@ -2514,7 +2514,7 @@ verify_component_datetime (ECalComponentDateTime * (* get_func) (ECalComponent *
{
ECalComponentDateTime *expected, *received;
- g_assert (get_func != NULL);
+ g_assert_true (get_func != NULL);
expected = user_data;
received = get_func (comp);
@@ -2545,8 +2545,8 @@ test_component_datetime (void (* set_func) (ECalComponent *comp,
ECalComponent *comp;
gint ii;
- g_assert (set_func != NULL);
- g_assert (verify_func != NULL);
+ g_assert_true (set_func != NULL);
+ g_assert_true (verify_func != NULL);
comp = e_cal_component_new_vtype (E_CAL_COMPONENT_EVENT);
g_assert_nonnull (comp);
@@ -2599,29 +2599,29 @@ verify_component_rules (GSList * (* get_func) (ECalComponent *comp),
g_assert_null (received);
g_assert_null (received_props);
if (is_exception) {
- g_assert (!e_cal_component_has_exrules (comp));
- g_assert (!e_cal_component_has_exceptions (comp));
+ g_assert_true (!e_cal_component_has_exrules (comp));
+ g_assert_true (!e_cal_component_has_exceptions (comp));
} else {
- g_assert (!e_cal_component_has_rrules (comp));
- g_assert (!e_cal_component_has_recurrences (comp));
- g_assert (e_cal_component_has_simple_recurrence (comp));
+ g_assert_true (!e_cal_component_has_rrules (comp));
+ g_assert_true (!e_cal_component_has_recurrences (comp));
+ g_assert_true (e_cal_component_has_simple_recurrence (comp));
}
} else {
GSList *link1, *link2, *link3;
if (is_exception) {
- g_assert (e_cal_component_has_exrules (comp));
- g_assert (e_cal_component_has_exceptions (comp));
- g_assert (!e_cal_component_has_rrules (comp));
+ g_assert_true (e_cal_component_has_exrules (comp));
+ g_assert_true (e_cal_component_has_exceptions (comp));
+ g_assert_true (!e_cal_component_has_rrules (comp));
} else {
- g_assert (!e_cal_component_has_exrules (comp));
- g_assert (!e_cal_component_has_exceptions (comp));
- g_assert (e_cal_component_has_rrules (comp));
- g_assert (e_cal_component_has_recurrences (comp));
+ g_assert_true (!e_cal_component_has_exrules (comp));
+ g_assert_true (!e_cal_component_has_exceptions (comp));
+ g_assert_true (e_cal_component_has_rrules (comp));
+ g_assert_true (e_cal_component_has_recurrences (comp));
if (expected->next)
- g_assert (!e_cal_component_has_simple_recurrence (comp));
+ g_assert_true (!e_cal_component_has_simple_recurrence (comp));
else
- g_assert (e_cal_component_has_simple_recurrence (comp));
+ g_assert_true (e_cal_component_has_simple_recurrence (comp));
}
g_assert_cmpint (g_slist_length (expected), ==, g_slist_length (received));
@@ -2657,8 +2657,8 @@ verify_component_rules (GSList * (* get_func) (ECalComponent *comp),
g_clear_object (&rt_received_prop);
}
- g_assert (link1 == link2);
- g_assert (link2 == link3);
+ g_assert_true (link1 == link2);
+ g_assert_true (link2 == link3);
}
g_slist_free_full (received, g_object_unref);
@@ -2841,13 +2841,13 @@ verify_component_exdates (ECalComponent *comp,
if (!expected) {
g_assert_null (received);
- g_assert (!e_cal_component_has_exdates (comp));
- g_assert (!e_cal_component_has_exceptions (comp));
+ g_assert_true (!e_cal_component_has_exdates (comp));
+ g_assert_true (!e_cal_component_has_exceptions (comp));
} else {
GSList *link1, *link2;
- g_assert (e_cal_component_has_exdates (comp));
- g_assert (e_cal_component_has_exceptions (comp));
+ g_assert_true (e_cal_component_has_exdates (comp));
+ g_assert_true (e_cal_component_has_exceptions (comp));
g_assert_cmpint (g_slist_length (expected), ==, g_slist_length (received));
for (link1 = expected, link2 = received; link1 && link2; link1 = g_slist_next (link1), link2
= g_slist_next (link2)) {
@@ -2856,7 +2856,7 @@ verify_component_exdates (ECalComponent *comp,
verify_struct_datetime_equal (dt_expected, dt_received);
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
}
g_slist_free_full (received, e_cal_component_datetime_free);
@@ -3010,10 +3010,10 @@ verify_component_organizer (ECalComponent *comp,
if (!expected) {
g_assert_null (received);
- g_assert (!e_cal_component_has_organizer (comp));
+ g_assert_true (!e_cal_component_has_organizer (comp));
} else {
g_assert_nonnull (received);
- g_assert (e_cal_component_has_organizer (comp));
+ g_assert_true (e_cal_component_has_organizer (comp));
verify_struct_organizer_equal (expected, received);
}
@@ -3137,11 +3137,11 @@ verify_component_recurid (ECalComponent *comp,
g_assert_null (received);
g_assert_null (rid_str);
g_assert_null (e_cal_component_id_get_rid (id));
- g_assert (!e_cal_component_is_instance (comp));
+ g_assert_true (!e_cal_component_is_instance (comp));
} else {
g_assert_nonnull (rid_str);
g_assert_nonnull (e_cal_component_id_get_rid (id));
- g_assert (e_cal_component_is_instance (comp));
+ g_assert_true (e_cal_component_is_instance (comp));
g_assert_cmpstr (e_cal_component_id_get_rid (id), ==, rid_str);
verify_struct_range_equal (expected, received);
@@ -3217,13 +3217,13 @@ verify_component_rdates (ECalComponent *comp,
if (!expected) {
g_assert_null (received);
- g_assert (!e_cal_component_has_rdates (comp));
- g_assert (!e_cal_component_has_recurrences (comp));
+ g_assert_true (!e_cal_component_has_rdates (comp));
+ g_assert_true (!e_cal_component_has_recurrences (comp));
} else {
GSList *link1, *link2;
- g_assert (e_cal_component_has_rdates (comp));
- g_assert (e_cal_component_has_recurrences (comp));
+ g_assert_true (e_cal_component_has_rdates (comp));
+ g_assert_true (e_cal_component_has_recurrences (comp));
g_assert_cmpint (g_slist_length (expected), ==, g_slist_length (received));
for (link1 = expected, link2 = received; link1 && link2; link1 = g_slist_next (link1), link2
= g_slist_next (link2)) {
@@ -3232,7 +3232,7 @@ verify_component_rdates (ECalComponent *comp,
verify_struct_period_equal (period_expected, period_received);
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
}
g_slist_free_full (received, e_cal_component_period_free);
@@ -3530,12 +3530,12 @@ verify_component_attendees (ECalComponent *comp,
if (!expected) {
g_assert_null (received);
- g_assert (!e_cal_component_has_attendees (comp));
+ g_assert_true (!e_cal_component_has_attendees (comp));
} else {
GSList *link1, *link2;
g_assert_nonnull (received);
- g_assert (e_cal_component_has_attendees (comp));
+ g_assert_true (e_cal_component_has_attendees (comp));
g_assert_cmpint (g_slist_length (expected), ==, g_slist_length (received));
@@ -3545,7 +3545,7 @@ verify_component_attendees (ECalComponent *comp,
verify_struct_attendee_equal (att_expected, att_received);
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
}
g_slist_free_full (received, e_cal_component_attendee_free);
@@ -3698,12 +3698,12 @@ verify_component_attachments (ECalComponent *comp,
if (!expected) {
g_assert_null (received);
- g_assert (!e_cal_component_has_attachments (comp));
+ g_assert_true (!e_cal_component_has_attachments (comp));
} else {
ECalComponent *clone;
g_assert_nonnull (received);
- g_assert (e_cal_component_has_attachments (comp));
+ g_assert_true (e_cal_component_has_attachments (comp));
verify_ical_attach_list_equal (expected, received);
@@ -3787,13 +3787,13 @@ verify_component_alarms (ECalComponent *comp,
if (!expected) {
g_assert_null (received);
g_assert_null (received_uids);
- g_assert (!e_cal_component_has_alarms (comp));
+ g_assert_true (!e_cal_component_has_alarms (comp));
} else {
GSList *link1, *link2, *link3;
g_assert_nonnull (received);
g_assert_nonnull (received_uids);
- g_assert (e_cal_component_has_alarms (comp));
+ g_assert_true (e_cal_component_has_alarms (comp));
g_assert_cmpint (g_slist_length (expected), ==, g_slist_length (received));
g_assert_cmpint (g_slist_length (expected), ==, g_slist_length (received_uids));
@@ -3815,8 +3815,8 @@ verify_component_alarms (ECalComponent *comp,
verify_struct_alarm_equal (al_expected, al_received);
}
- g_assert (link1 == link2);
- g_assert (link1 == link3);
+ g_assert_true (link1 == link2);
+ g_assert_true (link1 == link3);
if (expected->next) {
ECalComponentAlarm *al_expected;
@@ -3836,7 +3836,7 @@ verify_component_alarms (ECalComponent *comp,
g_slist_free_full (received, e_cal_component_alarm_free);
g_slist_free_full (received_uids, g_free);
- g_assert (e_cal_component_has_alarms (comp));
+ g_assert_true (e_cal_component_has_alarms (comp));
received = e_cal_component_get_all_alarms (comp);
received_uids = e_cal_component_get_alarm_uids (comp);
@@ -3859,11 +3859,11 @@ verify_component_alarms (ECalComponent *comp,
g_assert_cmpstr (e_cal_component_alarm_get_uid (al_expected), !=,
e_cal_component_alarm_get_uid (al_received));
}
- g_assert (link1 == link2);
+ g_assert_true (link1 == link2);
} else {
e_cal_component_remove_alarm (comp, e_cal_component_alarm_get_uid (expected->data));
- g_assert (!e_cal_component_has_alarms (comp));
+ g_assert_true (!e_cal_component_has_alarms (comp));
g_assert_null (e_cal_component_get_all_alarms (comp));
g_assert_null (e_cal_component_get_alarm_uids (comp));
}
diff --git a/tests/libecal/test-cal-recur.c b/tests/libecal/test-cal-recur.c
index ccb873571..c3daead4a 100644
--- a/tests/libecal/test-cal-recur.c
+++ b/tests/libecal/test-cal-recur.c
@@ -68,12 +68,12 @@ create_component (const gchar *tz_location)
itt = i_cal_component_get_dtstart (icomp);
g_assert_nonnull (itt);
- g_assert (i_cal_time_get_timezone (itt) == zone);
+ g_assert_true (i_cal_time_get_timezone (itt) == zone);
g_object_unref (itt);
itt = i_cal_component_get_dtend (icomp);
g_assert_nonnull (itt);
- g_assert (i_cal_time_get_timezone (itt) == zone);
+ g_assert_true (i_cal_time_get_timezone (itt) == zone);
g_object_unref (itt);
return icomp;
@@ -95,7 +95,7 @@ setup_cal (ECalClient *cal_client,
success = e_cal_client_create_object_sync (cal_client, icomp, E_CAL_OPERATION_FLAG_NONE, &uid, NULL,
&error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (uid);
g_object_unref (icomp);
@@ -179,7 +179,7 @@ verify_received_instances (GHashTable *instances,
g_assert_nonnull (expected_start);
ins.start = expected_start;
- g_assert (g_hash_table_remove (instances, &ins));
+ g_assert_true (g_hash_table_remove (instances, &ins));
g_object_unref (expected_start);
}
@@ -246,7 +246,7 @@ test_recur_plain_run (ECalClient *client,
e_cal_client_tzlookup_cb, client,
default_zone, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_hash_table_size (rd.instances), ==, 5);
@@ -431,7 +431,7 @@ test_recur_exdate_component (const gchar *comp_str)
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (found, ==, 2);
found = 0;
@@ -443,7 +443,7 @@ test_recur_exdate_component (const gchar *comp_str)
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (found, ==, 2);
g_object_unref (start);
@@ -556,7 +556,7 @@ test_recur_duration (ETestServerFixture *fixture,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (dd.n_found, ==, 8);
dd.n_found = 0;
@@ -568,7 +568,7 @@ test_recur_duration (ETestServerFixture *fixture,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (dd.n_found, ==, 8);
dd.n_found = 0;
@@ -580,7 +580,7 @@ test_recur_duration (ETestServerFixture *fixture,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (dd.n_found, ==, 8);
g_object_unref (start);
diff --git a/tests/libecal/test-cal-reminders.c b/tests/libecal/test-cal-reminders.c
index c54d88d59..29e325b9a 100644
--- a/tests/libecal/test-cal-reminders.c
+++ b/tests/libecal/test-cal-reminders.c
@@ -128,7 +128,7 @@ test_reminders_verify (const gchar *comp_str,
g_hash_table_insert (used_indexes, GUINT_TO_POINTER (ii), NULL);
}
- g_assert (found);
+ g_assert_true (found);
}
g_assert_cmpint (n_expected_instances, ==, g_hash_table_size (used_indexes));
diff --git a/tests/libedata-book/data-test-utils.c b/tests/libedata-book/data-test-utils.c
index 9b7c84a60..30b1355cc 100644
--- a/tests/libedata-book/data-test-utils.c
+++ b/tests/libedata-book/data-test-utils.c
@@ -144,9 +144,9 @@ delete_work_directory (const gchar *filename)
NULL, (gchar **) argv, NULL, 0, NULL, NULL,
NULL, NULL, &exit_status, NULL);
- g_assert (spawn_succeeded);
+ g_assert_true (spawn_succeeded);
#ifndef G_OS_WIN32
- g_assert (WIFEXITED (exit_status));
+ g_assert_true (WIFEXITED (exit_status));
g_assert_cmpint (WEXITSTATUS (exit_status), ==, 0);
#else
g_assert_cmpint (exit_status, ==, 0);
@@ -185,7 +185,7 @@ fetch_vcard_from_hash (const gchar *uid,
EbSqlFixture *fixture = user_data;
EContact *contact;
- g_assert (extra && extra[0]);
+ g_assert_true (extra && extra[0]);
/* vCards not stored in shallow addressbooks, instead loaded on the fly */
contact = g_hash_table_lookup (fixture->contacts, extra);
@@ -431,7 +431,7 @@ assert_contacts_order (GSList *results,
gchar *uid;
va_list args;
- g_assert (first_uid);
+ g_assert_true (first_uid);
uids = g_slist_append (uids, (gpointer) first_uid);
diff --git a/tests/libedata-book/test-book-cache-create-cursor.c
b/tests/libedata-book/test-book-cache-create-cursor.c
index 78f050630..354dceaf0 100644
--- a/tests/libedata-book/test-book-cache-create-cursor.c
+++ b/tests/libedata-book/test-book-cache-create-cursor.c
@@ -36,7 +36,7 @@ test_create_cursor_empty_query (TCUFixture *fixture,
fixture->book_cache, NULL,
sort_fields, sort_types, 2, &error);
- g_assert (cursor != NULL);
+ g_assert_true (cursor != NULL);
e_book_cache_cursor_free (fixture->book_cache, cursor);
}
@@ -58,7 +58,7 @@ test_create_cursor_valid_query (TCUFixture *fixture,
fixture->book_cache, sexp,
sort_fields, sort_types, 2, &error);
- g_assert (cursor != NULL);
+ g_assert_true (cursor != NULL);
e_book_cache_cursor_free (fixture->book_cache, cursor);
g_free (sexp);
e_book_query_unref (query);
@@ -77,7 +77,7 @@ test_create_cursor_invalid_sort (TCUFixture *fixture,
fixture->book_cache, NULL,
sort_fields, sort_types, 1, &error);
- g_assert (cursor == NULL);
+ g_assert_true (cursor == NULL);
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_INVALID_QUERY);
g_clear_error (&error);
}
@@ -91,7 +91,7 @@ test_create_cursor_missing_sort (TCUFixture *fixture,
cursor = e_book_cache_cursor_new (fixture->book_cache, NULL, NULL, NULL, 0, &error);
- g_assert (cursor == NULL);
+ g_assert_true (cursor == NULL);
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_INVALID_QUERY);
g_clear_error (&error);
}
@@ -109,7 +109,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
g_test_add (
diff --git a/tests/libedata-book/test-book-cache-cursor-set-sexp.c
b/tests/libedata-book/test-book-cache-cursor-set-sexp.c
index f8a8e8b83..f81db9d21 100644
--- a/tests/libedata-book/test-book-cache-cursor-set-sexp.c
+++ b/tests/libedata-book/test-book-cache-cursor-set-sexp.c
@@ -44,7 +44,7 @@ test_cursor_sexp_calculate_position (TCUCursorFixture *fixture,
/* Ensure we moved to the right contact */
node = g_slist_last (results);
- g_assert (node);
+ g_assert_true (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-16");
g_slist_free_full (results, e_book_cache_search_data_free);
@@ -108,7 +108,7 @@ test_cursor_sexp_and_step (TCUCursorFixture *fixture,
/* Ensure we moved to the right contact */
node = g_slist_last (results);
- g_assert (node);
+ g_assert_true (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-8");
g_slist_free_full (results, e_book_cache_search_data_free);
@@ -124,7 +124,7 @@ test_cursor_sexp_and_step (TCUCursorFixture *fixture,
/* Ensure we moved to the right contact */
node = g_slist_last (results);
- g_assert (node);
+ g_assert_true (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-12");
g_slist_free_full (results, e_book_cache_search_data_free);
diff --git a/tests/libedata-book/test-book-cache-get-contact.c
b/tests/libedata-book/test-book-cache-get-contact.c
index 7a36c0f8a..21832200d 100644
--- a/tests/libedata-book/test-book-cache-get-contact.c
+++ b/tests/libedata-book/test-book-cache-get-contact.c
@@ -90,7 +90,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
for (ii = 0; ii < G_N_ELEMENTS (closures); ii++) {
diff --git a/tests/libedata-book/test-book-cache-offline.c b/tests/libedata-book/test-book-cache-offline.c
index f2460c5c6..4dc03181b 100644
--- a/tests/libedata-book/test-book-cache-offline.c
+++ b/tests/libedata-book/test-book-cache-offline.c
@@ -65,14 +65,14 @@ test_check_search_result (const GSList *list,
EBookCacheSearchData *sd = link->data;
EContact *contact;
- g_assert (sd != NULL);
- g_assert (sd->uid != NULL);
- g_assert (sd->vcard != NULL);
+ g_assert_true (sd != NULL);
+ g_assert_true (sd->uid != NULL);
+ g_assert_true (sd->vcard != NULL);
uid = sd->uid;
contact = e_contact_new_from_vcard (sd->vcard);
- g_assert (E_IS_CONTACT (contact));
+ g_assert_true (E_IS_CONTACT (contact));
g_assert_cmpstr (uid, ==, e_contact_get_const (contact, E_CONTACT_UID));
if (has_meta_contacts) {
@@ -90,23 +90,23 @@ test_check_search_result (const GSList *list,
g_assert_nonnull (uid);
if (g_str_equal (uid, "custom-1")) {
- g_assert (expect_custom_1);
- g_assert (!have_custom_1);
+ g_assert_true (expect_custom_1);
+ g_assert_true (!have_custom_1);
have_custom_1 = TRUE;
} else if (g_str_equal (uid, "custom-3")) {
- g_assert (!have_custom_3);
+ g_assert_true (!have_custom_3);
have_custom_3 = TRUE;
} else if (g_str_equal (uid, "custom-9")) {
- g_assert (expect_custom_9);
- g_assert (!have_custom_9);
+ g_assert_true (expect_custom_9);
+ g_assert_true (!have_custom_9);
have_custom_9 = TRUE;
} else if (g_str_equal (uid, "simple-1")) {
- g_assert (expect_simple_1);
- g_assert (!have_simple_1);
+ g_assert_true (expect_simple_1);
+ g_assert_true (!have_simple_1);
have_simple_1 = TRUE;
} else if (g_str_equal (uid, "simple-2")) {
- g_assert (expect_simple_2);
- g_assert (!have_simple_2);
+ g_assert_true (expect_simple_2);
+ g_assert_true (!have_simple_2);
have_simple_2 = TRUE;
} else {
/* It's not supposed to be NULL, but it will print the value of 'uid' */
@@ -114,11 +114,11 @@ test_check_search_result (const GSList *list,
}
}
- g_assert ((expect_custom_1 && have_custom_1) || (!expect_custom_1 && !have_custom_1));
- g_assert ((expect_custom_9 && have_custom_9) || (!expect_custom_9 && !have_custom_9));
- g_assert ((expect_simple_1 && have_simple_1) || (!expect_simple_1 && !have_simple_1));
- g_assert ((expect_simple_2 && have_simple_2) || (!expect_simple_2 && !have_simple_2));
- g_assert (have_custom_3);
+ g_assert_true ((expect_custom_1 && have_custom_1) || (!expect_custom_1 && !have_custom_1));
+ g_assert_true ((expect_custom_9 && have_custom_9) || (!expect_custom_9 && !have_custom_9));
+ g_assert_true ((expect_simple_1 && have_simple_1) || (!expect_simple_1 && !have_simple_1));
+ g_assert_true ((expect_simple_2 && have_simple_2) || (!expect_simple_2 && !have_simple_2));
+ g_assert_true (have_custom_3);
}
static void
@@ -143,7 +143,7 @@ test_basic_cursor (TCUFixture *fixture,
g_assert_no_error (error);
g_assert_nonnull (cursor);
- g_assert (e_book_cache_cursor_calculate (fixture->book_cache, cursor, &total, &position, NULL,
&error));
+ g_assert_true (e_book_cache_cursor_calculate (fixture->book_cache, cursor, &total, &position, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (total, ==, expect_total);
g_assert_cmpint (position, ==, 0);
@@ -175,21 +175,21 @@ test_basic_search (TCUFixture *fixture,
((flags & EXPECT_SIMPLE_2) != 0 ? 1 : 0);
/* All contacts first */
- g_assert (e_book_cache_search (fixture->book_cache, NULL, FALSE, &list, NULL, &error));
+ g_assert_true (e_book_cache_search (fixture->book_cache, NULL, FALSE, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, expect_total);
test_check_search_result (list, flags | EXPECT_CUSTOM_9 | HAS_SEARCH_DATA);
g_slist_free_full (list, e_book_cache_search_data_free);
list = NULL;
- g_assert (e_book_cache_search (fixture->book_cache, NULL, TRUE, &list, NULL, &error));
+ g_assert_true (e_book_cache_search (fixture->book_cache, NULL, TRUE, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, expect_total);
test_check_search_result (list, flags | EXPECT_CUSTOM_9 | HAS_SEARCH_DATA | HAS_META_CONTACTS);
g_slist_free_full (list, e_book_cache_search_data_free);
list = NULL;
- g_assert (e_book_cache_search_uids (fixture->book_cache, NULL, &list, NULL, &error));
+ g_assert_true (e_book_cache_search_uids (fixture->book_cache, NULL, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, expect_total);
test_check_search_result (list, flags | EXPECT_CUSTOM_9);
@@ -203,21 +203,21 @@ test_basic_search (TCUFixture *fixture,
sexp = e_book_query_to_string (query);
e_book_query_unref (query);
- g_assert (e_book_cache_search (fixture->book_cache, sexp, FALSE, &list, NULL, &error));
+ g_assert_true (e_book_cache_search (fixture->book_cache, sexp, FALSE, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, HAS_SEARCH_DATA);
g_slist_free_full (list, e_book_cache_search_data_free);
list = NULL;
- g_assert (e_book_cache_search (fixture->book_cache, sexp, TRUE, &list, NULL, &error));
+ g_assert_true (e_book_cache_search (fixture->book_cache, sexp, TRUE, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, HAS_SEARCH_DATA | HAS_META_CONTACTS);
g_slist_free_full (list, e_book_cache_search_data_free);
list = NULL;
- g_assert (e_book_cache_search_uids (fixture->book_cache, sexp, &list, NULL, &error));
+ g_assert_true (e_book_cache_search_uids (fixture->book_cache, sexp, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, EXPECT_DEFAULT);
@@ -233,21 +233,21 @@ test_basic_search (TCUFixture *fixture,
sexp = e_book_query_to_string (query);
e_book_query_unref (query);
- g_assert (e_book_cache_search (fixture->book_cache, sexp, FALSE, &list, NULL, &error));
+ g_assert_true (e_book_cache_search (fixture->book_cache, sexp, FALSE, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, HAS_SEARCH_DATA);
g_slist_free_full (list, e_book_cache_search_data_free);
list = NULL;
- g_assert (e_book_cache_search (fixture->book_cache, sexp, TRUE, &list, NULL, &error));
+ g_assert_true (e_book_cache_search (fixture->book_cache, sexp, TRUE, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, HAS_SEARCH_DATA | HAS_META_CONTACTS);
g_slist_free_full (list, e_book_cache_search_data_free);
list = NULL;
- g_assert (e_book_cache_search_uids (fixture->book_cache, sexp, &list, NULL, &error));
+ g_assert_true (e_book_cache_search_uids (fixture->book_cache, sexp, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, EXPECT_DEFAULT);
@@ -259,12 +259,12 @@ test_basic_search (TCUFixture *fixture,
g_free (sexp);
/* Invalid expression */
- g_assert (!e_book_cache_search (fixture->book_cache, "invalid expression here", TRUE, &list, NULL,
&error));
+ g_assert_true (!e_book_cache_search (fixture->book_cache, "invalid expression here", TRUE, &list,
NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_INVALID_QUERY);
g_assert_null (list);
g_clear_error (&error);
- g_assert (!e_book_cache_search_uids (fixture->book_cache, "invalid expression here", &list, NULL,
&error));
+ g_assert_true (!e_book_cache_search_uids (fixture->book_cache, "invalid expression here", &list,
NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_INVALID_QUERY);
g_assert_null (list);
g_clear_error (&error);
@@ -308,7 +308,7 @@ test_check_offline_changes (TCUFixture *fixture,
gint expect_state;
g_assert_nonnull (change);
- g_assert (g_hash_table_contains (expects, change->uid));
+ g_assert_true (g_hash_table_contains (expects, change->uid));
expect_state = GPOINTER_TO_INT (g_hash_table_lookup (expects, change->uid));
g_assert_cmpint (expect_state, ==, change->state);
@@ -347,14 +347,14 @@ test_check_edit_saved (TCUFixture *fixture,
EContact *contact = NULL;
GError *error = NULL;
- g_assert (e_book_cache_get_contact (fixture->book_cache, uid, FALSE, &contact, NULL, &error));
+ g_assert_true (e_book_cache_get_contact (fixture->book_cache, uid, FALSE, &contact, NULL, &error));
g_assert_no_error (error);
g_assert_nonnull (contact);
g_assert_cmpstr (e_contact_get_const (contact, E_CONTACT_REV), ==, rev_value);
g_clear_object (&contact);
- g_assert (e_book_cache_get_contact (fixture->book_cache, uid, TRUE, &contact, NULL, &error));
+ g_assert_true (e_book_cache_get_contact (fixture->book_cache, uid, TRUE, &contact, NULL, &error));
g_assert_no_error (error);
g_assert_nonnull (contact);
g_assert_cmpstr (e_contact_get_const (contact, E_CONTACT_REV), ==, rev_value);
@@ -376,13 +376,13 @@ test_verify_storage (TCUFixture *fixture,
if (expect_offline_state == E_OFFLINE_STATE_LOCALLY_DELETED ||
expect_offline_state == E_OFFLINE_STATE_UNKNOWN) {
- g_assert (!e_book_cache_get_contact (fixture->book_cache, uid, FALSE, &contact, NULL,
&error));
+ g_assert_true (!e_book_cache_get_contact (fixture->book_cache, uid, FALSE, &contact, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_assert_null (contact);
g_clear_error (&error);
} else {
- g_assert (e_book_cache_get_contact (fixture->book_cache, uid, FALSE, &contact, NULL, &error));
+ g_assert_true (e_book_cache_get_contact (fixture->book_cache, uid, FALSE, &contact, NULL,
&error));
g_assert_no_error (error);
g_assert_nonnull (contact);
}
@@ -390,13 +390,13 @@ test_verify_storage (TCUFixture *fixture,
offline_state = test_check_offline_state (fixture, uid, expect_offline_state);
if (offline_state == E_OFFLINE_STATE_UNKNOWN) {
- g_assert (!e_cache_contains (E_CACHE (fixture->book_cache), uid, E_CACHE_EXCLUDE_DELETED));
- g_assert (!e_cache_contains (E_CACHE (fixture->book_cache), uid, E_CACHE_INCLUDE_DELETED));
+ g_assert_true (!e_cache_contains (E_CACHE (fixture->book_cache), uid,
E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (!e_cache_contains (E_CACHE (fixture->book_cache), uid,
E_CACHE_INCLUDE_DELETED));
test_check_offline_changes (fixture, NULL);
return;
}
- g_assert (e_book_cache_get_contact_extra (fixture->book_cache, uid, &saved_extra, NULL, &error));
+ g_assert_true (e_book_cache_get_contact_extra (fixture->book_cache, uid, &saved_extra, NULL, &error));
g_assert_no_error (error);
g_assert_cmpstr (saved_extra, ==, expect_extra);
@@ -448,7 +448,7 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpstr ("rev-321", ==, tmp);
g_free (tmp);
- g_assert (e_cache_set_key (E_CACHE (fixture->book_cache), "my-key-str", "key-str-value", &error));
+ g_assert_true (e_cache_set_key (E_CACHE (fixture->book_cache), "my-key-str", "key-str-value",
&error));
g_assert_no_error (error);
tmp = e_cache_dup_key (E_CACHE (fixture->book_cache), "my-key-str", &error);
@@ -456,7 +456,7 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpstr ("key-str-value", ==, tmp);
g_free (tmp);
- g_assert (e_cache_set_key_int (E_CACHE (fixture->book_cache), "version", 567, &error));
+ g_assert_true (e_cache_set_key_int (E_CACHE (fixture->book_cache), "version", 567, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_key_int (E_CACHE (fixture->book_cache), "version", &error), ==, 567);
@@ -474,17 +474,17 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
g_assert_no_error (error);
- g_assert (e_book_cache_set_contact_extra (fixture->book_cache, uid, "extra-0", NULL, &error));
+ g_assert_true (e_book_cache_set_contact_extra (fixture->book_cache, uid, "extra-0", NULL, &error));
g_assert_no_error (error);
- g_assert (e_book_cache_get_contact_extra (fixture->book_cache, uid, &saved_extra, NULL, &error));
+ g_assert_true (e_book_cache_get_contact_extra (fixture->book_cache, uid, &saved_extra, NULL, &error));
g_assert_no_error (error);
g_assert_cmpstr (saved_extra, ==, "extra-0");
g_free (saved_extra);
saved_extra = NULL;
- g_assert (e_book_cache_get_uids_with_extra (fixture->book_cache, "extra-0", &uids, NULL, &error));
+ g_assert_true (e_book_cache_get_uids_with_extra (fixture->book_cache, "extra-0", &uids, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (uids), ==, 1);
g_assert_cmpstr (uids->data, ==, uid);
@@ -500,7 +500,7 @@ test_offline_basics (TCUFixture *fixture,
/* Try change status */
for (ii = 0; ii < G_N_ELEMENTS (states); ii++) {
- g_assert (e_cache_set_offline_state (E_CACHE (fixture->book_cache), uid, states[ii], NULL,
&error));
+ g_assert_true (e_cache_set_offline_state (E_CACHE (fixture->book_cache), uid, states[ii],
NULL, &error));
g_assert_no_error (error);
test_check_offline_state (fixture, uid, states[ii]);
@@ -512,23 +512,23 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache),
E_CACHE_EXCLUDE_DELETED, NULL, &error), ==, 2);
g_assert_no_error (error);
- g_assert (!e_cache_contains (E_CACHE (fixture->book_cache), uid,
E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (!e_cache_contains (E_CACHE (fixture->book_cache), uid,
E_CACHE_EXCLUDE_DELETED));
- g_assert (e_book_cache_set_contact_extra (fixture->book_cache, uid, "extra-1", NULL,
&error));
+ g_assert_true (e_book_cache_set_contact_extra (fixture->book_cache, uid, "extra-1",
NULL, &error));
g_assert_no_error (error);
- g_assert (e_book_cache_get_contact_extra (fixture->book_cache, uid, &saved_extra,
NULL, &error));
+ g_assert_true (e_book_cache_get_contact_extra (fixture->book_cache, uid,
&saved_extra, NULL, &error));
g_assert_no_error (error);
g_assert_cmpstr (saved_extra, ==, "extra-1");
g_free (saved_extra);
saved_extra = NULL;
- g_assert (e_book_cache_set_contact_custom_flags (fixture->book_cache, uid, 123, NULL,
&error));
+ g_assert_true (e_book_cache_set_contact_custom_flags (fixture->book_cache, uid, 123,
NULL, &error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid,
&custom_flags, NULL, &error));
+ g_assert_true (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid,
&custom_flags, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 123);
@@ -538,13 +538,13 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache),
E_CACHE_EXCLUDE_DELETED, NULL, &error), ==, 3);
g_assert_no_error (error);
- g_assert (e_cache_contains (E_CACHE (fixture->book_cache), uid,
E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (e_cache_contains (E_CACHE (fixture->book_cache), uid,
E_CACHE_EXCLUDE_DELETED));
/* Search when locally available */
test_basic_search (fixture, EXPECT_CUSTOM_1);
}
- g_assert (e_cache_contains (E_CACHE (fixture->book_cache), uid, E_CACHE_INCLUDE_DELETED));
+ g_assert_true (e_cache_contains (E_CACHE (fixture->book_cache), uid,
E_CACHE_INCLUDE_DELETED));
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_INCLUDE_DELETED,
NULL, &error), ==, 3);
g_assert_no_error (error);
@@ -555,7 +555,7 @@ test_offline_basics (TCUFixture *fixture,
/* Edit in online */
e_contact_set (contact, E_CONTACT_REV, "rev-1");
- g_assert (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 0, E_CACHE_IS_ONLINE, NULL,
&error));
+ g_assert_true (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 0, E_CACHE_IS_ONLINE,
NULL, &error));
g_assert_no_error (error);
test_verify_storage (fixture, uid, "rev-1", NULL, E_OFFLINE_STATE_SYNCED);
@@ -563,13 +563,13 @@ test_offline_basics (TCUFixture *fixture,
e_contact_set (contact, E_CONTACT_REV, "rev-2");
- g_assert (e_book_cache_put_contact (fixture->book_cache, contact, "extra-2", 0, E_CACHE_IS_ONLINE,
NULL, &error));
+ g_assert_true (e_book_cache_put_contact (fixture->book_cache, contact, "extra-2", 0,
E_CACHE_IS_ONLINE, NULL, &error));
g_assert_no_error (error);
test_verify_storage (fixture, uid, "rev-2", "extra-2", E_OFFLINE_STATE_SYNCED);
test_check_offline_changes (fixture, NULL);
- g_assert (e_book_cache_get_uids_with_extra (fixture->book_cache, "extra-2", &uids, NULL, &error));
+ g_assert_true (e_book_cache_get_uids_with_extra (fixture->book_cache, "extra-2", &uids, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (uids), ==, 1);
g_assert_cmpstr (uids->data, ==, uid);
@@ -580,11 +580,11 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
g_assert_no_error (error);
- g_assert (e_book_cache_set_contact_custom_flags (fixture->book_cache, uid, 234, NULL, &error));
+ g_assert_true (e_book_cache_set_contact_custom_flags (fixture->book_cache, uid, 234, NULL, &error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
+ g_assert_true (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 234);
@@ -592,10 +592,10 @@ test_offline_basics (TCUFixture *fixture,
test_basic_search (fixture, EXPECT_CUSTOM_1);
/* Delete in online */
- g_assert (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_ONLINE, NULL, &error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_ONLINE, NULL,
&error));
g_assert_no_error (error);
- g_assert (!e_cache_set_offline_state (E_CACHE (fixture->book_cache), uid,
E_OFFLINE_STATE_LOCALLY_MODIFIED, NULL, &error));
+ g_assert_true (!e_cache_set_offline_state (E_CACHE (fixture->book_cache), uid,
E_OFFLINE_STATE_LOCALLY_MODIFIED, NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
@@ -606,25 +606,25 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_INCLUDE_DELETED, NULL,
&error), ==, 2);
g_assert_no_error (error);
- g_assert (!e_book_cache_set_contact_extra (fixture->book_cache, uid, "extra-3", NULL, &error));
+ g_assert_true (!e_book_cache_set_contact_extra (fixture->book_cache, uid, "extra-3", NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
- g_assert (!e_book_cache_get_contact_extra (fixture->book_cache, uid, &saved_extra, NULL, &error));
+ g_assert_true (!e_book_cache_get_contact_extra (fixture->book_cache, uid, &saved_extra, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_assert_null (saved_extra);
g_clear_error (&error);
- g_assert (!e_book_cache_get_uids_with_extra (fixture->book_cache, "extra-3", &uids, NULL, &error));
+ g_assert_true (!e_book_cache_get_uids_with_extra (fixture->book_cache, "extra-3", &uids, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_assert_null (uids);
g_clear_error (&error);
- g_assert (!e_book_cache_set_contact_custom_flags (fixture->book_cache, uid, 456, NULL, &error));
+ g_assert_true (!e_book_cache_set_contact_custom_flags (fixture->book_cache, uid, 456, NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
- g_assert (!e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
+ g_assert_true (!e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
@@ -655,7 +655,7 @@ test_offline_add_one (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_UNKNOWN);
/* Add a contact in offline */
- g_assert (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 0,
E_CACHE_IS_OFFLINE, NULL, &error));
+ g_assert_true (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 0,
E_CACHE_IS_OFFLINE, NULL, &error));
g_assert_no_error (error);
} else {
uid = case_name;
@@ -734,7 +734,7 @@ test_offline_add_edit (TCUFixture *fixture,
/* Modify added in offline */
e_contact_set (contact, E_CONTACT_REV, "rev-2");
- g_assert (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
test_offline_add_one (fixture, "simple-1", 4, EXPECT_SIMPLE_1 | EXPECT_CUSTOM_1 | SKIP_CONTACT_PUT,
NULL);
@@ -778,10 +778,10 @@ test_offline_add_delete (TCUFixture *fixture,
/* Delete added in offline */
- g_assert (e_book_cache_remove_contact (fixture->book_cache, uid, 1, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, uid, 1, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
- g_assert (!e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
+ g_assert_true (!e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
@@ -791,21 +791,21 @@ test_offline_add_delete (TCUFixture *fixture,
/* Add in online */
- g_assert (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 333, E_CACHE_IS_ONLINE, NULL,
&error));
+ g_assert_true (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 333, E_CACHE_IS_ONLINE,
NULL, &error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
+ g_assert_true (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 333);
/* Delete in offline */
- g_assert (e_book_cache_remove_contact (fixture->book_cache, uid, 246, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, uid, 246, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
+ g_assert_true (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 246);
@@ -840,7 +840,7 @@ test_offline_add_delete_add (TCUFixture *fixture,
g_assert_nonnull (uid);
/* Delete added in offline */
- g_assert (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
test_offline_add_one (fixture, "simple-1", 3, EXPECT_CUSTOM_1 | SKIP_CONTACT_PUT, NULL);
@@ -879,7 +879,7 @@ test_offline_add_resync (TCUFixture *fixture,
NULL);
/* Resync all offline changes */
- g_assert (e_cache_clear_offline_changes (E_CACHE (fixture->book_cache), NULL, &error));
+ g_assert_true (e_cache_clear_offline_changes (E_CACHE (fixture->book_cache), NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 4);
@@ -913,18 +913,18 @@ test_offline_edit_common (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_SYNCED);
custom_flags = 0;
- g_assert (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
+ g_assert_true (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 0);
/* Modify in offline */
e_contact_set (contact, E_CONTACT_REV, "rev-2");
- g_assert (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 369, E_CACHE_IS_OFFLINE,
NULL, &error));
+ g_assert_true (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 369, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
+ g_assert_true (e_book_cache_get_contact_custom_flags (fixture->book_cache, uid, &custom_flags, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 369);
@@ -963,7 +963,7 @@ test_offline_edit_delete (TCUFixture *fixture,
test_offline_edit_common (fixture, &uid);
/* Delete the modified contact in offline */
- g_assert (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 2);
@@ -976,7 +976,7 @@ test_offline_edit_delete (TCUFixture *fixture,
NULL);
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_LOCALLY_DELETED);
- g_assert (!e_book_cache_get_contact (fixture->book_cache, uid, FALSE, &contact, NULL, &error));
+ g_assert_true (!e_book_cache_get_contact (fixture->book_cache, uid, FALSE, &contact, NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_assert_null (contact);
@@ -994,7 +994,7 @@ test_offline_edit_resync (TCUFixture *fixture,
test_offline_edit_common (fixture, &uid);
/* Resync all offline changes */
- g_assert (e_cache_clear_offline_changes (E_CACHE (fixture->book_cache), NULL, &error));
+ g_assert_true (e_cache_clear_offline_changes (E_CACHE (fixture->book_cache), NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
@@ -1029,7 +1029,7 @@ test_offline_delete (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_SYNCED);
/* Delete in offline */
- g_assert (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 2);
@@ -1068,7 +1068,7 @@ test_offline_delete_add (TCUFixture *fixture,
/* Delete locally created in offline */
test_offline_add_one (fixture, "simple-1", 4, EXPECT_SIMPLE_1 | EXPECT_CUSTOM_1, NULL);
- g_assert (e_book_cache_remove_contact (fixture->book_cache, "simple-1", 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, "simple-1", 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
@@ -1081,7 +1081,7 @@ test_offline_delete_add (TCUFixture *fixture,
test_check_offline_state (fixture, "simple-1", E_OFFLINE_STATE_UNKNOWN);
/* Delete synced in offline */
- g_assert (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 2);
@@ -1108,7 +1108,7 @@ test_offline_delete_add (TCUFixture *fixture,
/* Modify the previous contact and add it again */
e_contact_set (contact, E_CONTACT_REV, "rev-3");
- g_assert (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_put_contact (fixture->book_cache, contact, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 4);
@@ -1150,7 +1150,7 @@ test_offline_delete_resync (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_SYNCED);
/* Delete in offline */
- g_assert (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_book_cache_remove_contact (fixture->book_cache, uid, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->book_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 2);
@@ -1193,7 +1193,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
g_test_add ("/EBookCache/Offline/Basics", TCUFixture, &closure,
diff --git a/tests/libedata-book/test-book-cache-utils.c b/tests/libedata-book/test-book-cache-utils.c
index 7be44e4dc..91ce4a0b0 100644
--- a/tests/libedata-book/test-book-cache-utils.c
+++ b/tests/libedata-book/test-book-cache-utils.c
@@ -141,9 +141,9 @@ delete_work_directory (const gchar *filename)
NULL, (gchar **) argv, NULL, 0, NULL, NULL,
NULL, NULL, &exit_status, NULL);
- g_assert (spawn_succeeded);
+ g_assert_true (spawn_succeeded);
#ifndef G_OS_WIN32
- g_assert (WIFEXITED (exit_status));
+ g_assert_true (WIFEXITED (exit_status));
g_assert_cmpint (WEXITSTATUS (exit_status), ==, 0);
#else
g_assert_cmpint (exit_status, ==, 0);
@@ -369,7 +369,7 @@ tcu_assert_contacts_order (GSList *results,
gchar *uid;
va_list args;
- g_assert (first_uid);
+ g_assert_true (first_uid);
uids = g_slist_append (uids, (gpointer) first_uid);
diff --git a/tests/libedata-book/test-book-meta-backend.c b/tests/libedata-book/test-book-meta-backend.c
index dd7ca91c2..ad8614c75 100644
--- a/tests/libedata-book/test-book-meta-backend.c
+++ b/tests/libedata-book/test-book-meta-backend.c
@@ -126,9 +126,9 @@ ebmb_test_hash_contains (GHashTable *contacts, /* gchar *uid ~> EContact * */
while (g_hash_table_iter_next (&iter, &uid, NULL)) {
if (exact) {
if (negate)
- g_assert (!g_hash_table_remove (expects, uid));
+ g_assert_true (!g_hash_table_remove (expects, uid));
else
- g_assert (g_hash_table_remove (expects, uid));
+ g_assert_true (g_hash_table_remove (expects, uid));
} else {
g_hash_table_remove (expects, uid);
}
@@ -203,7 +203,7 @@ ebmb_test_cache_and_server_equal (EBookCache *book_cache,
g_hash_table_iter_init (&iter, contacts);
while (g_hash_table_iter_next (&iter, &uid, NULL)) {
- g_assert (e_cache_contains (cache, uid, deleted_flag));
+ g_assert_true (e_cache_contains (cache, uid, deleted_flag));
}
}
@@ -349,7 +349,7 @@ e_book_meta_backend_test_list_existing_sync (EBookMetaBackend *meta_backend,
test_backend = E_BOOK_META_BACKEND_TEST (meta_backend);
test_backend->list_count++;
- g_assert (test_backend->is_connected);
+ g_assert_true (test_backend->is_connected);
*out_existing_objects = NULL;
@@ -393,7 +393,7 @@ e_book_meta_backend_test_save_contact_sync (EBookMetaBackend *meta_backend,
test_backend = E_BOOK_META_BACKEND_TEST (meta_backend);
test_backend->save_count++;
- g_assert (test_backend->is_connected);
+ g_assert_true (test_backend->is_connected);
uid = e_contact_get_const (contact, E_CONTACT_UID);
g_assert_nonnull (uid);
@@ -435,7 +435,7 @@ e_book_meta_backend_test_load_contact_sync (EBookMetaBackend *meta_backend,
test_backend = E_BOOK_META_BACKEND_TEST (meta_backend);
test_backend->load_count++;
- g_assert (test_backend->is_connected);
+ g_assert_true (test_backend->is_connected);
*out_contact = g_hash_table_lookup (test_backend->contacts, uid);
@@ -470,7 +470,7 @@ e_book_meta_backend_test_remove_contact_sync (EBookMetaBackend *meta_backend,
test_backend = E_BOOK_META_BACKEND_TEST (meta_backend);
test_backend->remove_count++;
- g_assert (test_backend->is_connected);
+ g_assert_true (test_backend->is_connected);
success = g_hash_table_remove (test_backend->contacts, uid);
if (success) {
@@ -587,7 +587,7 @@ e_book_meta_backend_test_new (EBookCache *cache)
gboolean success;
GError *error = NULL;
- g_assert (E_IS_BOOK_CACHE (cache));
+ g_assert_true (E_IS_BOOK_CACHE (cache));
g_assert_nonnull (glob_registry);
g_assert_null (glob_use_cache);
@@ -604,7 +604,7 @@ e_book_meta_backend_test_new (EBookCache *cache)
NULL);
g_assert_nonnull (meta_backend);
- g_assert (glob_use_cache == cache);
+ g_assert_true (glob_use_cache == cache);
glob_use_cache = NULL;
g_object_unref (scratch);
@@ -618,7 +618,7 @@ e_book_meta_backend_test_new (EBookCache *cache)
g_free (extra);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
}
return meta_backend;
@@ -678,7 +678,7 @@ e_book_meta_backend_test_call_refresh (EBookMetaBackend *meta_backend)
success = backend_sync_class->refresh_sync (E_BOOK_BACKEND_SYNC (meta_backend), NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
e_flag_wait (flag);
e_flag_free (flag);
@@ -701,9 +701,9 @@ test_one_photo (EBookMetaBackend *meta_backend,
gboolean success;
GError *error = NULL;
- g_assert (E_IS_BOOK_META_BACKEND (meta_backend));
+ g_assert_true (E_IS_BOOK_META_BACKEND (meta_backend));
g_assert_nonnull (test_case);
- g_assert (field == E_CONTACT_PHOTO || field == E_CONTACT_LOGO);
+ g_assert_true (field == E_CONTACT_PHOTO || field == E_CONTACT_LOGO);
contact = tcu_new_contact_from_test_case (test_case);
g_assert_nonnull (contact);
@@ -725,7 +725,7 @@ test_one_photo (EBookMetaBackend *meta_backend,
success = e_book_meta_backend_store_inline_photos_sync (meta_backend, contact, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
photo = e_contact_get (contact, field);
g_assert_nonnull (photo);
@@ -738,7 +738,7 @@ test_one_photo (EBookMetaBackend *meta_backend,
success = g_file_get_contents (filename, &new_content, &new_len, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (new_content);
g_assert_cmpmem (orig_content, orig_len, new_content, new_len);
@@ -749,7 +749,7 @@ test_one_photo (EBookMetaBackend *meta_backend,
success = e_book_meta_backend_inline_local_photos_sync (meta_backend, contact, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
photo = e_contact_get (contact, field);
g_assert_nonnull (photo);
@@ -781,7 +781,7 @@ test_one_photo (EBookMetaBackend *meta_backend,
success = e_book_meta_backend_store_inline_photos_sync (meta_backend, contact, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
photo = e_contact_get (contact, field);
g_assert_nonnull (photo);
@@ -791,7 +791,7 @@ test_one_photo (EBookMetaBackend *meta_backend,
success = e_book_meta_backend_inline_local_photos_sync (meta_backend, contact, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
photo = e_contact_get (contact, field);
g_assert_nonnull (photo);
@@ -836,7 +836,7 @@ test_empty_cache (TCUFixture *fixture,
uids = NULL;
success = e_book_cache_search_uids (fixture->book_cache, NULL, &uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (uids), >, 0);
g_slist_free_full (uids, g_free);
@@ -846,13 +846,13 @@ test_empty_cache (TCUFixture *fixture,
/* Empty the cache */
success = e_book_meta_backend_empty_cache_sync (meta_backend, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
/* Verify the cache is truly empty */
uids = NULL;
success = e_book_cache_search_uids (fixture->book_cache, NULL, &uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (uids), ==, 0);
g_slist_free_full (uids, g_free);
@@ -892,7 +892,7 @@ test_create_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->create_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &new_contacts, NULL, &error);
g_assert_error (error, E_BOOK_CLIENT_ERROR, E_BOOK_CLIENT_ERROR_CONTACT_ID_ALREADY_EXISTS);
- g_assert (!success);
+ g_assert_true (!success);
g_assert_cmpint (g_slist_length (new_contacts), ==, 0);
g_clear_error (&error);
g_free (vcards[0]);
@@ -905,7 +905,7 @@ test_create_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->create_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &new_contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (new_contacts), ==, 1);
g_assert_cmpstr (e_contact_get_const (new_contacts->data, E_CONTACT_UID), ==, "custom-7");
g_assert_cmpint (test_backend->connect_count, ==, 1);
@@ -930,7 +930,7 @@ test_create_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->create_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &new_contacts, NULL, &error);
g_assert_error (error, E_BOOK_CLIENT_ERROR, E_BOOK_CLIENT_ERROR_CONTACT_ID_ALREADY_EXISTS);
- g_assert (!success);
+ g_assert_true (!success);
g_assert_cmpint (g_slist_length (new_contacts), ==, 0);
g_clear_error (&error);
g_free (vcards[0]);
@@ -943,7 +943,7 @@ test_create_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->create_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &new_contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (new_contacts), ==, 1);
g_assert_cmpstr (e_contact_get_const (new_contacts->data, E_CONTACT_UID), ==, "custom-8");
g_assert_cmpint (test_backend->connect_count, ==, 0);
@@ -982,7 +982,7 @@ test_create_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->create_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &new_contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (new_contacts), ==, 1);
g_assert_cmpstr (e_contact_get_const (new_contacts->data, E_CONTACT_UID), !=, "custom-9");
g_assert_cmpint (test_backend->connect_count, ==, 1);
@@ -1067,7 +1067,7 @@ test_modify_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->modify_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &new_contacts, NULL, &error);
g_assert_error (error, E_BOOK_CLIENT_ERROR, E_BOOK_CLIENT_ERROR_CONTACT_NOT_FOUND);
- g_assert (!success);
+ g_assert_true (!success);
g_assert_cmpint (g_slist_length (new_contacts), ==, 0);
g_clear_error (&error);
g_free (vcards[0]);
@@ -1078,7 +1078,7 @@ test_modify_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->modify_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &new_contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (new_contacts), ==, 1);
g_assert_cmpint (test_backend->load_count, ==, 1);
g_assert_cmpint (test_backend->save_count, ==, 1);
@@ -1119,7 +1119,7 @@ test_modify_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->modify_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &new_contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (new_contacts), ==, 1);
g_assert_cmpint (test_backend->load_count, ==, 0);
g_assert_cmpint (test_backend->save_count, ==, 0);
@@ -1193,7 +1193,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->remove_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) uids, E_BOOK_OPERATION_FLAG_NONE, &removed_uids, NULL, &error);
g_assert_error (error, E_BOOK_CLIENT_ERROR, E_BOOK_CLIENT_ERROR_CONTACT_NOT_FOUND);
- g_assert (!success);
+ g_assert_true (!success);
g_assert_null (removed_uids);
g_clear_error (&error);
@@ -1203,7 +1203,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->remove_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) uids, E_BOOK_OPERATION_FLAG_NONE, &removed_uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (test_backend->load_count, ==, 0);
g_assert_cmpint (test_backend->save_count, ==, 0);
g_assert_cmpint (test_backend->remove_count, ==, 1);
@@ -1227,7 +1227,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->remove_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) uids, E_BOOK_OPERATION_FLAG_NONE, &removed_uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (test_backend->load_count, ==, 0);
g_assert_cmpint (test_backend->save_count, ==, 0);
g_assert_cmpint (test_backend->remove_count, ==, 0);
@@ -1268,7 +1268,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = e_cache_set_offline_state (E_CACHE (book_cache), uids[0], E_OFFLINE_STATE_LOCALLY_CREATED,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
state = e_cache_get_offline_state (E_CACHE (book_cache), uids[0], NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (state, ==, E_OFFLINE_STATE_LOCALLY_CREATED);
@@ -1276,7 +1276,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->remove_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) uids, E_BOOK_OPERATION_FLAG_NONE, &removed_uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (test_backend->load_count, ==, 0);
g_assert_cmpint (test_backend->save_count, ==, 0);
g_assert_cmpint (test_backend->remove_count, ==, 1);
@@ -1297,7 +1297,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = e_cache_set_offline_state (E_CACHE (book_cache), uids[0], E_OFFLINE_STATE_LOCALLY_MODIFIED,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
state = e_cache_get_offline_state (E_CACHE (book_cache), uids[0], NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (state, ==, E_OFFLINE_STATE_LOCALLY_MODIFIED);
@@ -1305,7 +1305,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->remove_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) uids, E_BOOK_OPERATION_FLAG_NONE, &removed_uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (test_backend->load_count, ==, 0);
g_assert_cmpint (test_backend->save_count, ==, 0);
g_assert_cmpint (test_backend->remove_count, ==, 2);
@@ -1326,7 +1326,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = e_cache_set_offline_state (E_CACHE (book_cache), uids[0], E_OFFLINE_STATE_LOCALLY_DELETED,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
state = e_cache_get_offline_state (E_CACHE (book_cache), uids[0], NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (state, ==, E_OFFLINE_STATE_LOCALLY_DELETED);
@@ -1334,7 +1334,7 @@ test_remove_contacts (EBookMetaBackend *meta_backend)
success = backend_sync_class->remove_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) uids, E_BOOK_OPERATION_FLAG_NONE, &removed_uids, NULL, &error);
g_assert_error (error, E_BOOK_CLIENT_ERROR, E_BOOK_CLIENT_ERROR_CONTACT_NOT_FOUND);
- g_assert (!success);
+ g_assert_true (!success);
g_assert_null (removed_uids);
g_clear_error (&error);
@@ -1392,7 +1392,7 @@ test_get_contact (EBookMetaBackend *meta_backend)
/* Going offline */
e_book_meta_backend_test_change_online (meta_backend, FALSE);
- g_assert (!e_cache_contains (E_CACHE (book_cache), "custom-5", E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (!e_cache_contains (E_CACHE (book_cache), "custom-5", E_CACHE_EXCLUDE_DELETED));
e_book_meta_backend_test_reset_counters (test_backend);
@@ -1407,7 +1407,7 @@ test_get_contact (EBookMetaBackend *meta_backend)
/* Going online */
e_book_meta_backend_test_change_online (meta_backend, TRUE);
- g_assert (e_cache_contains (E_CACHE (book_cache), "custom-5", E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (e_cache_contains (E_CACHE (book_cache), "custom-5", E_CACHE_EXCLUDE_DELETED));
/* Remove it from the cache, thus it's loaded from the "server" on demand */
e_book_cache_remove_contact (book_cache, "custom-5", 0, E_CACHE_IS_ONLINE, NULL, &error);
@@ -1426,7 +1426,7 @@ test_get_contact (EBookMetaBackend *meta_backend)
g_assert_cmpstr (e_contact_get_const (contact, E_CONTACT_UID), ==, "custom-5");
g_object_unref (contact);
- g_assert (e_cache_contains (E_CACHE (book_cache), "custom-5", E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (e_cache_contains (E_CACHE (book_cache), "custom-5", E_CACHE_EXCLUDE_DELETED));
g_object_unref (book_cache);
}
@@ -1449,13 +1449,13 @@ test_get_contact_list (EBookMetaBackend *meta_backend)
success = backend_sync_class->get_contact_list_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"(is \"uid\" \"unknown-contact\")", &contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (contacts), ==, 0);
success = backend_sync_class->get_contact_list_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"(is \"uid\" \"custom-3\")", &contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (contacts), ==, 1);
contact = contacts->data;
g_assert_nonnull (contact);
@@ -1480,13 +1480,13 @@ test_get_contact_list_uids (EBookMetaBackend *meta_backend)
success = backend_sync_class->get_contact_list_uids_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"(is \"uid\" \"unknown-contact\")", &uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (uids), ==, 0);
success = backend_sync_class->get_contact_list_uids_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"(is \"uid\" \"custom-3\")", &uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (uids), ==, 1);
g_assert_nonnull (uids->data);
g_assert_cmpstr (uids->data, ==, "custom-3");
@@ -1707,7 +1707,7 @@ test_cursor (EBookMetaBackend *meta_backend)
success = backend_sync_class->create_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (contacts), ==, 1);
g_slist_free_full (contacts, g_object_unref);
contacts = NULL;
@@ -1721,7 +1721,7 @@ test_cursor (EBookMetaBackend *meta_backend)
success = backend_sync_class->modify_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) vcards, E_BOOK_OPERATION_FLAG_NONE, &contacts, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (contacts), ==, 1);
g_slist_free_full (contacts, g_object_unref);
contacts = NULL;
@@ -1735,7 +1735,7 @@ test_cursor (EBookMetaBackend *meta_backend)
success = backend_sync_class->remove_contacts_sync (E_BOOK_BACKEND_SYNC (meta_backend),
(const gchar * const *) uids, E_BOOK_OPERATION_FLAG_NONE, &removed_uids, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_slist_length (removed_uids), ==, 1);
g_assert_cmpstr (removed_uids->data, ==, uids[0]);
g_slist_free_full (removed_uids, g_free);
@@ -1747,7 +1747,7 @@ test_cursor (EBookMetaBackend *meta_backend)
/* Free the cursor */
success = backend_class->impl_delete_cursor (E_BOOK_BACKEND (meta_backend), cursor, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
}
static void
@@ -1766,27 +1766,27 @@ test_contains_email (EBookMetaBackend *meta_backend)
success = backend_sync_class->contains_email_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"bobby brown com", NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
success = backend_sync_class->contains_email_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"\"Bobby\" <bobby brown org>", NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
success = backend_sync_class->contains_email_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"\"Unknown\" <unknown@no.where>", NULL, &error);
g_assert_no_error (error);
- g_assert (!success);
+ g_assert_true (!success);
success = backend_sync_class->contains_email_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"\"Unknown\" <unknown@no.where>, \"Bobby\" <bobby brown org>", NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
success = backend_sync_class->contains_email_sync (E_BOOK_BACKEND_SYNC (meta_backend),
"", NULL, &error);
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_CONSTRAINT);
- g_assert (!success);
+ g_assert_true (!success);
g_clear_error (&error);
}
@@ -1911,7 +1911,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
e_test_server_utils_prepare_run (argc, argv, 0);
diff --git a/tests/libedata-book/test-sqlite-create-cursor.c b/tests/libedata-book/test-sqlite-create-cursor.c
index 3e740fcc8..3b240ff19 100644
--- a/tests/libedata-book/test-sqlite-create-cursor.c
+++ b/tests/libedata-book/test-sqlite-create-cursor.c
@@ -36,7 +36,7 @@ test_create_cursor_empty_query (EbSqlFixture *fixture,
fixture->ebsql, NULL,
sort_fields, sort_types, 2, &error);
- g_assert (cursor != NULL);
+ g_assert_true (cursor != NULL);
e_book_sqlite_cursor_free (fixture->ebsql, cursor);
}
@@ -58,7 +58,7 @@ test_create_cursor_valid_query (EbSqlFixture *fixture,
fixture->ebsql, sexp,
sort_fields, sort_types, 2, &error);
- g_assert (cursor != NULL);
+ g_assert_true (cursor != NULL);
e_book_sqlite_cursor_free (fixture->ebsql, cursor);
g_free (sexp);
e_book_query_unref (query);
@@ -77,7 +77,7 @@ test_create_cursor_invalid_sort (EbSqlFixture *fixture,
fixture->ebsql, NULL,
sort_fields, sort_types, 1, &error);
- g_assert (cursor == NULL);
+ g_assert_true (cursor == NULL);
g_assert_error (error, E_BOOK_SQLITE_ERROR, E_BOOK_SQLITE_ERROR_INVALID_QUERY);
g_clear_error (&error);
}
@@ -91,7 +91,7 @@ test_create_cursor_missing_sort (EbSqlFixture *fixture,
cursor = e_book_sqlite_cursor_new (fixture->ebsql, NULL, NULL, NULL, 0, &error);
- g_assert (cursor == NULL);
+ g_assert_true (cursor == NULL);
g_assert_error (error, E_BOOK_SQLITE_ERROR, E_BOOK_SQLITE_ERROR_INVALID_QUERY);
g_clear_error (&error);
}
@@ -109,7 +109,7 @@ main (gint argc,
data_test_utils_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
g_test_add (
diff --git a/tests/libedata-book/test-sqlite-cursor-set-sexp.c
b/tests/libedata-book/test-sqlite-cursor-set-sexp.c
index 5b1fb7cdd..c68628de1 100644
--- a/tests/libedata-book/test-sqlite-cursor-set-sexp.c
+++ b/tests/libedata-book/test-sqlite-cursor-set-sexp.c
@@ -44,7 +44,7 @@ test_cursor_sexp_calculate_position (EbSqlCursorFixture *fixture,
/* Ensure we moved to the right contact */
node = g_slist_last (results);
- g_assert (node);
+ g_assert_true (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-16");
g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
@@ -107,7 +107,7 @@ test_cursor_sexp_and_step (EbSqlCursorFixture *fixture,
/* Ensure we moved to the right contact */
node = g_slist_last (results);
- g_assert (node);
+ g_assert_true (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-8");
g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
@@ -124,7 +124,7 @@ test_cursor_sexp_and_step (EbSqlCursorFixture *fixture,
/* Ensure we moved to the right contact */
node = g_slist_last (results);
- g_assert (node);
+ g_assert_true (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-12");
g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
diff --git a/tests/libedata-book/test-sqlite-get-contact.c b/tests/libedata-book/test-sqlite-get-contact.c
index bd965573b..b15970c58 100644
--- a/tests/libedata-book/test-sqlite-get-contact.c
+++ b/tests/libedata-book/test-sqlite-get-contact.c
@@ -99,7 +99,7 @@ main (gint argc,
data_test_utils_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
for (i = 0; i < G_N_ELEMENTS (closures); i++)
diff --git a/tests/libedata-cal/test-cal-cache-getters.c b/tests/libedata-cal/test-cal-cache-getters.c
index 7d6906a2e..4ca52e0a7 100644
--- a/tests/libedata-cal/test-cal-cache-getters.c
+++ b/tests/libedata-cal/test-cal-cache-getters.c
@@ -27,11 +27,11 @@ extract_id_from_component (ECalComponent *component)
{
ECalComponentId *id;
- g_assert (component != NULL);
+ g_assert_true (component != NULL);
id = e_cal_component_get_id (component);
- g_assert (id != NULL);
- g_assert (e_cal_component_id_get_uid (id) != NULL);
+ g_assert_true (id != NULL);
+ g_assert_true (e_cal_component_id_get_uid (id) != NULL);
return id;
}
@@ -42,10 +42,10 @@ extract_id_from_string (const gchar *icalstring)
ECalComponent *component;
ECalComponentId *id;
- g_assert (icalstring != NULL);
+ g_assert_true (icalstring != NULL);
component = e_cal_component_new_from_string (icalstring);
- g_assert (component != NULL);
+ g_assert_true (component != NULL);
id = extract_id_from_component (component);
@@ -69,13 +69,13 @@ test_get_one (ECalCache *cal_cache,
success = e_cal_cache_get_component (cal_cache, uid, rid, &component, NULL, &error);
if (expect_failure) {
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
- g_assert (!success);
- g_assert (!component);
+ g_assert_true (!success);
+ g_assert_true (!component);
g_clear_error (&error);
} else {
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (component);
id = extract_id_from_component (component);
@@ -90,13 +90,13 @@ test_get_one (ECalCache *cal_cache,
success = e_cal_cache_get_component_as_string (cal_cache, uid, rid, &icalstring, NULL, &error);
if (expect_failure) {
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
- g_assert (!success);
- g_assert (!icalstring);
+ g_assert_true (!success);
+ g_assert_true (!icalstring);
g_clear_error (&error);
} else {
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (icalstring);
id = extract_id_from_string (icalstring);
@@ -159,13 +159,13 @@ test_get_all (ECalCache *cal_cache,
success = e_cal_cache_get_components_by_uid (cal_cache, uid, &items, NULL, &error);
if (!g_hash_table_size (expects)) {
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
- g_assert (!success);
- g_assert (!items);
+ g_assert_true (!success);
+ g_assert_true (!items);
g_clear_error (&error);
} else {
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (items);
g_assert_cmpint (g_hash_table_size (expects), ==, g_slist_length (items));
@@ -174,7 +174,7 @@ test_get_all (ECalCache *cal_cache,
id = extract_id_from_component (link->data);
g_assert_cmpstr (e_cal_component_id_get_uid (id), ==, uid);
- g_assert (g_hash_table_contains (expects, id));
+ g_assert_true (g_hash_table_contains (expects, id));
e_cal_component_id_free (id);
}
@@ -187,13 +187,13 @@ test_get_all (ECalCache *cal_cache,
success = e_cal_cache_get_components_by_uid_as_string (cal_cache, uid, &items, NULL, &error);
if (!g_hash_table_size (expects)) {
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
- g_assert (!success);
- g_assert (!items);
+ g_assert_true (!success);
+ g_assert_true (!items);
g_clear_error (&error);
} else {
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (items);
g_assert_cmpint (g_hash_table_size (expects), ==, g_slist_length (items));
@@ -202,7 +202,7 @@ test_get_all (ECalCache *cal_cache,
id = extract_id_from_string (link->data);
g_assert_cmpstr (e_cal_component_id_get_uid (id), ==, uid);
- g_assert (g_hash_table_contains (expects, id));
+ g_assert_true (g_hash_table_contains (expects, id));
e_cal_component_id_free (id);
}
@@ -239,7 +239,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
g_test_add ("/ECalCache/Getters/One", TCUFixture, &closure_events,
diff --git a/tests/libedata-cal/test-cal-cache-intervals.c b/tests/libedata-cal/test-cal-cache-intervals.c
index ca60dd971..e9696415a 100644
--- a/tests/libedata-cal/test-cal-cache-intervals.c
+++ b/tests/libedata-cal/test-cal-cache-intervals.c
@@ -132,7 +132,7 @@ check_search_results (GSList *ecalcomps,
id = e_cal_component_get_id (comp);
g_assert_nonnull (id);
- g_assert (g_hash_table_contains (from_intervals, id));
+ g_assert_true (g_hash_table_contains (from_intervals, id));
e_cal_component_id_free (id);
}
@@ -213,7 +213,7 @@ test_intervals (TCUFixture *fixture,
start = g_rand_int_range (myrand, 0, 1000);
end = g_rand_int_range (myrand, start, 2000);
comp = create_test_component (start, end);
- g_assert (comp != NULL);
+ g_assert_true (comp != NULL);
interval = g_new (IntervalData, 1);
interval->start = start;
@@ -224,7 +224,7 @@ test_intervals (TCUFixture *fixture,
success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, 0, E_CACHE_IS_ONLINE,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
}
end = _TIME_MAX;
@@ -233,7 +233,7 @@ test_intervals (TCUFixture *fixture,
for (ii = 0; ii < NUM_INTERVALS_OPEN; ii++) {
start = g_rand_int_range (myrand, 0, 1000);
comp = create_test_component (start, end);
- g_assert (comp != NULL);
+ g_assert_true (comp != NULL);
interval = g_new (IntervalData, 1);
interval->start = start;
@@ -244,7 +244,7 @@ test_intervals (TCUFixture *fixture,
success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, 0, E_CACHE_IS_ONLINE,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
}
for (ii = 0; ii < NUM_SEARCHES; ii++) {
@@ -255,7 +255,7 @@ test_intervals (TCUFixture *fixture,
success = e_cal_cache_get_components_in_range (fixture->cal_cache, start, end, &l1, NULL,
&error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
from_intervals = search_in_intervals (zone_cache, intervals, start, end);
@@ -274,7 +274,7 @@ test_intervals (TCUFixture *fixture,
success = e_cal_cache_get_components_in_range (fixture->cal_cache, start, end, &l1, NULL,
&error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
from_intervals = search_in_intervals (zone_cache, intervals, start, end);
@@ -298,12 +298,12 @@ test_intervals (TCUFixture *fixture,
comp = interval->comp;
id = e_cal_component_get_id (comp);
- g_assert (id != NULL);
+ g_assert_true (id != NULL);
success = e_cal_cache_remove_component (fixture->cal_cache,
e_cal_component_id_get_uid (id),
e_cal_component_id_get_rid (id), 0, E_CACHE_IS_ONLINE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
e_cal_component_id_free (id);
@@ -324,7 +324,7 @@ test_intervals (TCUFixture *fixture,
success = e_cal_cache_get_components_in_range (fixture->cal_cache, start, end, &l1, NULL,
&error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
from_intervals = search_in_intervals (zone_cache, intervals, start, end);
@@ -351,7 +351,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
g_test_add ("/ECalCache/Intervals", TCUFixture, NULL,
diff --git a/tests/libedata-cal/test-cal-cache-offline.c b/tests/libedata-cal/test-cal-cache-offline.c
index ce17ade61..66e12a08e 100644
--- a/tests/libedata-cal/test-cal-cache-offline.c
+++ b/tests/libedata-cal/test-cal-cache-offline.c
@@ -63,14 +63,14 @@ test_check_search_result (const GSList *list,
ECalCacheSearchData *sd = link->data;
ECalComponent *component;
- g_assert (sd != NULL);
- g_assert (sd->uid != NULL);
- g_assert (sd->object != NULL);
+ g_assert_true (sd != NULL);
+ g_assert_true (sd->uid != NULL);
+ g_assert_true (sd->object != NULL);
uid = sd->uid;
component = e_cal_component_new_from_string (sd->object);
- g_assert (E_IS_CAL_COMPONENT (component));
+ g_assert_true (E_IS_CAL_COMPONENT (component));
g_assert_cmpstr (uid, ==, e_cal_component_get_uid (component));
g_assert_nonnull (i_cal_component_get_summary (e_cal_component_get_icalcomponent
(component)));
@@ -78,8 +78,8 @@ test_check_search_result (const GSList *list,
} else {
const ECalComponentId *id = link->data;
- g_assert (id != NULL);
- g_assert (e_cal_component_id_get_uid (id) != NULL);
+ g_assert_true (id != NULL);
+ g_assert_true (e_cal_component_id_get_uid (id) != NULL);
uid = e_cal_component_id_get_uid (id);
}
@@ -87,22 +87,22 @@ test_check_search_result (const GSList *list,
g_assert_nonnull (uid);
if (g_str_equal (uid, "event-1")) {
- g_assert (expect_event_1);
- g_assert (!have_event_1);
+ g_assert_true (expect_event_1);
+ g_assert_true (!have_event_1);
have_event_1 = TRUE;
} else if (g_str_equal (uid, "event-2")) {
- g_assert (!have_event_2);
+ g_assert_true (!have_event_2);
have_event_2 = TRUE;
} else if (g_str_equal (uid, "event-3")) {
- g_assert (expect_event_3);
- g_assert (!have_event_3);
+ g_assert_true (expect_event_3);
+ g_assert_true (!have_event_3);
have_event_3 = TRUE;
} else if (g_str_equal (uid, "event-4")) {
- g_assert (expect_event_4);
- g_assert (!have_event_4);
+ g_assert_true (expect_event_4);
+ g_assert_true (!have_event_4);
have_event_4 = TRUE;
} else if (g_str_equal (uid, "event-5")) {
- g_assert (!have_event_5);
+ g_assert_true (!have_event_5);
have_event_5 = TRUE;
} else {
/* It's not supposed to be NULL, but it will print the value of 'uid' */
@@ -110,11 +110,11 @@ test_check_search_result (const GSList *list,
}
}
- g_assert ((expect_event_1 && have_event_1) || (!expect_event_1 && !have_event_1));
- g_assert ((expect_event_2 && have_event_2) || (!expect_event_2 && !have_event_2));
- g_assert ((expect_event_3 && have_event_3) || (!expect_event_3 && !have_event_3));
- g_assert ((expect_event_4 && have_event_4) || (!expect_event_4 && !have_event_4));
- g_assert (have_event_5);
+ g_assert_true ((expect_event_1 && have_event_1) || (!expect_event_1 && !have_event_1));
+ g_assert_true ((expect_event_2 && have_event_2) || (!expect_event_2 && !have_event_2));
+ g_assert_true ((expect_event_3 && have_event_3) || (!expect_event_3 && !have_event_3));
+ g_assert_true ((expect_event_4 && have_event_4) || (!expect_event_4 && !have_event_4));
+ g_assert_true (have_event_5);
}
static void
@@ -132,14 +132,14 @@ test_basic_search (TCUFixture *fixture,
((flags & EXPECT_EVENT_4) != 0 ? 1 : 0);
/* All components first */
- g_assert (e_cal_cache_search (fixture->cal_cache, NULL, &list, NULL, &error));
+ g_assert_true (e_cal_cache_search (fixture->cal_cache, NULL, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, expect_total);
test_check_search_result (list, flags | EXPECT_EVENT_2 | HAS_SEARCH_DATA);
g_slist_free_full (list, e_cal_cache_search_data_free);
list = NULL;
- g_assert (e_cal_cache_search_ids (fixture->cal_cache, NULL, &list, NULL, &error));
+ g_assert_true (e_cal_cache_search_ids (fixture->cal_cache, NULL, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, expect_total);
test_check_search_result (list, flags | EXPECT_EVENT_2);
@@ -149,14 +149,14 @@ test_basic_search (TCUFixture *fixture,
/* Only Party, aka event-5, as an in-summary query */
sexp = "(has-categories? \"Holiday\")";
- g_assert (e_cal_cache_search (fixture->cal_cache, sexp, &list, NULL, &error));
+ g_assert_true (e_cal_cache_search (fixture->cal_cache, sexp, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, HAS_SEARCH_DATA);
g_slist_free_full (list, e_cal_cache_search_data_free);
list = NULL;
- g_assert (e_cal_cache_search_ids (fixture->cal_cache, sexp, &list, NULL, &error));
+ g_assert_true (e_cal_cache_search_ids (fixture->cal_cache, sexp, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, EXPECT_DEFAULT);
@@ -166,14 +166,14 @@ test_basic_search (TCUFixture *fixture,
/* Only Party, aka event-5, as a non-summarised query */
sexp = "(has-alarms-in-range? (make-time \"20091229T230000Z\") (make-time \"20091231T010000Z\"))";
- g_assert (e_cal_cache_search (fixture->cal_cache, sexp, &list, NULL, &error));
+ g_assert_true (e_cal_cache_search (fixture->cal_cache, sexp, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, HAS_SEARCH_DATA);
g_slist_free_full (list, e_cal_cache_search_data_free);
list = NULL;
- g_assert (e_cal_cache_search_ids (fixture->cal_cache, sexp, &list, NULL, &error));
+ g_assert_true (e_cal_cache_search_ids (fixture->cal_cache, sexp, &list, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (list), ==, 1);
test_check_search_result (list, EXPECT_DEFAULT);
@@ -181,12 +181,12 @@ test_basic_search (TCUFixture *fixture,
list = NULL;
/* Invalid expression */
- g_assert (!e_cal_cache_search (fixture->cal_cache, "invalid expression here", &list, NULL, &error));
+ g_assert_true (!e_cal_cache_search (fixture->cal_cache, "invalid expression here", &list, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_INVALID_QUERY);
g_assert_null (list);
g_clear_error (&error);
- g_assert (!e_cal_cache_search_ids (fixture->cal_cache, "invalid expression here", &list, NULL,
&error));
+ g_assert_true (!e_cal_cache_search_ids (fixture->cal_cache, "invalid expression here", &list, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_INVALID_QUERY);
g_assert_null (list);
g_clear_error (&error);
@@ -230,7 +230,7 @@ test_check_offline_changes (TCUFixture *fixture,
gint expect_state;
g_assert_nonnull (change);
- g_assert (g_hash_table_contains (expects, change->uid));
+ g_assert_true (g_hash_table_contains (expects, change->uid));
expect_state = GPOINTER_TO_INT (g_hash_table_lookup (expects, change->uid));
g_assert_cmpint (expect_state, ==, change->state);
@@ -269,7 +269,7 @@ test_check_edit_saved (TCUFixture *fixture,
ECalComponent *component = NULL;
GError *error = NULL;
- g_assert (e_cal_cache_get_component (fixture->cal_cache, uid, NULL, &component, NULL, &error));
+ g_assert_true (e_cal_cache_get_component (fixture->cal_cache, uid, NULL, &component, NULL, &error));
g_assert_no_error (error);
g_assert_nonnull (component);
g_assert_cmpstr (i_cal_component_get_summary (e_cal_component_get_icalcomponent (component)), ==,
summ_value);
@@ -291,13 +291,13 @@ test_verify_storage (TCUFixture *fixture,
if (expect_offline_state == E_OFFLINE_STATE_LOCALLY_DELETED ||
expect_offline_state == E_OFFLINE_STATE_UNKNOWN) {
- g_assert (!e_cal_cache_get_component (fixture->cal_cache, uid, NULL, &component, NULL,
&error));
+ g_assert_true (!e_cal_cache_get_component (fixture->cal_cache, uid, NULL, &component, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_assert_null (component);
g_clear_error (&error);
} else {
- g_assert (e_cal_cache_get_component (fixture->cal_cache, uid, NULL, &component, NULL,
&error));
+ g_assert_true (e_cal_cache_get_component (fixture->cal_cache, uid, NULL, &component, NULL,
&error));
g_assert_no_error (error);
g_assert_nonnull (component);
}
@@ -305,13 +305,13 @@ test_verify_storage (TCUFixture *fixture,
offline_state = test_check_offline_state (fixture, uid, expect_offline_state);
if (offline_state == E_OFFLINE_STATE_UNKNOWN) {
- g_assert (!e_cal_cache_contains (fixture->cal_cache, uid, NULL, E_CACHE_EXCLUDE_DELETED));
- g_assert (!e_cal_cache_contains (fixture->cal_cache, uid, NULL, E_CACHE_INCLUDE_DELETED));
+ g_assert_true (!e_cal_cache_contains (fixture->cal_cache, uid, NULL,
E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (!e_cal_cache_contains (fixture->cal_cache, uid, NULL,
E_CACHE_INCLUDE_DELETED));
test_check_offline_changes (fixture, NULL);
return;
}
- g_assert (e_cal_cache_get_component_extra (fixture->cal_cache, uid, NULL, &saved_extra, NULL,
&error));
+ g_assert_true (e_cal_cache_get_component_extra (fixture->cal_cache, uid, NULL, &saved_extra, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpstr (saved_extra, ==, expect_extra);
@@ -353,7 +353,7 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpstr ("rev-321", ==, tmp);
g_free (tmp);
- g_assert (e_cache_set_key (E_CACHE (fixture->cal_cache), "my-key-str", "key-str-value", &error));
+ g_assert_true (e_cache_set_key (E_CACHE (fixture->cal_cache), "my-key-str", "key-str-value", &error));
g_assert_no_error (error);
tmp = e_cache_dup_key (E_CACHE (fixture->cal_cache), "my-key-str", &error);
@@ -361,7 +361,7 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpstr ("key-str-value", ==, tmp);
g_free (tmp);
- g_assert (e_cache_set_key_int (E_CACHE (fixture->cal_cache), "version", 567, &error));
+ g_assert_true (e_cache_set_key_int (E_CACHE (fixture->cal_cache), "version", 567, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_key_int (E_CACHE (fixture->cal_cache), "version", &error), ==, 567);
@@ -379,17 +379,17 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
g_assert_no_error (error);
- g_assert (e_cal_cache_set_component_extra (fixture->cal_cache, uid, NULL, "extra-0", NULL, &error));
+ g_assert_true (e_cal_cache_set_component_extra (fixture->cal_cache, uid, NULL, "extra-0", NULL,
&error));
g_assert_no_error (error);
- g_assert (e_cal_cache_get_component_extra (fixture->cal_cache, uid, NULL, &saved_extra, NULL,
&error));
+ g_assert_true (e_cal_cache_get_component_extra (fixture->cal_cache, uid, NULL, &saved_extra, NULL,
&error));
g_assert_no_error (error);
g_assert_cmpstr (saved_extra, ==, "extra-0");
g_free (saved_extra);
saved_extra = NULL;
- g_assert (e_cal_cache_get_ids_with_extra (fixture->cal_cache, "extra-0", &ids, NULL, &error));
+ g_assert_true (e_cal_cache_get_ids_with_extra (fixture->cal_cache, "extra-0", &ids, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (ids), ==, 1);
g_assert_nonnull (ids->data);
@@ -406,7 +406,7 @@ test_offline_basics (TCUFixture *fixture,
/* Try change status */
for (ii = 0; ii < G_N_ELEMENTS (states); ii++) {
- g_assert (e_cache_set_offline_state (E_CACHE (fixture->cal_cache), uid, states[ii], NULL,
&error));
+ g_assert_true (e_cache_set_offline_state (E_CACHE (fixture->cal_cache), uid, states[ii],
NULL, &error));
g_assert_no_error (error);
test_check_offline_state (fixture, uid, states[ii]);
@@ -418,23 +418,23 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache),
E_CACHE_EXCLUDE_DELETED, NULL, &error), ==, 2);
g_assert_no_error (error);
- g_assert (!e_cal_cache_contains (fixture->cal_cache, uid, NULL,
E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (!e_cal_cache_contains (fixture->cal_cache, uid, NULL,
E_CACHE_EXCLUDE_DELETED));
- g_assert (e_cal_cache_set_component_extra (fixture->cal_cache, uid, NULL, "extra-1",
NULL, &error));
+ g_assert_true (e_cal_cache_set_component_extra (fixture->cal_cache, uid, NULL,
"extra-1", NULL, &error));
g_assert_no_error (error);
- g_assert (e_cal_cache_get_component_extra (fixture->cal_cache, uid, NULL,
&saved_extra, NULL, &error));
+ g_assert_true (e_cal_cache_get_component_extra (fixture->cal_cache, uid, NULL,
&saved_extra, NULL, &error));
g_assert_no_error (error);
g_assert_cmpstr (saved_extra, ==, "extra-1");
g_free (saved_extra);
saved_extra = NULL;
- g_assert (e_cal_cache_set_component_custom_flags (fixture->cal_cache, uid, NULL, 123,
NULL, &error));
+ g_assert_true (e_cal_cache_set_component_custom_flags (fixture->cal_cache, uid, NULL,
123, NULL, &error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL,
&custom_flags, NULL, &error));
+ g_assert_true (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL,
&custom_flags, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 123);
@@ -444,13 +444,13 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache),
E_CACHE_EXCLUDE_DELETED, NULL, &error), ==, 3);
g_assert_no_error (error);
- g_assert (e_cal_cache_contains (fixture->cal_cache, uid, NULL,
E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (e_cal_cache_contains (fixture->cal_cache, uid, NULL,
E_CACHE_EXCLUDE_DELETED));
/* Search when locally available */
test_basic_search (fixture, EXPECT_EVENT_1);
}
- g_assert (e_cal_cache_contains (fixture->cal_cache, uid, NULL, E_CACHE_INCLUDE_DELETED));
+ g_assert_true (e_cal_cache_contains (fixture->cal_cache, uid, NULL, E_CACHE_INCLUDE_DELETED));
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_INCLUDE_DELETED,
NULL, &error), ==, 3);
g_assert_no_error (error);
@@ -461,7 +461,7 @@ test_offline_basics (TCUFixture *fixture,
/* Edit in online */
i_cal_component_set_summary (e_cal_component_get_icalcomponent (component), "summ-1");
- g_assert (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 0, E_CACHE_IS_ONLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 0, E_CACHE_IS_ONLINE,
NULL, &error));
g_assert_no_error (error);
test_verify_storage (fixture, uid, "summ-1", NULL, E_OFFLINE_STATE_SYNCED);
@@ -469,13 +469,13 @@ test_offline_basics (TCUFixture *fixture,
i_cal_component_set_summary (e_cal_component_get_icalcomponent (component), "summ-2");
- g_assert (e_cal_cache_put_component (fixture->cal_cache, component, "extra-2", 0, E_CACHE_IS_ONLINE,
NULL, &error));
+ g_assert_true (e_cal_cache_put_component (fixture->cal_cache, component, "extra-2", 0,
E_CACHE_IS_ONLINE, NULL, &error));
g_assert_no_error (error);
test_verify_storage (fixture, uid, "summ-2", "extra-2", E_OFFLINE_STATE_SYNCED);
test_check_offline_changes (fixture, NULL);
- g_assert (e_cal_cache_get_ids_with_extra (fixture->cal_cache, "extra-2", &ids, NULL, &error));
+ g_assert_true (e_cal_cache_get_ids_with_extra (fixture->cal_cache, "extra-2", &ids, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (g_slist_length (ids), ==, 1);
g_assert_nonnull (ids->data);
@@ -487,11 +487,11 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
g_assert_no_error (error);
- g_assert (e_cal_cache_set_component_custom_flags (fixture->cal_cache, uid, NULL, 234, NULL, &error));
+ g_assert_true (e_cal_cache_set_component_custom_flags (fixture->cal_cache, uid, NULL, 234, NULL,
&error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags, NULL,
&error));
+ g_assert_true (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 234);
@@ -499,10 +499,10 @@ test_offline_basics (TCUFixture *fixture,
test_basic_search (fixture, EXPECT_EVENT_1);
/* Delete in online */
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_ONLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_ONLINE,
NULL, &error));
g_assert_no_error (error);
- g_assert (!e_cache_set_offline_state (E_CACHE (fixture->cal_cache), uid,
E_OFFLINE_STATE_LOCALLY_MODIFIED, NULL, &error));
+ g_assert_true (!e_cache_set_offline_state (E_CACHE (fixture->cal_cache), uid,
E_OFFLINE_STATE_LOCALLY_MODIFIED, NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
@@ -513,25 +513,25 @@ test_offline_basics (TCUFixture *fixture,
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_INCLUDE_DELETED, NULL,
&error), ==, 2);
g_assert_no_error (error);
- g_assert (!e_cal_cache_set_component_extra (fixture->cal_cache, uid, NULL, "extra-3", NULL, &error));
+ g_assert_true (!e_cal_cache_set_component_extra (fixture->cal_cache, uid, NULL, "extra-3", NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
- g_assert (!e_cal_cache_get_component_extra (fixture->cal_cache, uid, NULL, &saved_extra, NULL,
&error));
+ g_assert_true (!e_cal_cache_get_component_extra (fixture->cal_cache, uid, NULL, &saved_extra, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_assert_null (saved_extra);
g_clear_error (&error);
- g_assert (!e_cal_cache_get_ids_with_extra (fixture->cal_cache, "extra-3", &ids, NULL, &error));
+ g_assert_true (!e_cal_cache_get_ids_with_extra (fixture->cal_cache, "extra-3", &ids, NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_assert_null (ids);
g_clear_error (&error);
- g_assert (!e_cal_cache_set_component_custom_flags (fixture->cal_cache, uid, NULL, 456, NULL, &error));
+ g_assert_true (!e_cal_cache_set_component_custom_flags (fixture->cal_cache, uid, NULL, 456, NULL,
&error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
- g_assert (!e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
+ g_assert_true (!e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
@@ -562,7 +562,7 @@ test_offline_add_one (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_UNKNOWN);
/* Add a component in offline */
- g_assert (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 0,
E_CACHE_IS_OFFLINE, NULL, &error));
+ g_assert_true (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 0,
E_CACHE_IS_OFFLINE, NULL, &error));
g_assert_no_error (error);
} else {
uid = case_name;
@@ -641,7 +641,7 @@ test_offline_add_edit (TCUFixture *fixture,
/* Modify added in offline */
i_cal_component_set_summary (e_cal_component_get_icalcomponent (component), "summ-2");
- g_assert (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
+ g_assert_true (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
test_offline_add_one (fixture, "event-3", 4, EXPECT_EVENT_3 | EXPECT_EVENT_1 | SKIP_COMPONENT_PUT,
NULL);
@@ -685,10 +685,10 @@ test_offline_add_delete (TCUFixture *fixture,
/* Delete added in offline */
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 1, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 1, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
- g_assert (!e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
+ g_assert_true (!e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_clear_error (&error);
@@ -698,21 +698,21 @@ test_offline_add_delete (TCUFixture *fixture,
/* Add in online */
- g_assert (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 333, E_CACHE_IS_ONLINE,
NULL, &error));
+ g_assert_true (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 333,
E_CACHE_IS_ONLINE, NULL, &error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags, NULL,
&error));
+ g_assert_true (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 333);
/* Delete in offline */
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 246, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 246, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags, NULL,
&error));
+ g_assert_true (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 246);
@@ -747,7 +747,7 @@ test_offline_add_delete_add (TCUFixture *fixture,
g_assert_nonnull (uid);
/* Delete added in offline */
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
test_offline_add_one (fixture, "event-3", 3, EXPECT_EVENT_1 | SKIP_COMPONENT_PUT, NULL);
@@ -786,7 +786,7 @@ test_offline_add_resync (TCUFixture *fixture,
NULL);
/* Resync all offline changes */
- g_assert (e_cache_clear_offline_changes (E_CACHE (fixture->cal_cache), NULL, &error));
+ g_assert_true (e_cache_clear_offline_changes (E_CACHE (fixture->cal_cache), NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 4);
@@ -820,18 +820,18 @@ test_offline_edit_common (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_SYNCED);
custom_flags = 0;
- g_assert (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags, NULL,
&error));
+ g_assert_true (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 0);
/* Modify in offline */
i_cal_component_set_summary (e_cal_component_get_icalcomponent (component), "summ-2");
- g_assert (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 369, E_CACHE_IS_OFFLINE,
NULL, &error));
+ g_assert_true (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 369,
E_CACHE_IS_OFFLINE, NULL, &error));
g_assert_no_error (error);
custom_flags = 0;
- g_assert (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags, NULL,
&error));
+ g_assert_true (e_cal_cache_get_component_custom_flags (fixture->cal_cache, uid, NULL, &custom_flags,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (custom_flags, ==, 369);
@@ -870,7 +870,7 @@ test_offline_edit_delete (TCUFixture *fixture,
test_offline_edit_common (fixture, &uid);
/* Delete the modified component in offline */
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 2);
@@ -883,7 +883,7 @@ test_offline_edit_delete (TCUFixture *fixture,
NULL);
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_LOCALLY_DELETED);
- g_assert (!e_cal_cache_get_component (fixture->cal_cache, uid, FALSE, &component, NULL, &error));
+ g_assert_true (!e_cal_cache_get_component (fixture->cal_cache, uid, FALSE, &component, NULL, &error));
g_assert_error (error, E_CACHE_ERROR, E_CACHE_ERROR_NOT_FOUND);
g_assert_null (component);
@@ -901,7 +901,7 @@ test_offline_edit_resync (TCUFixture *fixture,
test_offline_edit_common (fixture, &uid);
/* Resync all offline changes */
- g_assert (e_cache_clear_offline_changes (E_CACHE (fixture->cal_cache), NULL, &error));
+ g_assert_true (e_cache_clear_offline_changes (E_CACHE (fixture->cal_cache), NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
@@ -936,7 +936,7 @@ test_offline_delete (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_SYNCED);
/* Delete in offline */
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 2);
@@ -975,7 +975,7 @@ test_offline_delete_add (TCUFixture *fixture,
/* Delete locally created in offline */
test_offline_add_one (fixture, "event-3", 4, EXPECT_EVENT_3 | EXPECT_EVENT_1, NULL);
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, "event-3", NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, "event-3", NULL, 0,
E_CACHE_IS_OFFLINE, NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
@@ -988,7 +988,7 @@ test_offline_delete_add (TCUFixture *fixture,
test_check_offline_state (fixture, "event-3", E_OFFLINE_STATE_UNKNOWN);
/* Delete synced in offline */
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 2);
@@ -1015,7 +1015,7 @@ test_offline_delete_add (TCUFixture *fixture,
/* Modify the previous component and add it again */
i_cal_component_set_summary (e_cal_component_get_icalcomponent (component), "summ-3");
- g_assert (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
+ g_assert_true (e_cal_cache_put_component (fixture->cal_cache, component, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 4);
@@ -1057,7 +1057,7 @@ test_offline_delete_resync (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_SYNCED);
/* Delete in offline */
- g_assert (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE, NULL,
&error));
+ g_assert_true (e_cal_cache_remove_component (fixture->cal_cache, uid, NULL, 0, E_CACHE_IS_OFFLINE,
NULL, &error));
g_assert_no_error (error);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 2);
@@ -1100,7 +1100,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
g_test_add ("/ECalCache/Offline/Basics", TCUFixture, &closure,
diff --git a/tests/libedata-cal/test-cal-cache-search.c b/tests/libedata-cal/test-cal-cache-search.c
index dfdddbbc5..a008915bc 100644
--- a/tests/libedata-cal/test-cal-cache-search.c
+++ b/tests/libedata-cal/test-cal-cache-search.c
@@ -43,11 +43,11 @@ test_search_manual (ECalCache *cal_cache,
/* Get all the components stored in the summary. */
success = e_cal_cache_search_components (cal_cache, NULL, &components, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (components);
sexp = e_cal_backend_sexp_new (expr);
- g_assert (sexp != NULL);
+ g_assert_true (sexp != NULL);
for (link = components; link; link = g_slist_next (link)) {
ECalComponent *comp = link->data;
@@ -112,7 +112,7 @@ test_search_result_equal (GSList *items,
g_assert_cmpint (g_slist_length (items), ==, g_hash_table_size (should_be));
for (link = items; link; link = g_slist_next (link)) {
- g_assert (check_cb (should_be, link->data));
+ g_assert_true (check_cb (should_be, link->data));
}
}
@@ -124,8 +124,8 @@ search_data_check_cb (GHashTable *should_be,
ECalComponentId *id;
gboolean contains;
- g_assert (sd != NULL);
- g_assert (sd->uid != NULL);
+ g_assert_true (sd != NULL);
+ g_assert_true (sd->uid != NULL);
id = e_cal_component_id_new (sd->uid, sd->rid);
@@ -185,7 +185,7 @@ test_search_expr (TCUFixture *fixture,
success = e_cal_cache_search (fixture->cal_cache, expr, &items, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
dd (test_search_dump_results (items, should_be));
@@ -196,7 +196,7 @@ test_search_expr (TCUFixture *fixture,
success = e_cal_cache_search_components (fixture->cal_cache, expr, &items, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
test_search_result_equal (items, should_be, component_check_cb);
@@ -205,7 +205,7 @@ test_search_expr (TCUFixture *fixture,
success = e_cal_cache_search_ids (fixture->cal_cache, expr, &items, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
if (expects) {
GSList *link;
@@ -485,7 +485,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
g_test_add ("/ECalCache/Search/Uid", TCUFixture, &closure_events,
diff --git a/tests/libedata-cal/test-cal-cache-utils.c b/tests/libedata-cal/test-cal-cache-utils.c
index 8cd3807d6..767e8894c 100644
--- a/tests/libedata-cal/test-cal-cache-utils.c
+++ b/tests/libedata-cal/test-cal-cache-utils.c
@@ -62,9 +62,9 @@ delete_work_directory (const gchar *filename)
NULL, (gchar **) argv, NULL, 0, NULL, NULL,
NULL, NULL, &exit_status, NULL);
- g_assert (spawn_succeeded);
+ g_assert_true (spawn_succeeded);
#ifndef G_OS_WIN32
- g_assert (WIFEXITED (exit_status));
+ g_assert_true (WIFEXITED (exit_status));
g_assert_cmpint (WEXITSTATUS (exit_status), ==, 0);
#else
g_assert_cmpint (exit_status, ==, 0);
diff --git a/tests/libedata-cal/test-cal-meta-backend.c b/tests/libedata-cal/test-cal-meta-backend.c
index 353937fcd..bf6db4a20 100644
--- a/tests/libedata-cal/test-cal-meta-backend.c
+++ b/tests/libedata-cal/test-cal-meta-backend.c
@@ -190,9 +190,9 @@ ecmb_test_vcalendar_contains (ICalComponent *vcalendar,
if (exact) {
if (negate)
- g_assert (!g_hash_table_remove (expects, id));
+ g_assert_true (!g_hash_table_remove (expects, id));
else
- g_assert (g_hash_table_remove (expects, id));
+ g_assert_true (g_hash_table_remove (expects, id));
} else {
g_hash_table_remove (expects, id);
}
@@ -269,7 +269,7 @@ ecmb_test_cache_and_server_equal (ECalCache *cal_cache,
uid = i_cal_component_get_uid (icomp);
rid = ecmb_test_get_rid_as_string (icomp);
- g_assert (e_cal_cache_contains (cal_cache, uid, rid, deleted_flag));
+ g_assert_true (e_cal_cache_contains (cal_cache, uid, rid, deleted_flag));
g_free (rid);
}
@@ -418,7 +418,7 @@ e_cal_meta_backend_test_list_existing_sync (ECalMetaBackend *meta_backend,
test_backend = E_CAL_META_BACKEND_TEST (meta_backend);
test_backend->list_count++;
- g_assert (test_backend->is_connected);
+ g_assert_true (test_backend->is_connected);
cal_cache = e_cal_meta_backend_ref_cache (meta_backend);
g_assert_nonnull (cal_cache);
@@ -474,7 +474,7 @@ e_cal_meta_backend_test_save_component_sync (ECalMetaBackend *meta_backend,
test_backend = E_CAL_META_BACKEND_TEST (meta_backend);
test_backend->save_count++;
- g_assert (test_backend->is_connected);
+ g_assert_true (test_backend->is_connected);
uid = e_cal_component_get_uid (instances->data);
g_assert_nonnull (uid);
@@ -540,7 +540,7 @@ e_cal_meta_backend_test_load_component_sync (ECalMetaBackend *meta_backend,
test_backend = E_CAL_META_BACKEND_TEST (meta_backend);
test_backend->load_count++;
- g_assert (test_backend->is_connected);
+ g_assert_true (test_backend->is_connected);
*out_instances = NULL;
@@ -591,7 +591,7 @@ e_cal_meta_backend_test_remove_component_sync (ECalMetaBackend *meta_backend,
test_backend = E_CAL_META_BACKEND_TEST (meta_backend);
test_backend->remove_count++;
- g_assert (test_backend->is_connected);
+ g_assert_true (test_backend->is_connected);
for (icomp = i_cal_component_get_first_component (test_backend->vcalendar, I_CAL_VEVENT_COMPONENT);
icomp;) {
@@ -731,7 +731,7 @@ e_cal_meta_backend_test_new (ECalCache *cache)
gboolean success;
GError *error = NULL;
- g_assert (E_IS_CAL_CACHE (cache));
+ g_assert_true (E_IS_CAL_CACHE (cache));
g_assert_nonnull (glob_registry);
g_assert_null (glob_use_cache);
@@ -749,7 +749,7 @@ e_cal_meta_backend_test_new (ECalCache *cache)
NULL);
g_assert_nonnull (meta_backend);
- g_assert (glob_use_cache == cache);
+ g_assert_true (glob_use_cache == cache);
glob_use_cache = NULL;
g_object_unref (scratch);
@@ -759,7 +759,7 @@ e_cal_meta_backend_test_new (ECalCache *cache)
#define set_extra_data(_uid, _rid) \
success = e_cal_cache_set_component_extra (cache, _uid, _rid, "extra for " _uid, NULL,
&error); \
g_assert_no_error (error); \
- g_assert (success);
+ g_assert_true (success);
set_extra_data ("event-1", NULL);
set_extra_data ("event-2", NULL);
@@ -861,7 +861,7 @@ test_merge_instances (TCUFixture *fixture,
/* event-1 has only UTC times, with no TZID */
success = e_cal_cache_get_components_by_uid (fixture->cal_cache, "event-1", &instances, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (instances);
/* TZID as is */
@@ -896,7 +896,7 @@ test_merge_instances (TCUFixture *fixture,
/* event-7 has built-in TZID */
success = e_cal_cache_get_components_by_uid (fixture->cal_cache, "event-7", &instances, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (instances);
/* TZID as is */
@@ -956,7 +956,7 @@ test_merge_instances (TCUFixture *fixture,
/* event-6 has TZID-s as locations already and a detached instance */
success = e_cal_cache_get_components_by_uid (fixture->cal_cache, "event-6", &instances, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (instances);
/* TZID as is */
@@ -1045,7 +1045,7 @@ check_attachment_content (ICalAttach *attach,
url = i_cal_attach_get_url (attach);
g_assert_nonnull (url);
- g_assert (g_str_has_prefix (url, "file://"));
+ g_assert_true (g_str_has_prefix (url, "file://"));
filename = g_filename_from_uri (url, NULL, &error);
g_assert_no_error (error);
@@ -1053,7 +1053,7 @@ check_attachment_content (ICalAttach *attach,
success = g_file_get_contents (filename, &content, &content_len, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (content);
g_assert_cmpint (content_len, >, 0);
@@ -1096,7 +1096,7 @@ test_attachments (TCUFixture *fixture,
/* It has a URL attachment */
success = e_cal_cache_get_component (fixture->cal_cache, "event-7", NULL, &comp, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (comp);
icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
@@ -1105,11 +1105,11 @@ test_attachments (TCUFixture *fixture,
prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
+ g_assert_true (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (i_cal_attach_get_is_url (attach));
+ g_assert_true (i_cal_attach_get_is_url (attach));
filename = g_filename_from_uri (i_cal_attach_get_url (attach), NULL, &error);
g_assert_no_error (error);
@@ -1121,13 +1121,13 @@ test_attachments (TCUFixture *fixture,
success = g_file_get_contents (filename, &content, &content_len, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_nonnull (content);
g_assert_cmpint (content_len, >, 0);
success = e_cal_meta_backend_inline_local_attachments_sync (meta_backend, icomp, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 1);
g_object_unref (attach);
@@ -1135,9 +1135,9 @@ test_attachments (TCUFixture *fixture,
prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert (e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
- g_assert (e_cal_util_property_has_parameter (prop, I_CAL_VALUE_PARAMETER));
- g_assert (e_cal_util_property_has_parameter (prop, I_CAL_ENCODING_PARAMETER));
+ g_assert_true (e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
+ g_assert_true (e_cal_util_property_has_parameter (prop, I_CAL_VALUE_PARAMETER));
+ g_assert_true (e_cal_util_property_has_parameter (prop, I_CAL_ENCODING_PARAMETER));
param = i_cal_property_get_first_parameter (prop, I_CAL_FILENAME_PARAMETER);
g_assert_cmpstr (i_cal_parameter_get_filename (param), ==, basename);
@@ -1145,7 +1145,7 @@ test_attachments (TCUFixture *fixture,
attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (!i_cal_attach_get_is_url (attach));
+ g_assert_true (!i_cal_attach_get_is_url (attach));
check_attachment_content (attach, content, content_len);
@@ -1154,14 +1154,14 @@ test_attachments (TCUFixture *fixture,
success = e_cal_meta_backend_store_inline_attachments_sync (meta_backend, icomp, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 1);
prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert (e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
- g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_VALUE_PARAMETER));
- g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_ENCODING_PARAMETER));
+ g_assert_true (e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
+ g_assert_true (!e_cal_util_property_has_parameter (prop, I_CAL_VALUE_PARAMETER));
+ g_assert_true (!e_cal_util_property_has_parameter (prop, I_CAL_ENCODING_PARAMETER));
param = i_cal_property_get_first_parameter (prop, I_CAL_FILENAME_PARAMETER);
g_assert_cmpstr (i_cal_parameter_get_filename (param), ==, basename);
@@ -1169,7 +1169,7 @@ test_attachments (TCUFixture *fixture,
attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (i_cal_attach_get_is_url (attach));
+ g_assert_true (i_cal_attach_get_is_url (attach));
check_attachment_content (attach, content, content_len);
@@ -1186,14 +1186,14 @@ test_attachments (TCUFixture *fixture,
success = e_cal_meta_backend_inline_local_attachments_sync (meta_backend, icomp, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 2);
prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert (e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
- g_assert (e_cal_util_property_has_parameter (prop, I_CAL_VALUE_PARAMETER));
- g_assert (e_cal_util_property_has_parameter (prop, I_CAL_ENCODING_PARAMETER));
+ g_assert_true (e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
+ g_assert_true (e_cal_util_property_has_parameter (prop, I_CAL_VALUE_PARAMETER));
+ g_assert_true (e_cal_util_property_has_parameter (prop, I_CAL_ENCODING_PARAMETER));
param = i_cal_property_get_first_parameter (prop, I_CAL_FILENAME_PARAMETER);
g_assert_cmpstr (i_cal_parameter_get_filename (param), ==, basename);
@@ -1201,7 +1201,7 @@ test_attachments (TCUFixture *fixture,
attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (!i_cal_attach_get_is_url (attach));
+ g_assert_true (!i_cal_attach_get_is_url (attach));
check_attachment_content (attach, content, content_len);
@@ -1211,11 +1211,11 @@ test_attachments (TCUFixture *fixture,
/* Verify the remote URL did not change */
prop = i_cal_component_get_next_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
+ g_assert_true (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (i_cal_attach_get_is_url (attach));
+ g_assert_true (i_cal_attach_get_is_url (attach));
g_assert_cmpstr (i_cal_attach_get_url (attach), ==, REMOTE_URL);
g_object_unref (attach);
@@ -1223,14 +1223,14 @@ test_attachments (TCUFixture *fixture,
success = e_cal_meta_backend_store_inline_attachments_sync (meta_backend, icomp, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 2);
prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert (e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
- g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_VALUE_PARAMETER));
- g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_ENCODING_PARAMETER));
+ g_assert_true (e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
+ g_assert_true (!e_cal_util_property_has_parameter (prop, I_CAL_VALUE_PARAMETER));
+ g_assert_true (!e_cal_util_property_has_parameter (prop, I_CAL_ENCODING_PARAMETER));
param = i_cal_property_get_first_parameter (prop, I_CAL_FILENAME_PARAMETER);
g_assert_cmpstr (i_cal_parameter_get_filename (param), ==, basename);
@@ -1238,7 +1238,7 @@ test_attachments (TCUFixture *fixture,
attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (i_cal_attach_get_is_url (attach));
+ g_assert_true (i_cal_attach_get_is_url (attach));
check_attachment_content (attach, content, content_len);
@@ -1248,11 +1248,11 @@ test_attachments (TCUFixture *fixture,
/* Verify the remote URL did not change */
prop = i_cal_component_get_next_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
+ g_assert_true (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (i_cal_attach_get_is_url (attach));
+ g_assert_true (i_cal_attach_get_is_url (attach));
g_assert_cmpstr (i_cal_attach_get_url (attach), ==, REMOTE_URL);
g_object_unref (attach);
@@ -1322,7 +1322,7 @@ test_empty_cache (TCUFixture *fixture,
zones = NULL;
success = e_cal_cache_list_timezones (fixture->cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 1);
g_list_free (zones);
@@ -1332,13 +1332,13 @@ test_empty_cache (TCUFixture *fixture,
/* Empty the cache */
success = e_cal_meta_backend_empty_cache_sync (meta_backend, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
/* Verify the cache is truly empty */
zones = NULL;
success = e_cal_cache_list_timezones (fixture->cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 0);
g_list_free (zones);
@@ -1481,7 +1481,7 @@ tcmb_get_tzid_ref_count (ECalCache *cal_cache,
success = e_cache_sqlite_select (E_CACHE (cal_cache), stmt, tcmb_get_uint64_cb, &refs, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
e_cache_sqlite_stmt_free (stmt);
@@ -1719,7 +1719,7 @@ test_timezones (ECalMetaBackend *meta_backend)
NULL, NULL, "America/New_York", &tzobj, &error);
g_assert_no_error (error);
g_assert_nonnull (tzobj);
- g_assert (strstr (tzobj, "America/New_York") != NULL);
+ g_assert_true (strstr (tzobj, "America/New_York") != NULL);
g_free (tzobj);
tzobj = NULL;
@@ -1780,7 +1780,7 @@ test_timezones (ECalMetaBackend *meta_backend)
zones = NULL;
success = e_cal_cache_list_timezones (cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 0);
g_list_free (zones);
@@ -1791,12 +1791,12 @@ test_timezones (ECalMetaBackend *meta_backend)
/* Merge with existing */
success = e_cal_meta_backend_gather_timezones_sync (meta_backend, vcalendar, FALSE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
zones = NULL;
success = e_cal_cache_list_timezones (cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 0);
g_list_free (zones);
@@ -1806,7 +1806,7 @@ test_timezones (ECalMetaBackend *meta_backend)
success = e_cal_cache_remove_timezones (cal_cache, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
_e_cal_cache_remove_loaded_timezones (cal_cache);
_e_cal_backend_remove_cached_timezones (E_CAL_BACKEND (meta_backend));
@@ -1825,7 +1825,7 @@ test_timezones (ECalMetaBackend *meta_backend)
/* Remove existing and add the new */
success = e_cal_meta_backend_gather_timezones_sync (meta_backend, vcalendar, TRUE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
_e_cal_cache_remove_loaded_timezones (cal_cache);
_e_cal_backend_remove_cached_timezones (E_CAL_BACKEND (meta_backend));
@@ -1848,7 +1848,7 @@ test_timezones (ECalMetaBackend *meta_backend)
zones = NULL;
success = e_cal_cache_list_timezones (cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 0);
/* Uses TZID1 twice */
@@ -1868,7 +1868,7 @@ test_timezones (ECalMetaBackend *meta_backend)
/* Add a component which uses TZID1, thus it's in the cache */
success = e_cal_cache_put_component (cal_cache, comp, NULL, 0, E_CACHE_IS_ONLINE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_object_unref (comp);
_e_cal_cache_remove_loaded_timezones (cal_cache);
@@ -1876,7 +1876,7 @@ test_timezones (ECalMetaBackend *meta_backend)
zones = NULL;
success = e_cal_cache_list_timezones (cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 1);
g_list_free (zones);
@@ -1903,7 +1903,7 @@ test_timezones (ECalMetaBackend *meta_backend)
/* Add a component which uses TZID1 and TZID2, thus it's in the cache */
success = e_cal_cache_put_component (cal_cache, comp, NULL, 0, E_CACHE_IS_ONLINE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_object_unref (comp);
_e_cal_cache_remove_loaded_timezones (cal_cache);
@@ -1911,7 +1911,7 @@ test_timezones (ECalMetaBackend *meta_backend)
zones = NULL;
success = e_cal_cache_list_timezones (cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 2);
g_list_free (zones);
@@ -1921,7 +1921,7 @@ test_timezones (ECalMetaBackend *meta_backend)
/* Remove in offline doesn't modify timezone cache, because the component is still there */
success = e_cal_cache_remove_component (cal_cache, "tz1", NULL, 0, E_CACHE_IS_OFFLINE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (tcmb_get_tzid_ref_count (cal_cache, TZID1), ==, 3);
g_assert_cmpint (tcmb_get_tzid_ref_count (cal_cache, TZID2), ==, 1);
@@ -1929,14 +1929,14 @@ test_timezones (ECalMetaBackend *meta_backend)
/* Remove in online modifies timezone cache */
success = e_cal_cache_remove_component (cal_cache, "tz1", NULL, 0, E_CACHE_IS_ONLINE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
_e_cal_cache_remove_loaded_timezones (cal_cache);
zones = NULL;
success = e_cal_cache_list_timezones (cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 2);
g_list_free (zones);
@@ -1959,7 +1959,7 @@ test_timezones (ECalMetaBackend *meta_backend)
success = e_cal_cache_put_component (cal_cache, comp, NULL, 0, E_CACHE_IS_ONLINE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_object_unref (comp);
_e_cal_cache_remove_loaded_timezones (cal_cache);
@@ -1967,7 +1967,7 @@ test_timezones (ECalMetaBackend *meta_backend)
zones = NULL;
success = e_cal_cache_list_timezones (cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 1);
g_list_free (zones);
@@ -1977,14 +1977,14 @@ test_timezones (ECalMetaBackend *meta_backend)
/* Finally remove component straight in online, which removed the only one timezone too */
success = e_cal_cache_remove_component (cal_cache, "tz2", NULL, 0, E_CACHE_IS_ONLINE, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
_e_cal_cache_remove_loaded_timezones (cal_cache);
zones = NULL;
success = e_cal_cache_list_timezones (cal_cache, &zones, NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
g_assert_cmpint (g_list_length (zones), ==, 0);
g_assert_cmpint (tcmb_get_tzid_ref_count (cal_cache, TZID1), ==, 0);
@@ -2605,7 +2605,7 @@ test_remove_objects (ECalMetaBackend *meta_backend)
success = e_cache_set_offline_state (E_CACHE (cal_cache), uid, E_OFFLINE_STATE_LOCALLY_CREATED, NULL,
&error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
state = e_cal_cache_get_offline_state (cal_cache, uid, NULL, NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (state, ==, E_OFFLINE_STATE_LOCALLY_CREATED);
@@ -2639,7 +2639,7 @@ test_remove_objects (ECalMetaBackend *meta_backend)
success = e_cache_set_offline_state (E_CACHE (cal_cache), uid, E_OFFLINE_STATE_LOCALLY_MODIFIED,
NULL, &error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
state = e_cal_cache_get_offline_state (cal_cache, uid, NULL, NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (state, ==, E_OFFLINE_STATE_LOCALLY_MODIFIED);
@@ -2673,7 +2673,7 @@ test_remove_objects (ECalMetaBackend *meta_backend)
success = e_cache_set_offline_state (E_CACHE (cal_cache), uid, E_OFFLINE_STATE_LOCALLY_DELETED, NULL,
&error);
g_assert_no_error (error);
- g_assert (success);
+ g_assert_true (success);
state = e_cal_cache_get_offline_state (cal_cache, uid, NULL, NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (state, ==, E_OFFLINE_STATE_LOCALLY_DELETED);
@@ -3627,8 +3627,8 @@ test_get_object (ECalMetaBackend *meta_backend)
g_assert_no_error (error);
g_assert_nonnull (calobj);
- g_assert (strstr (calobj, "UID:event-6"));
- g_assert (strstr (calobj, "RECURRENCE-ID;TZID=America/New_York:20170225T134900"));
+ g_assert_true (strstr (calobj, "UID:event-6"));
+ g_assert_true (strstr (calobj, "RECURRENCE-ID;TZID=America/New_York:20170225T134900"));
icomp = i_cal_component_new_from_string (calobj);
g_assert_nonnull (icomp);
@@ -3645,8 +3645,8 @@ test_get_object (ECalMetaBackend *meta_backend)
g_assert_no_error (error);
g_assert_nonnull (calobj);
- g_assert (strstr (calobj, "UID:event-6"));
- g_assert (strstr (calobj, "RECURRENCE-ID;TZID=America/New_York:20170225T134900"));
+ g_assert_true (strstr (calobj, "UID:event-6"));
+ g_assert_true (strstr (calobj, "RECURRENCE-ID;TZID=America/New_York:20170225T134900"));
icomp = i_cal_component_new_from_string (calobj);
g_assert_nonnull (icomp);
@@ -3659,7 +3659,7 @@ test_get_object (ECalMetaBackend *meta_backend)
/* Going offline */
e_cal_meta_backend_test_change_online (meta_backend, FALSE);
- g_assert (!e_cal_cache_contains (cal_cache, "event-7", NULL, E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (!e_cal_cache_contains (cal_cache, "event-7", NULL, E_CACHE_EXCLUDE_DELETED));
e_cal_meta_backend_test_reset_counters (test_backend);
@@ -3675,7 +3675,7 @@ test_get_object (ECalMetaBackend *meta_backend)
/* Going online */
e_cal_meta_backend_test_change_online (meta_backend, TRUE);
- g_assert (e_cal_cache_contains (cal_cache, "event-7", NULL, E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (e_cal_cache_contains (cal_cache, "event-7", NULL, E_CACHE_EXCLUDE_DELETED));
/* Remove it from the cache, thus it's loaded from the "server" on demand */
e_cal_cache_remove_component (cal_cache, "event-7", NULL, 0, E_CACHE_IS_ONLINE, NULL, &error);
@@ -3695,7 +3695,7 @@ test_get_object (ECalMetaBackend *meta_backend)
g_assert_nonnull (strstr (calobj, "UID:event-7"));
g_free (calobj);
- g_assert (e_cal_cache_contains (cal_cache, "event-7", NULL, E_CACHE_EXCLUDE_DELETED));
+ g_assert_true (e_cal_cache_contains (cal_cache, "event-7", NULL, E_CACHE_EXCLUDE_DELETED));
g_object_unref (cal_cache);
}
@@ -3723,7 +3723,7 @@ test_get_object_list (ECalMetaBackend *meta_backend)
g_assert_no_error (error);
g_assert_nonnull (calobjs);
g_assert_cmpint (g_slist_length (calobjs), ==, 1);
- g_assert (strstr (calobjs->data, "UID:event-3"));
+ g_assert_true (strstr (calobjs->data, "UID:event-3"));
g_slist_free_full (calobjs, g_free);
calobjs = NULL;
@@ -3732,8 +3732,8 @@ test_get_object_list (ECalMetaBackend *meta_backend)
g_assert_no_error (error);
g_assert_nonnull (calobjs);
g_assert_cmpint (g_slist_length (calobjs), ==, 2);
- g_assert (strstr (calobjs->data, "UID:event-6"));
- g_assert (strstr (calobjs->next->data, "UID:event-6"));
+ g_assert_true (strstr (calobjs->data, "UID:event-6"));
+ g_assert_true (strstr (calobjs->next->data, "UID:event-6"));
g_assert_cmpstr (calobjs->data, !=, calobjs->next->data);
g_slist_free_full (calobjs, g_free);
}
@@ -4047,7 +4047,7 @@ main (gint argc,
tcu_read_args (argc, argv);
/* Ensure that the client and server get the same locale */
- g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
+ g_assert_true (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
e_test_server_utils_prepare_run (argc, argv, 0);
diff --git a/tests/libedata-cal/test-intervaltree.c b/tests/libedata-cal/test-intervaltree.c
index feccddce7..a66c2fe99 100644
--- a/tests/libedata-cal/test-intervaltree.c
+++ b/tests/libedata-cal/test-intervaltree.c
@@ -412,29 +412,29 @@ mem_test (void)
tree = e_intervaltree_new ();
- g_assert (((GObject *) comp)->ref_count == 1);
+ g_assert_true (((GObject *) comp)->ref_count == 1);
e_intervaltree_insert (tree, start, end, comp);
- g_assert (((GObject *) comp)->ref_count == 2);
+ g_assert_true (((GObject *) comp)->ref_count == 2);
uid = e_cal_component_get_uid (comp);
rid = e_cal_component_get_recurid_as_string (comp);
e_intervaltree_remove (tree, uid, rid);
g_free (rid);
- g_assert (((GObject *) comp)->ref_count == 1);
+ g_assert_true (((GObject *) comp)->ref_count == 1);
e_intervaltree_insert (tree, start, end, comp);
- g_assert (((GObject *) comp)->ref_count == 2);
+ g_assert_true (((GObject *) comp)->ref_count == 2);
clone_comp = e_cal_component_clone (comp);
e_intervaltree_insert (tree, start, end, clone_comp);
- g_assert (((GObject *) comp)->ref_count == 1);
- g_assert (((GObject *) clone_comp)->ref_count == 2);
+ g_assert_true (((GObject *) comp)->ref_count == 1);
+ g_assert_true (((GObject *) clone_comp)->ref_count == 2);
e_intervaltree_destroy (tree);
- g_assert (((GObject *) comp)->ref_count == 1);
- g_assert (((GObject *) clone_comp)->ref_count == 1);
+ g_assert_true (((GObject *) comp)->ref_count == 1);
+ g_assert_true (((GObject *) clone_comp)->ref_count == 1);
g_object_unref (comp);
g_object_unref (clone_comp);
diff --git a/tests/libedataserver/e-user-prompter-test.c b/tests/libedataserver/e-user-prompter-test.c
index 36c87151e..d6d87186c 100644
--- a/tests/libedataserver/e-user-prompter-test.c
+++ b/tests/libedataserver/e-user-prompter-test.c
@@ -34,11 +34,11 @@ static void
test_fixture_setup_session (TestFixture *fixture,
gconstpointer user_data)
{
- g_assert (fixture->prompter == NULL);
- g_assert (fixture->main_loop == NULL);
+ g_assert_true (fixture->prompter == NULL);
+ g_assert_true (fixture->main_loop == NULL);
fixture->prompter = e_user_prompter_new ();
- g_assert (fixture->prompter != NULL);
+ g_assert_true (fixture->prompter != NULL);
fixture->main_loop = g_main_loop_new (NULL, FALSE);
}
@@ -152,8 +152,8 @@ test_trust_prompt (EUserPrompter *prompter)
g_print ("Unknown dialog prompt, result:%d, error: %s\n", result, error ? error->message : "None");
- g_assert (result == -1);
- g_assert (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND));
+ g_assert_true (result == -1);
+ g_assert_true (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND));
g_clear_error (&error);
}
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index dd0fcdc8c..e1674f4aa 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -257,7 +257,7 @@ eds_test_utils_read_args (gint argc,
}
g_assert_nonnull (args_build_dir);
- g_assert (g_file_test (args_build_dir, G_FILE_TEST_IS_DIR));
+ g_assert_true (g_file_test (args_build_dir, G_FILE_TEST_IS_DIR));
}
#define EDS_TEST_WORK_DIR_SUFFIX "tests/test-server-utils/cache"
@@ -280,7 +280,7 @@ eds_test_utils_setenv (const gchar *envvar,
path = eds_test_utils_create_build_path (suffix);
- g_assert (g_setenv (envvar, path, TRUE));
+ g_assert_true (g_setenv (envvar, path, TRUE));
g_free (path);
}
@@ -324,7 +324,7 @@ setup_environment (gint argc,
g_string_append (libs_dir, libs_dir_env);
}
- g_assert (g_setenv ("LD_LIBRARY_PATH", libs_dir->str, TRUE));
+ g_assert_true (g_setenv ("LD_LIBRARY_PATH", libs_dir->str, TRUE));
eds_test_utils_setenv ("XDG_DATA_HOME", EDS_TEST_WORK_DIR_SUFFIX);
eds_test_utils_setenv ("XDG_CACHE_HOME", EDS_TEST_WORK_DIR_SUFFIX);
eds_test_utils_setenv ("XDG_CONFIG_HOME", EDS_TEST_WORK_DIR_SUFFIX);
@@ -335,9 +335,9 @@ setup_environment (gint argc,
eds_test_utils_setenv ("EDS_CAMEL_PROVIDER_DIR", "src/camel/providers/local");
eds_test_utils_setenv ("EDS_SUBPROCESS_CAL_PATH",
"src/calendar/libedata-cal/evolution-calendar-factory-subprocess");
eds_test_utils_setenv ("EDS_SUBPROCESS_BOOK_PATH",
"src/addressbook/libedata-book/evolution-addressbook-factory-subprocess");
- g_assert (g_setenv ("GIO_USE_VFS", "local", TRUE));
- g_assert (g_setenv ("EDS_TESTING", "1", TRUE));
- g_assert (g_setenv ("GSETTINGS_BACKEND", "memory", TRUE));
+ g_assert_true (g_setenv ("GIO_USE_VFS", "local", TRUE));
+ g_assert_true (g_setenv ("EDS_TESTING", "1", TRUE));
+ g_assert_true (g_setenv ("GSETTINGS_BACKEND", "memory", TRUE));
g_unsetenv ("DISPLAY");
@@ -363,9 +363,9 @@ delete_work_directory (void)
NULL, (gchar **) argv, NULL, 0, NULL, NULL,
NULL, NULL, &exit_status, NULL);
- g_assert (spawn_succeeded);
+ g_assert_true (spawn_succeeded);
#ifndef G_OS_WIN32
- g_assert (WIFEXITED (exit_status));
+ g_assert_true (WIFEXITED (exit_status));
g_assert_cmpint (WEXITSTATUS (exit_status), ==, 0);
#else
g_assert_cmpint (exit_status, ==, 0);
@@ -567,7 +567,7 @@ e_test_server_utils_retry_open_client_cb (gpointer user_data)
source = e_source_registry_ref_source (pair->fixture->registry, pair->fixture->source_name);
- g_assert (E_IS_SOURCE (source));
+ g_assert_true (E_IS_SOURCE (source));
e_test_server_utils_source_added (pair->fixture->registry, source, pair);
g_object_unref (source);
@@ -647,7 +647,7 @@ e_test_server_utils_bootstrap_idle (FixturePair *pair)
g_clear_error (&error);
- g_assert (E_IS_SOURCE (source));
+ g_assert_true (E_IS_SOURCE (source));
e_test_server_utils_source_added (pair->fixture->registry, source, pair);
g_object_unref (source);
@@ -688,7 +688,7 @@ e_test_server_utils_setup (ETestServerFixture *fixture,
if (!test_installed_services ()) {
gchar *workdir = eds_test_utils_create_build_path (EDS_TEST_WORK_DIR_SUFFIX);
- g_assert (g_mkdir_with_parents (workdir, 0755) == 0);
+ g_assert_true (g_mkdir_with_parents (workdir, 0755) == 0);
g_free (workdir);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
