[evolution-data-server/wip/mcrha/libical-glib] tests/libedata-cal changes
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/wip/mcrha/libical-glib] tests/libedata-cal changes
- Date: Thu, 14 Feb 2019 11:15:19 +0000 (UTC)
commit 84129b261ca5f3406339a654a3231f891f6f9227
Author: Milan Crha <mcrha redhat com>
Date: Thu Feb 14 12:15:51 2019 +0100
tests/libedata-cal changes
tests/libedata-cal/test-cal-cache-intervals.c | 52 +-
tests/libedata-cal/test-cal-cache-offline.c | 36 +-
tests/libedata-cal/test-cal-cache-search.c | 12 +-
tests/libedata-cal/test-cal-meta-backend.c | 690 +++++++++++++++-----------
tests/libedata-cal/test-intervaltree.c | 4 +-
5 files changed, 447 insertions(+), 347 deletions(-)
---
diff --git a/tests/libedata-cal/test-cal-cache-intervals.c b/tests/libedata-cal/test-cal-cache-intervals.c
index ba1962c73..a72a6cf29 100644
--- a/tests/libedata-cal/test-cal-cache-intervals.c
+++ b/tests/libedata-cal/test-cal-cache-intervals.c
@@ -73,20 +73,24 @@ search_in_intervals (ETimezoneCache *zone_cache,
time_t end)
{
ECalBackendSExp *sexp;
- struct icaltimetype itt_start, itt_end;
+ ICalTimetype *itt_start, *itt_end;
gchar *expr;
GSList *link;
GHashTable *res;
- itt_start = icaltime_from_timet_with_zone (start, FALSE, NULL);
- itt_end = icaltime_from_timet_with_zone (end, FALSE, NULL);
+ itt_start = i_cal_time_from_timet_with_zone (start, FALSE, NULL);
+ itt_end = i_cal_time_from_timet_with_zone (end, FALSE, NULL);
expr = g_strdup_printf ("(occur-in-time-range? (make-time \"%04d%02d%02dT%02d%02d%02dZ\") (make-time
\"%04d%02d%02dT%02d%02d%02dZ\"))",
- itt_start.year, itt_start.month, itt_start.day, itt_start.hour, itt_start.minute,
itt_start.second,
- itt_end.year, itt_end.month, itt_end.day, itt_end.hour, itt_end.minute, itt_end.second);
+ i_cal_timetype_get_year (itt_start), i_cal_timetype_get_month (itt_start),
i_cal_timetype_get_day (itt_start),
+ i_cal_timetype_get_hour (itt_start), i_cal_timetype_get_minute (itt_start),
i_cal_timetype_get_second (itt_start),
+ i_cal_timetype_get_year (itt_end), i_cal_timetype_get_month (itt_end), i_cal_timetype_get_day
(itt_end),
+ i_cal_timetype_get_hour (itt_end), i_cal_timetype_get_minute (itt_end),
i_cal_timetype_get_second (itt_end));
sexp = e_cal_backend_sexp_new (expr);
+ g_clear_object (&itt_start);
+ g_clear_object (&itt_end);
g_free (expr);
g_assert_nonnull (sexp);
@@ -139,32 +143,40 @@ create_test_component (time_t start,
time_t end)
{
ECalComponent *comp;
- ECalComponentText summary;
- struct icaltimetype current, ittstart, ittend;
+ ECalComponentText *summary;
+ ICalTimetype *current, *ittstart, *ittend;
+ gchar *startstr, *endstr, *tmp;
comp = e_cal_component_new ();
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
- ittstart = icaltime_from_timet_with_zone (start, 0, NULL);
- ittend = icaltime_from_timet_with_zone (end, 0, NULL);
+ ittstart = i_cal_time_from_timet_with_zone (start, 0, NULL);
+ ittend = i_cal_time_from_timet_with_zone (end, 0, NULL);
- icalcomponent_set_dtstart (e_cal_component_get_icalcomponent (comp), ittstart);
- if (end != _TIME_MAX)
- icalcomponent_set_dtend (e_cal_component_get_icalcomponent (comp), ittend);
+ i_cal_component_set_dtstart (e_cal_component_get_icalcomponent (comp), ittstart);
+ i_cal_component_set_dtend (e_cal_component_get_icalcomponent (comp), ittend);
- summary.value = g_strdup_printf ("%s - %s", icaltime_as_ical_string (ittstart),
icaltime_as_ical_string (ittend));
- summary.altrep = NULL;
+ startstr = i_cal_time_as_ical_string_r (ittstart);
+ endstr = i_cal_time_as_ical_string_r (ittend);
- e_cal_component_set_summary (comp, &summary);
+ tmp = g_strdup_printf ("%s - %s", startstr, endstr);
+ summary = e_cal_component_text_new (tmp, NULL);
+ g_free (tmp);
- g_free ((gchar *) summary.value);
+ g_object_unref (ittstart);
+ g_object_unref (ittend);
+ g_free (startstr);
+ g_free (endstr);
- current = icaltime_from_timet_with_zone (time (NULL), 0, NULL);
- e_cal_component_set_created (comp, ¤t);
- e_cal_component_set_last_modified (comp, ¤t);
+ e_cal_component_set_summary (comp, summary);
- e_cal_component_rescan (comp);
+ e_cal_component_text_free (summary);
+
+ current = i_cal_time_from_timet_with_zone (time (NULL), 0, NULL);
+ e_cal_component_set_created (comp, current);
+ e_cal_component_set_last_modified (comp, current);
+ g_object_unref (current);
return comp;
}
diff --git a/tests/libedata-cal/test-cal-cache-offline.c b/tests/libedata-cal/test-cal-cache-offline.c
index e6aed5f92..8e247157a 100644
--- a/tests/libedata-cal/test-cal-cache-offline.c
+++ b/tests/libedata-cal/test-cal-cache-offline.c
@@ -71,8 +71,8 @@ test_check_search_result (const GSList *list,
component = e_cal_component_new_from_string (sd->object);
g_assert (E_IS_CAL_COMPONENT (component));
- g_assert_cmpstr (uid, ==, icalcomponent_get_uid (e_cal_component_get_icalcomponent
(component)));
- g_assert_nonnull (icalcomponent_get_summary (e_cal_component_get_icalcomponent
(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)));
g_clear_object (&component);
} else {
@@ -272,7 +272,7 @@ test_check_edit_saved (TCUFixture *fixture,
g_assert (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 (icalcomponent_get_summary (e_cal_component_get_icalcomponent (component)), ==,
summ_value);
+ g_assert_cmpstr (i_cal_component_get_summary (e_cal_component_get_icalcomponent (component)), ==,
summ_value);
g_clear_object (&component);
}
@@ -315,7 +315,7 @@ test_verify_storage (TCUFixture *fixture,
g_assert_no_error (error);
g_assert_cmpstr (saved_extra, ==, expect_extra);
- g_assert_cmpstr (icalcomponent_get_summary (e_cal_component_get_icalcomponent (component)), ==,
expect_summ);
+ g_assert_cmpstr (i_cal_component_get_summary (e_cal_component_get_icalcomponent (component)), ==,
expect_summ);
g_clear_object (&component);
g_free (saved_extra);
@@ -372,7 +372,7 @@ test_offline_basics (TCUFixture *fixture,
test_fill_cache (fixture, &component);
g_assert_nonnull (component);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (component));
+ uid = e_cal_component_get_uid (component);
g_assert_nonnull (uid);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
@@ -397,7 +397,7 @@ test_offline_basics (TCUFixture *fixture,
g_slist_free_full (ids, e_cal_component_id_free);
ids = NULL;
- icalcomponent_set_summary (e_cal_component_get_icalcomponent (component), "summ-0");
+ i_cal_component_set_summary (e_cal_component_get_icalcomponent (component), "summ-0");
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_SYNCED);
@@ -450,7 +450,7 @@ test_offline_basics (TCUFixture *fixture,
test_check_offline_changes (fixture, NULL);
/* Edit in online */
- icalcomponent_set_summary (e_cal_component_get_icalcomponent (component), "summ-1");
+ 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, E_CACHE_IS_ONLINE, NULL,
&error));
g_assert_no_error (error);
@@ -458,7 +458,7 @@ test_offline_basics (TCUFixture *fixture,
test_verify_storage (fixture, uid, "summ-1", NULL, E_OFFLINE_STATE_SYNCED);
test_check_offline_changes (fixture, NULL);
- icalcomponent_set_summary (e_cal_component_get_icalcomponent (component), "summ-2");
+ 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", E_CACHE_IS_ONLINE,
NULL, &error));
g_assert_no_error (error);
@@ -531,7 +531,7 @@ test_offline_add_one (TCUFixture *fixture,
component = tcu_new_component_from_test_case (case_name);
g_assert_nonnull (component);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (component));
+ uid = e_cal_component_get_uid (component);
g_assert_nonnull (uid);
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_UNKNOWN);
@@ -614,7 +614,7 @@ test_offline_add_edit (TCUFixture *fixture,
NULL);
/* Modify added in offline */
- icalcomponent_set_summary (e_cal_component_get_icalcomponent (component), "summ-2");
+ 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, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
@@ -654,7 +654,7 @@ test_offline_add_delete (TCUFixture *fixture,
"event-3", E_OFFLINE_STATE_LOCALLY_CREATED,
NULL);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (component));
+ uid = e_cal_component_get_uid (component);
g_assert_nonnull (uid);
/* Delete added in offline */
@@ -693,7 +693,7 @@ test_offline_add_delete_add (TCUFixture *fixture,
"event-3", E_OFFLINE_STATE_LOCALLY_CREATED,
NULL);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (component));
+ uid = e_cal_component_get_uid (component);
g_assert_nonnull (uid);
/* Delete added in offline */
@@ -759,7 +759,7 @@ test_offline_edit_common (TCUFixture *fixture,
test_fill_cache (fixture, &component);
g_assert_nonnull (component);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (component));
+ uid = e_cal_component_get_uid (component);
g_assert_nonnull (uid);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
@@ -769,7 +769,7 @@ test_offline_edit_common (TCUFixture *fixture,
test_check_offline_state (fixture, uid, E_OFFLINE_STATE_SYNCED);
/* Modify in offline */
- icalcomponent_set_summary (e_cal_component_get_icalcomponent (component), "summ-2");
+ 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, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
@@ -865,7 +865,7 @@ test_offline_delete (TCUFixture *fixture,
test_fill_cache (fixture, &component);
g_assert_nonnull (component);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (component));
+ uid = e_cal_component_get_uid (component);
g_assert_nonnull (uid);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
@@ -903,7 +903,7 @@ test_offline_delete_add (TCUFixture *fixture,
test_fill_cache (fixture, &component);
g_assert_nonnull (component);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (component));
+ uid = e_cal_component_get_uid (component);
g_assert_nonnull (uid);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
@@ -952,7 +952,7 @@ test_offline_delete_add (TCUFixture *fixture,
test_check_offline_state (fixture, "event-3", E_OFFLINE_STATE_LOCALLY_CREATED);
/* Modify the previous component and add it again */
- icalcomponent_set_summary (e_cal_component_get_icalcomponent (component), "summ-3");
+ 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, E_CACHE_IS_OFFLINE, NULL,
&error));
g_assert_no_error (error);
@@ -986,7 +986,7 @@ test_offline_delete_resync (TCUFixture *fixture,
test_fill_cache (fixture, &component);
g_assert_nonnull (component);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (component));
+ uid = e_cal_component_get_uid (component);
g_assert_nonnull (uid);
g_assert_cmpint (e_cache_get_count (E_CACHE (fixture->cal_cache), E_CACHE_EXCLUDE_DELETED, NULL,
&error), ==, 3);
diff --git a/tests/libedata-cal/test-cal-cache-search.c b/tests/libedata-cal/test-cal-cache-search.c
index 43e644128..500b81a53 100644
--- a/tests/libedata-cal/test-cal-cache-search.c
+++ b/tests/libedata-cal/test-cal-cache-search.c
@@ -121,15 +121,19 @@ search_data_check_cb (GHashTable *should_be,
gpointer item_data)
{
ECalCacheSearchData *sd = item_data;
- ECalComponentId id;
+ ECalComponentId *id;
+ gboolean contains;
g_assert (sd != NULL);
g_assert (sd->uid != NULL);
- id.uid = sd->uid;
- id.rid = sd->rid;
+ id = e_cal_component_id_new (sd->uid, sd->rid);
+
+ contains = g_hash_table_contains (should_be, id);
- return g_hash_table_contains (should_be, &id);
+ e_cal_component_id_free (id);
+
+ return contains;
}
static gboolean
diff --git a/tests/libedata-cal/test-cal-meta-backend.c b/tests/libedata-cal/test-cal-meta-backend.c
index a4fe11359..98c4899d4 100644
--- a/tests/libedata-cal/test-cal-meta-backend.c
+++ b/tests/libedata-cal/test-cal-meta-backend.c
@@ -37,7 +37,7 @@ void _e_cal_backend_remove_cached_timezones (ECalBackend *cal_backend); /* e-cal
typedef struct _ECalMetaBackendTest {
ECalMetaBackend parent;
- icalcomponent *vcalendar;
+ ICalComponent *vcalendar;
gint sync_tag_index;
gboolean can_connect;
@@ -70,7 +70,7 @@ ecmb_test_add_test_case (ECalMetaBackendTest *test_backend,
const gchar *case_name)
{
gchar *icalstr;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
g_assert_nonnull (test_backend);
g_assert_nonnull (case_name);
@@ -78,11 +78,29 @@ ecmb_test_add_test_case (ECalMetaBackendTest *test_backend,
icalstr = tcu_new_icalstring_from_test_case (case_name);
g_assert_nonnull (icalstr);
- icalcomp = icalcomponent_new_from_string (icalstr);
- g_assert_nonnull (icalcomp);
+ icomp = i_cal_component_new_from_string (icalstr);
+ g_assert_nonnull (icomp);
g_free (icalstr);
- icalcomponent_add_component (test_backend->vcalendar, icalcomp);
+ i_cal_component_take_component (test_backend->vcalendar, icomp);
+}
+
+static gchar *
+ecmb_test_get_rid_as_string (ICalComponent *icomp)
+{
+ gchar *rid;
+
+ g_assert_nonnull (icomp);
+
+ if (e_cal_util_component_has_property (icomp, I_CAL_RECURRENCEID_PROPERTY)) {
+ ICalTimetype *itt;
+
+ itt = i_cal_component_get_recurrenceid (icomp);
+ rid = i_cal_time_as_ical_string_r (itt);
+ g_clear_object (&itt);
+ }
+
+ return rid;
}
static void
@@ -90,7 +108,7 @@ ecmb_test_remove_component (ECalMetaBackendTest *test_backend,
const gchar *uid,
const gchar *rid)
{
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
g_assert_nonnull (test_backend);
g_assert_nonnull (uid);
@@ -98,22 +116,27 @@ ecmb_test_remove_component (ECalMetaBackendTest *test_backend,
if (rid && !*rid)
rid = NULL;
- for (icalcomp = icalcomponent_get_first_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;) {
+ for (icomp = i_cal_component_get_first_component (test_backend->vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;) {
const gchar *server_uid;
+ gchar *server_rid = NULL;
- server_uid = icalcomponent_get_uid (icalcomp);
+ server_uid = i_cal_component_get_uid (icomp);
g_assert_nonnull (server_uid);
- if (g_str_equal (server_uid, uid) && (!rid || !*rid ||
- (icalcomponent_get_first_property (icalcomp, ICAL_RECURRENCEID_PROPERTY) &&
- g_str_equal (rid, icaltime_as_ical_string (icalcomponent_get_recurrenceid (icalcomp))))))
{
- icalcomponent_remove_component (test_backend->vcalendar, icalcomp);
- icalcomponent_free (icalcomp);
+ server_rid = ecmb_test_get_rid_as_string (icomp);
+
+ if (g_str_equal (server_uid, uid) && (!rid || !*rid || (server_rid && g_str_equal (rid,
server_rid)))) {
+ i_cal_component_remove_component (test_backend->vcalendar, icomp);
+ g_object_unref (icomp);
+ g_free (server_rid);
- icalcomp = icalcomponent_get_first_component (test_backend->vcalendar,
ICAL_VEVENT_COMPONENT);
+ icomp = i_cal_component_get_first_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT);
} else {
- icalcomp = icalcomponent_get_next_component (test_backend->vcalendar,
ICAL_VEVENT_COMPONENT);
+ g_object_unref (icomp);
+ g_free (server_rid);
+
+ icomp = i_cal_component_get_next_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT);
}
}
}
@@ -139,18 +162,18 @@ ecmb_test_gather_ids (va_list args)
}
static void
-ecmb_test_vcalendar_contains (icalcomponent *vcalendar,
+ecmb_test_vcalendar_contains (ICalComponent *vcalendar,
gboolean negate,
gboolean exact,
...) /* <uid, rid> pairs, ended with NULL */
{
va_list args;
GHashTable *expects;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
guint ntotal;
g_return_if_fail (vcalendar != NULL);
- g_return_if_fail (icalcomponent_isa (vcalendar) == ICAL_VCALENDAR_COMPONENT);
+ g_return_if_fail (i_cal_component_isa (vcalendar) == I_CAL_VCALENDAR_COMPONENT);
va_start (args, exact);
expects = ecmb_test_gather_ids (args);
@@ -158,25 +181,23 @@ ecmb_test_vcalendar_contains (icalcomponent *vcalendar,
ntotal = g_hash_table_size (expects);
- for (icalcomp = icalcomponent_get_first_component (vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;
- icalcomp = icalcomponent_get_next_component (vcalendar, ICAL_VEVENT_COMPONENT)) {
- ECalComponentId id;
+ for (icomp = i_cal_component_get_first_component (vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;
+ g_object_unref (icomp), icomp = i_cal_component_get_next_component (vcalendar,
I_CAL_VEVENT_COMPONENT)) {
+ ECalComponentId *id;
- id.uid = (gpointer) icalcomponent_get_uid (icalcomp);
- if (icalcomponent_get_first_property (icalcomp, ICAL_RECURRENCEID_PROPERTY))
- id.rid = (gpointer) icaltime_as_ical_string (icalcomponent_get_recurrenceid
(icalcomp));
- else
- id.rid = NULL;
+ id = e_cal_component_id_new_take (g_strdup (i_cal_component_get_uid (icomp)),
ecmb_test_get_rid_as_string (icomp));
if (exact) {
if (negate)
- g_assert (!g_hash_table_remove (expects, &id));
+ g_assert (!g_hash_table_remove (expects, id));
else
- g_assert (g_hash_table_remove (expects, &id));
+ g_assert (g_hash_table_remove (expects, id));
} else {
- g_hash_table_remove (expects, &id);
+ g_hash_table_remove (expects, id);
}
+
+ e_cal_component_id_free (id);
}
if (negate)
@@ -228,27 +249,29 @@ ecmb_test_cache_contains (ECalCache *cal_cache,
static void
ecmb_test_cache_and_server_equal (ECalCache *cal_cache,
- icalcomponent *vcalendar,
+ ICalComponent *vcalendar,
ECacheDeletedFlag deleted_flag)
{
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
g_return_if_fail (E_IS_CAL_CACHE (cal_cache));
g_return_if_fail (vcalendar != NULL);
g_assert_cmpint (e_cache_get_count (E_CACHE (cal_cache), deleted_flag, NULL, NULL), ==,
- icalcomponent_count_components (vcalendar, ICAL_VEVENT_COMPONENT));
+ i_cal_component_count_components (vcalendar, I_CAL_VEVENT_COMPONENT));
- for (icalcomp = icalcomponent_get_first_component (vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;
- icalcomp = icalcomponent_get_next_component (vcalendar, ICAL_VEVENT_COMPONENT)) {
- const gchar *uid, *rid = NULL;
+ for (icomp = i_cal_component_get_first_component (vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;
+ g_object_unref (icomp), icomp = i_cal_component_get_next_component (vcalendar,
I_CAL_VEVENT_COMPONENT)) {
+ const gchar *uid;
+ gchar *rid = NULL;
- uid = icalcomponent_get_uid (icalcomp);
- if (icalcomponent_get_first_property (icalcomp, ICAL_RECURRENCEID_PROPERTY))
- rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (icalcomp));
+ 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_free (rid);
}
}
@@ -369,7 +392,7 @@ e_cal_meta_backend_test_list_existing_sync (ECalMetaBackend *meta_backend,
{
ECalMetaBackendTest *test_backend;
ECalCache *cal_cache;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
g_return_val_if_fail (E_IS_CAL_META_BACKEND_TEST (meta_backend), FALSE);
g_return_val_if_fail (out_new_sync_tag, FALSE);
@@ -385,19 +408,19 @@ e_cal_meta_backend_test_list_existing_sync (ECalMetaBackend *meta_backend,
*out_existing_objects = NULL;
- for (icalcomp = icalcomponent_get_first_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;
- icalcomp = icalcomponent_get_next_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT)) {
+ for (icomp = i_cal_component_get_first_component (test_backend->vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;
+ g_object_unref (icomp), icomp = i_cal_component_get_next_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT)) {
const gchar *uid;
gchar *revision;
ECalMetaBackendInfo *nfo;
/* Detached instances are stored together with the master object */
- if (icalcomponent_get_first_property (icalcomp, ICAL_RECURRENCEID_PROPERTY))
+ if (e_cal_util_component_has_property (icomp, I_CAL_RECURRENCEID_PROPERTY))
continue;
- uid = icalcomponent_get_uid (icalcomp);
- revision = e_cal_cache_dup_component_revision (cal_cache, icalcomp);
+ uid = i_cal_component_get_uid (icomp);
+ revision = e_cal_cache_dup_component_revision (cal_cache, icomp);
nfo = e_cal_meta_backend_info_new (uid, revision, NULL, NULL);
*out_existing_objects = g_slist_prepend (*out_existing_objects, nfo);
@@ -422,7 +445,7 @@ e_cal_meta_backend_test_save_component_sync (ECalMetaBackend *meta_backend,
GError **error)
{
ECalMetaBackendTest *test_backend;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
const gchar *uid;
GSList *link;
@@ -435,14 +458,14 @@ e_cal_meta_backend_test_save_component_sync (ECalMetaBackend *meta_backend,
g_assert (test_backend->is_connected);
- uid = icalcomponent_get_uid (e_cal_component_get_icalcomponent (instances->data));
+ uid = e_cal_component_get_uid (instances->data);
g_assert_nonnull (uid);
- for (icalcomp = icalcomponent_get_first_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;) {
+ for (icomp = i_cal_component_get_first_component (test_backend->vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;) {
const gchar *server_uid;
- server_uid = icalcomponent_get_uid (icalcomp);
+ server_uid = i_cal_component_get_uid (icomp);
g_assert_nonnull (server_uid);
if (g_str_equal (server_uid, uid)) {
@@ -451,12 +474,13 @@ e_cal_meta_backend_test_save_component_sync (ECalMetaBackend *meta_backend,
return FALSE;
}
- icalcomponent_remove_component (test_backend->vcalendar, icalcomp);
- icalcomponent_free (icalcomp);
+ i_cal_component_remove_component (test_backend->vcalendar, icomp);
+ g_object_unref (icomp);
- icalcomp = icalcomponent_get_first_component (test_backend->vcalendar,
ICAL_VEVENT_COMPONENT);
+ icomp = i_cal_component_get_first_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT);
} else {
- icalcomp = icalcomponent_get_next_component (test_backend->vcalendar,
ICAL_VEVENT_COMPONENT);
+ g_object_unref (icomp);
+ icomp = i_cal_component_get_next_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT);
}
}
@@ -464,13 +488,13 @@ e_cal_meta_backend_test_save_component_sync (ECalMetaBackend *meta_backend,
ECalComponent *comp = link->data;
const gchar *comp_uid;
- icalcomp = e_cal_component_get_icalcomponent (comp);
- g_assert_nonnull (icalcomp);
+ icomp = e_cal_component_get_icalcomponent (comp);
+ g_assert_nonnull (icomp);
- comp_uid = icalcomponent_get_uid (icalcomp);
+ comp_uid = i_cal_component_get_uid (icomp);
g_assert_cmpstr (uid, ==, comp_uid);
- icalcomponent_add_component (test_backend->vcalendar, icalcomponent_new_clone (icalcomp));
+ i_cal_component_take_component (test_backend->vcalendar, i_cal_component_new_clone (icomp));
}
*out_new_uid = g_strdup (uid);
@@ -482,13 +506,13 @@ static gboolean
e_cal_meta_backend_test_load_component_sync (ECalMetaBackend *meta_backend,
const gchar *uid,
const gchar *extra,
- icalcomponent **out_instances,
+ ICalComponent **out_instances,
gchar **out_extra,
GCancellable *cancellable,
GError **error)
{
ECalMetaBackendTest *test_backend;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
g_return_val_if_fail (E_IS_CAL_META_BACKEND_TEST (meta_backend), FALSE);
g_return_val_if_fail (uid != NULL, FALSE);
@@ -502,19 +526,19 @@ e_cal_meta_backend_test_load_component_sync (ECalMetaBackend *meta_backend,
*out_instances = NULL;
- for (icalcomp = icalcomponent_get_first_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;
- icalcomp = icalcomponent_get_next_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT)) {
+ for (icomp = i_cal_component_get_first_component (test_backend->vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;
+ g_object_unref (icomp), icomp = i_cal_component_get_next_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT)) {
const gchar *server_uid;
- server_uid = icalcomponent_get_uid (icalcomp);
+ server_uid = i_cal_component_get_uid (icomp);
g_assert_nonnull (server_uid);
if (g_str_equal (server_uid, uid)) {
if (!*out_instances)
*out_instances = e_cal_util_new_top_level ();
- icalcomponent_add_component (*out_instances, icalcomponent_new_clone (icalcomp));
+ i_cal_component_take_component (*out_instances, i_cal_component_new_clone (icomp));
}
}
@@ -538,7 +562,7 @@ e_cal_meta_backend_test_remove_component_sync (ECalMetaBackend *meta_backend,
GError **error)
{
ECalMetaBackendTest *test_backend;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
gboolean success = FALSE;
g_return_val_if_fail (E_IS_CAL_META_BACKEND_TEST (meta_backend), FALSE);
@@ -550,11 +574,11 @@ e_cal_meta_backend_test_remove_component_sync (ECalMetaBackend *meta_backend,
g_assert (test_backend->is_connected);
- for (icalcomp = icalcomponent_get_first_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;) {
+ for (icomp = i_cal_component_get_first_component (test_backend->vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;) {
const gchar *server_uid;
- server_uid = icalcomponent_get_uid (icalcomp);
+ server_uid = i_cal_component_get_uid (icomp);
g_assert_nonnull (server_uid);
if (g_str_equal (server_uid, uid)) {
@@ -568,12 +592,13 @@ e_cal_meta_backend_test_remove_component_sync (ECalMetaBackend *meta_backend,
success = TRUE;
- icalcomponent_remove_component (test_backend->vcalendar, icalcomp);
- icalcomponent_free (icalcomp);
+ i_cal_component_remove_component (test_backend->vcalendar, icomp);
+ g_object_unref (icomp);
- icalcomp = icalcomponent_get_first_component (test_backend->vcalendar,
ICAL_VEVENT_COMPONENT);
+ icomp = i_cal_component_get_first_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT);
} else {
- icalcomp = icalcomponent_get_next_component (test_backend->vcalendar,
ICAL_VEVENT_COMPONENT);
+ g_object_unref (icomp);
+ icomp = i_cal_component_get_next_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT);
}
}
@@ -618,7 +643,7 @@ e_cal_meta_backend_test_finalize (GObject *object)
g_assert_nonnull (test_backend->vcalendar);
- icalcomponent_free (test_backend->vcalendar);
+ g_object_unref (test_backend->vcalendar);
/* Chain up to parent's method. */
G_OBJECT_CLASS (e_cal_meta_backend_test_parent_class)->finalize (object);
@@ -788,12 +813,12 @@ e_cal_meta_backend_test_call_refresh (ECalMetaBackend *meta_backend)
}
static void
-assert_tzid_matches_cb (icalparameter *param,
+assert_tzid_matches_cb (ICalParameter *param,
gpointer user_data)
{
const gchar *expected_tzid = user_data;
- g_assert_cmpstr (icalparameter_get_tzid (param), ==, expected_tzid);
+ g_assert_cmpstr (i_cal_parameter_get_tzid (param), ==, expected_tzid);
}
static void
@@ -802,8 +827,8 @@ test_merge_instances (TCUFixture *fixture,
{
ECalMetaBackend *meta_backend;
GSList *instances = NULL;
- icalcomponent *icalcomp, *subcomp;
- icalproperty *prop;
+ ICalComponent *icomp, *subcomp;
+ ICalProperty *prop;
gboolean success;
GError *error = NULL;
@@ -817,28 +842,30 @@ test_merge_instances (TCUFixture *fixture,
g_assert_nonnull (instances);
/* TZID as is */
- icalcomp = e_cal_meta_backend_merge_instances (meta_backend, instances, FALSE);
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_isa (icalcomp), ==, ICAL_VCALENDAR_COMPONENT);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_ANY_COMPONENT), ==, 1);
+ icomp = e_cal_meta_backend_merge_instances (meta_backend, instances, FALSE);
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_isa (icomp), ==, I_CAL_VCALENDAR_COMPONENT);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_ANY_COMPONENT), ==, 1);
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_ANY_COMPONENT);
g_assert_nonnull (subcomp);
- g_assert_cmpint (icalcomponent_isa (subcomp), ==, ICAL_VEVENT_COMPONENT);
+ g_assert_cmpint (i_cal_component_isa (subcomp), ==, I_CAL_VEVENT_COMPONENT);
- icalcomponent_free (icalcomp);
+ g_object_unref (subcomp);
+ g_object_unref (icomp);
/* TZID as location */
- icalcomp = e_cal_meta_backend_merge_instances (meta_backend, instances, TRUE);
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_isa (icalcomp), ==, ICAL_VCALENDAR_COMPONENT);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_ANY_COMPONENT), ==, 1);
+ icomp = e_cal_meta_backend_merge_instances (meta_backend, instances, TRUE);
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_isa (icomp), ==, I_CAL_VCALENDAR_COMPONENT);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_ANY_COMPONENT), ==, 1);
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_ANY_COMPONENT);
g_assert_nonnull (subcomp);
- g_assert_cmpint (icalcomponent_isa (subcomp), ==, ICAL_VEVENT_COMPONENT);
+ g_assert_cmpint (i_cal_component_isa (subcomp), ==, I_CAL_VEVENT_COMPONENT);
- icalcomponent_free (icalcomp);
+ g_object_unref (subcomp);
+ g_object_unref (icomp);
g_slist_free_full (instances, g_object_unref);
instances = NULL;
@@ -850,48 +877,56 @@ test_merge_instances (TCUFixture *fixture,
g_assert_nonnull (instances);
/* TZID as is */
- icalcomp = e_cal_meta_backend_merge_instances (meta_backend, instances, FALSE);
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_isa (icalcomp), ==, ICAL_VCALENDAR_COMPONENT);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_ANY_COMPONENT), ==, 2);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VTIMEZONE_COMPONENT), ==, 1);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VEVENT_COMPONENT), ==, 1);
-
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VTIMEZONE_COMPONENT);
+ icomp = e_cal_meta_backend_merge_instances (meta_backend, instances, FALSE);
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_isa (icomp), ==, I_CAL_VCALENDAR_COMPONENT);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_ANY_COMPONENT), ==, 2);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VTIMEZONE_COMPONENT), ==, 1);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VEVENT_COMPONENT), ==, 1);
+
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_VTIMEZONE_COMPONENT);
g_assert_nonnull (subcomp);
- g_assert_cmpint (icalcomponent_isa (subcomp), ==, ICAL_VTIMEZONE_COMPONENT);
+ g_assert_cmpint (i_cal_component_isa (subcomp), ==, I_CAL_VTIMEZONE_COMPONENT);
- prop = icalcomponent_get_first_property (subcomp, ICAL_TZID_PROPERTY);
+ prop = i_cal_component_get_first_property (subcomp, I_CAL_TZID_PROPERTY);
g_assert_nonnull (prop);
- g_assert_cmpstr (icalproperty_get_tzid (prop), ==, EXPECTED_TZID);
+ g_assert_cmpstr (i_cal_property_get_tzid (prop), ==, EXPECTED_TZID);
+
+ g_object_unref (prop);
+ g_object_unref (subcomp);
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VEVENT_COMPONENT);
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_VEVENT_COMPONENT);
g_assert_nonnull (subcomp);
- icalcomponent_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) icalproperty_get_tzid (prop));
+ i_cal_component_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) EXPECTED_TZID);
- icalcomponent_free (icalcomp);
+ g_object_unref (subcomp);
+ g_object_unref (icomp);
/* TZID to location */
- icalcomp = e_cal_meta_backend_merge_instances (meta_backend, instances, TRUE);
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_isa (icalcomp), ==, ICAL_VCALENDAR_COMPONENT);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_ANY_COMPONENT), ==, 2);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VTIMEZONE_COMPONENT), ==, 1);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VEVENT_COMPONENT), ==, 1);
-
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VTIMEZONE_COMPONENT);
+ icomp = e_cal_meta_backend_merge_instances (meta_backend, instances, TRUE);
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_isa (icomp), ==, I_CAL_VCALENDAR_COMPONENT);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_ANY_COMPONENT), ==, 2);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VTIMEZONE_COMPONENT), ==, 1);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VEVENT_COMPONENT), ==, 1);
+
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_VTIMEZONE_COMPONENT);
g_assert_nonnull (subcomp);
- g_assert_cmpint (icalcomponent_isa (subcomp), ==, ICAL_VTIMEZONE_COMPONENT);
+ g_assert_cmpint (i_cal_component_isa (subcomp), ==, I_CAL_VTIMEZONE_COMPONENT);
- prop = icalcomponent_get_first_property (subcomp, ICAL_TZID_PROPERTY);
+ prop = i_cal_component_get_first_property (subcomp, I_CAL_TZID_PROPERTY);
g_assert_nonnull (prop);
- g_assert_cmpstr (icalproperty_get_tzid (prop), ==, EXPECTED_LOCATION);
+ g_assert_cmpstr (i_cal_property_get_tzid (prop), ==, EXPECTED_LOCATION);
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VEVENT_COMPONENT);
+ g_object_unref (prop);
+ g_object_unref (subcomp);
+
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_VEVENT_COMPONENT);
g_assert_nonnull (subcomp);
- icalcomponent_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) icalproperty_get_tzid (prop));
+ i_cal_component_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) EXPECTED_LOCATION);
- icalcomponent_free (icalcomp);
+ g_object_unref (subcomp);
+ g_object_unref (icomp);
g_slist_free_full (instances, g_object_unref);
instances = NULL;
@@ -902,63 +937,74 @@ test_merge_instances (TCUFixture *fixture,
g_assert_nonnull (instances);
/* TZID as is */
- icalcomp = e_cal_meta_backend_merge_instances (meta_backend, instances, FALSE);
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_isa (icalcomp), ==, ICAL_VCALENDAR_COMPONENT);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_ANY_COMPONENT), ==, 3);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VTIMEZONE_COMPONENT), ==, 1);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VEVENT_COMPONENT), ==, 2);
-
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VTIMEZONE_COMPONENT);
+ icomp = e_cal_meta_backend_merge_instances (meta_backend, instances, FALSE);
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_isa (icomp), ==, I_CAL_VCALENDAR_COMPONENT);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_ANY_COMPONENT), ==, 3);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VTIMEZONE_COMPONENT), ==, 1);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VEVENT_COMPONENT), ==, 2);
+
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_VTIMEZONE_COMPONENT);
g_assert_nonnull (subcomp);
- g_assert_cmpint (icalcomponent_isa (subcomp), ==, ICAL_VTIMEZONE_COMPONENT);
+ g_assert_cmpint (i_cal_component_isa (subcomp), ==, I_CAL_VTIMEZONE_COMPONENT);
- prop = icalcomponent_get_first_property (subcomp, ICAL_TZID_PROPERTY);
+ prop = i_cal_component_get_first_property (subcomp, I_CAL_TZID_PROPERTY);
g_assert_nonnull (prop);
- g_assert_cmpstr (icalproperty_get_tzid (prop), ==, EXPECTED_LOCATION);
+ g_assert_cmpstr (i_cal_property_get_tzid (prop), ==, EXPECTED_LOCATION);
+
+ g_object_unref (subcomp);
+ g_object_unref (prop);
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VEVENT_COMPONENT);
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_VEVENT_COMPONENT);
g_assert_nonnull (subcomp);
- icalcomponent_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) icalproperty_get_tzid (prop));
+ i_cal_component_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) EXPECTED_LOCATION);
- subcomp = icalcomponent_get_next_component (icalcomp, ICAL_VEVENT_COMPONENT);
+ g_object_unref (subcomp);
+
+ subcomp = i_cal_component_get_next_component (icomp, I_CAL_VEVENT_COMPONENT);
g_assert_nonnull (subcomp);
- icalcomponent_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) icalproperty_get_tzid (prop));
+ i_cal_component_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) EXPECTED_LOCATION);
- icalcomponent_free (icalcomp);
+ g_object_unref (subcomp);
+ g_object_unref (icomp);
/* TZID to location */
- icalcomp = e_cal_meta_backend_merge_instances (meta_backend, instances, TRUE);
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_isa (icalcomp), ==, ICAL_VCALENDAR_COMPONENT);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_ANY_COMPONENT), ==, 3);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VTIMEZONE_COMPONENT), ==, 1);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VEVENT_COMPONENT), ==, 2);
-
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VTIMEZONE_COMPONENT);
+ icomp = e_cal_meta_backend_merge_instances (meta_backend, instances, TRUE);
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_isa (icomp), ==, I_CAL_VCALENDAR_COMPONENT);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_ANY_COMPONENT), ==, 3);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VTIMEZONE_COMPONENT), ==, 1);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VEVENT_COMPONENT), ==, 2);
+
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_VTIMEZONE_COMPONENT);
g_assert_nonnull (subcomp);
- g_assert_cmpint (icalcomponent_isa (subcomp), ==, ICAL_VTIMEZONE_COMPONENT);
+ g_assert_cmpint (i_cal_component_isa (subcomp), ==, I_CAL_VTIMEZONE_COMPONENT);
- prop = icalcomponent_get_first_property (subcomp, ICAL_TZID_PROPERTY);
+ prop = i_cal_component_get_first_property (subcomp, I_CAL_TZID_PROPERTY);
g_assert_nonnull (prop);
- g_assert_cmpstr (icalproperty_get_tzid (prop), ==, EXPECTED_LOCATION);
+ g_assert_cmpstr (i_cal_property_get_tzid (prop), ==, EXPECTED_LOCATION);
+ g_object_unref (prop);
+
+ g_object_unref (subcomp);
- subcomp = icalcomponent_get_first_component (icalcomp, ICAL_VEVENT_COMPONENT);
+ subcomp = i_cal_component_get_first_component (icomp, I_CAL_VEVENT_COMPONENT);
g_assert_nonnull (subcomp);
- icalcomponent_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) icalproperty_get_tzid (prop));
+ i_cal_component_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) EXPECTED_LOCATION);
+ g_object_unref (subcomp);
- subcomp = icalcomponent_get_next_component (icalcomp, ICAL_VEVENT_COMPONENT);
+ subcomp = i_cal_component_get_next_component (icomp, I_CAL_VEVENT_COMPONENT);
g_assert_nonnull (subcomp);
- icalcomponent_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) icalproperty_get_tzid (prop));
+ i_cal_component_foreach_tzid (subcomp, assert_tzid_matches_cb, (gpointer) EXPECTED_LOCATION);
+ g_object_unref (subcomp);
- icalcomponent_free (icalcomp);
+ g_object_unref (icomp);
g_slist_free_full (instances, g_object_unref);
g_object_unref (meta_backend);
}
static void
-check_attachment_content (icalattach *attach,
+check_attachment_content (ICalAttach *attach,
const gchar *expected_content,
gsize expected_content_len)
{
@@ -966,7 +1012,7 @@ check_attachment_content (icalattach *attach,
g_assert_nonnull (expected_content);
g_assert_cmpint (expected_content_len, >, 0);
- if (icalattach_get_is_url (attach)) {
+ if (i_cal_attach_get_is_url (attach)) {
const gchar *url;
gboolean success;
gchar *filename;
@@ -974,11 +1020,11 @@ check_attachment_content (icalattach *attach,
gsize content_len = -1;
GError *error = NULL;
- url = icalattach_get_url (attach);
+ url = i_cal_attach_get_url (attach);
g_assert_nonnull (url);
g_assert (g_str_has_prefix (url, "file://"));
- filename = g_filename_from_uri (icalattach_get_url (attach), NULL, &error);
+ filename = g_filename_from_uri (url, NULL, &error);
g_assert_no_error (error);
g_assert_nonnull (filename);
@@ -996,7 +1042,7 @@ check_attachment_content (icalattach *attach,
guchar *base64;
gsize base64_len;
- base64 = g_base64_decode ((const gchar *) icalattach_get_data (attach), &base64_len);
+ base64 = g_base64_decode (i_cal_attach_get_data (attach), &base64_len);
g_assert_nonnull (base64);
g_assert_cmpmem (base64, base64_len, expected_content, expected_content_len);
@@ -1012,10 +1058,10 @@ test_attachments (TCUFixture *fixture,
gchar *content = NULL;
gsize content_len = 0;
ECalComponent *comp = NULL;
- icalcomponent *icalcomp;
- icalproperty *prop;
- icalparameter *param;
- icalattach *attach;
+ ICalComponent *icomp;
+ ICalProperty *prop;
+ ICalParameter *param;
+ ICalAttach *attach;
gchar *filename;
const gchar *basename;
gboolean success;
@@ -1030,19 +1076,19 @@ test_attachments (TCUFixture *fixture,
g_assert (success);
g_assert_nonnull (comp);
- icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_count_properties (icalcomp, ICAL_ATTACH_PROPERTY), ==, 1);
+ icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp));
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 1);
- prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTACH_PROPERTY);
+ prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert_null (icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER));
+ g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
- attach = icalproperty_get_attach (prop);
+ attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (icalattach_get_is_url (attach));
+ g_assert (i_cal_attach_get_is_url (attach));
- filename = g_filename_from_uri (icalattach_get_url (attach), NULL, &error);
+ filename = g_filename_from_uri (i_cal_attach_get_url (attach), NULL, &error);
g_assert_no_error (error);
g_assert_nonnull (filename);
@@ -1056,115 +1102,139 @@ test_attachments (TCUFixture *fixture,
g_assert_nonnull (content);
g_assert_cmpint (content_len, >, 0);
- success = e_cal_meta_backend_inline_local_attachments_sync (meta_backend, icalcomp, NULL, &error);
+ success = e_cal_meta_backend_inline_local_attachments_sync (meta_backend, icomp, NULL, &error);
g_assert_no_error (error);
g_assert (success);
- g_assert_cmpint (icalcomponent_count_properties (icalcomp, ICAL_ATTACH_PROPERTY), ==, 1);
+ g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 1);
- prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTACH_PROPERTY);
+ g_object_unref (attach);
+ g_object_unref (prop);
+
+ prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert_nonnull (icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER));
- g_assert_nonnull (icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER));
- g_assert_nonnull (icalproperty_get_first_parameter (prop, ICAL_ENCODING_PARAMETER));
+ 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));
- param = icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER);
- g_assert_cmpstr (icalparameter_get_filename (param), ==, basename);
+ param = i_cal_property_get_first_parameter (prop, I_CAL_FILENAME_PARAMETER);
+ g_assert_cmpstr (i_cal_parameter_get_filename (param), ==, basename);
+ g_object_unref (param);
- attach = icalproperty_get_attach (prop);
+ attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (!icalattach_get_is_url (attach));
+ g_assert (!i_cal_attach_get_is_url (attach));
check_attachment_content (attach, content, content_len);
- success = e_cal_meta_backend_store_inline_attachments_sync (meta_backend, icalcomp, NULL, &error);
+ g_object_unref (attach);
+ g_object_unref (prop);
+
+ success = e_cal_meta_backend_store_inline_attachments_sync (meta_backend, icomp, NULL, &error);
g_assert_no_error (error);
g_assert (success);
- g_assert_cmpint (icalcomponent_count_properties (icalcomp, ICAL_ATTACH_PROPERTY), ==, 1);
+ g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 1);
- prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTACH_PROPERTY);
+ prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert_nonnull (icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER));
- g_assert_null (icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER));
- g_assert_null (icalproperty_get_first_parameter (prop, ICAL_ENCODING_PARAMETER));
+ 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));
- param = icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER);
- g_assert_cmpstr (icalparameter_get_filename (param), ==, basename);
+ param = i_cal_property_get_first_parameter (prop, I_CAL_FILENAME_PARAMETER);
+ g_assert_cmpstr (i_cal_parameter_get_filename (param), ==, basename);
+ g_object_unref (param);
- attach = icalproperty_get_attach (prop);
+ attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (icalattach_get_is_url (attach));
+ g_assert (i_cal_attach_get_is_url (attach));
check_attachment_content (attach, content, content_len);
+ g_object_unref (attach);
+ g_object_unref (prop);
+
/* Add a URL attachment which is not pointing to a local file */
- attach = icalattach_new_from_url (REMOTE_URL);
- prop = icalproperty_new_attach (attach);
- icalattach_unref (attach);
- icalcomponent_add_property (icalcomp, prop);
+ attach = i_cal_attach_new_from_url (REMOTE_URL);
+ prop = i_cal_property_new_attach (attach);
+ g_object_unref (attach);
+ i_cal_component_take_property (icomp, prop);
- g_assert_cmpint (icalcomponent_count_properties (icalcomp, ICAL_ATTACH_PROPERTY), ==, 2);
+ g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 2);
- success = e_cal_meta_backend_inline_local_attachments_sync (meta_backend, icalcomp, NULL, &error);
+ success = e_cal_meta_backend_inline_local_attachments_sync (meta_backend, icomp, NULL, &error);
g_assert_no_error (error);
g_assert (success);
- g_assert_cmpint (icalcomponent_count_properties (icalcomp, ICAL_ATTACH_PROPERTY), ==, 2);
+ g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 2);
- prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTACH_PROPERTY);
+ prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert_nonnull (icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER));
- g_assert_nonnull (icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER));
- g_assert_nonnull (icalproperty_get_first_parameter (prop, ICAL_ENCODING_PARAMETER));
+ 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));
- param = icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER);
- g_assert_cmpstr (icalparameter_get_filename (param), ==, basename);
+ param = i_cal_property_get_first_parameter (prop, I_CAL_FILENAME_PARAMETER);
+ g_assert_cmpstr (i_cal_parameter_get_filename (param), ==, basename);
+ g_object_unref (param);
- attach = icalproperty_get_attach (prop);
+ attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (!icalattach_get_is_url (attach));
+ g_assert (!i_cal_attach_get_is_url (attach));
check_attachment_content (attach, content, content_len);
+ g_object_unref (attach);
+ g_object_unref (prop);
+
/* Verify the remote URL did not change */
- prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTACH_PROPERTY);
+ prop = i_cal_component_get_next_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert_null (icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER));
+ g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
- attach = icalproperty_get_attach (prop);
+ attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (icalattach_get_is_url (attach));
- g_assert_cmpstr (icalattach_get_url (attach), ==, REMOTE_URL);
+ g_assert (i_cal_attach_get_is_url (attach));
+ g_assert_cmpstr (i_cal_attach_get_url (attach), ==, REMOTE_URL);
- success = e_cal_meta_backend_store_inline_attachments_sync (meta_backend, icalcomp, NULL, &error);
+ g_object_unref (attach);
+ g_object_unref (prop);
+
+ success = e_cal_meta_backend_store_inline_attachments_sync (meta_backend, icomp, NULL, &error);
g_assert_no_error (error);
g_assert (success);
- g_assert_cmpint (icalcomponent_count_properties (icalcomp, ICAL_ATTACH_PROPERTY), ==, 2);
+ g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 2);
- prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTACH_PROPERTY);
+ prop = i_cal_component_get_first_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert_nonnull (icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER));
- g_assert_null (icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER));
- g_assert_null (icalproperty_get_first_parameter (prop, ICAL_ENCODING_PARAMETER));
+ 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));
- param = icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER);
- g_assert_cmpstr (icalparameter_get_filename (param), ==, basename);
+ param = i_cal_property_get_first_parameter (prop, I_CAL_FILENAME_PARAMETER);
+ g_assert_cmpstr (i_cal_parameter_get_filename (param), ==, basename);
+ g_object_unref (param);
- attach = icalproperty_get_attach (prop);
+ attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (icalattach_get_is_url (attach));
+ g_assert (i_cal_attach_get_is_url (attach));
check_attachment_content (attach, content, content_len);
+ g_object_unref (attach);
+ g_object_unref (prop);
+
/* Verify the remote URL did not change */
- prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTACH_PROPERTY);
+ prop = i_cal_component_get_next_property (icomp, I_CAL_ATTACH_PROPERTY);
g_assert_nonnull (prop);
- g_assert_null (icalproperty_get_first_parameter (prop, ICAL_FILENAME_PARAMETER));
+ g_assert (!e_cal_util_property_has_parameter (prop, I_CAL_FILENAME_PARAMETER));
- attach = icalproperty_get_attach (prop);
+ attach = i_cal_property_get_attach (prop);
g_assert_nonnull (attach);
- g_assert (icalattach_get_is_url (attach));
- g_assert_cmpstr (icalattach_get_url (attach), ==, REMOTE_URL);
+ g_assert (i_cal_attach_get_is_url (attach));
+ g_assert_cmpstr (i_cal_attach_get_url (attach), ==, REMOTE_URL);
- icalcomponent_free (icalcomp);
+ g_object_unref (attach);
+ g_object_unref (prop);
+ g_object_unref (icomp);
g_object_unref (meta_backend);
g_object_unref (comp);
g_free (filename);
@@ -1426,7 +1496,7 @@ test_timezones (ECalMetaBackend *meta_backend)
const gchar *in_tz2obj = TZSTRDEF (TZID2, TZLOC2);
ECalBackendSyncClass *backend_class;
ECalCache *cal_cache;
- icalcomponent *vcalendar;
+ ICalComponent *vcalendar;
ECalComponent *comp;
gchar *tzobj = NULL;
GList *zones;
@@ -1486,7 +1556,7 @@ test_timezones (ECalMetaBackend *meta_backend)
cal_cache = e_cal_meta_backend_ref_cache (meta_backend);
g_assert_nonnull (cal_cache);
- vcalendar = icalcomponent_new_from_string (
+ vcalendar = i_cal_component_new_from_string (
"BEGIN:VCALENDAR\r\n"
"BEGIN:VTIMEZONE\r\n"
"TZID:tzid1\r\n"
@@ -1593,7 +1663,7 @@ test_timezones (ECalMetaBackend *meta_backend)
zones = e_timezone_cache_list_timezones (E_TIMEZONE_CACHE (meta_backend));
g_assert_cmpint (g_list_length (zones), ==, 0);
- icalcomponent_free (vcalendar);
+ g_object_unref (vcalendar);
/* And now when the timezones are actually referenced, thus should be part of the persistent cache */
@@ -1772,6 +1842,7 @@ test_get_free_busy (ECalMetaBackend *meta_backend)
"END:VFREEBUSY\r\n";
ECalBackendSyncClass *backend_class;
GSList *users, *objects = NULL;
+ ICalTimetype *itt;
time_t start, end;
GError *error = NULL;
@@ -1784,8 +1855,13 @@ test_get_free_busy (ECalMetaBackend *meta_backend)
users = g_slist_prepend (NULL, (gpointer) "user@no.where");
users = g_slist_prepend (users, (gpointer) "unknown@no.where");
- start = icaltime_as_timet (icaltime_from_string ("20170102T080000Z"));
- end = icaltime_as_timet (icaltime_from_string ("20170102T200000Z"));
+ itt = i_cal_time_from_string ("20170102T080000Z");
+ start = i_cal_time_as_timet (itt);
+ g_object_unref (itt);
+
+ itt = i_cal_time_from_string ("20170102T200000Z");
+ end = i_cal_time_as_timet (itt);
+ g_object_unref (itt);
backend_class->get_free_busy_sync (E_CAL_BACKEND_SYNC (meta_backend),
NULL, NULL, users, start, end, &objects, &error);
@@ -1964,24 +2040,29 @@ ecmb_test_modify_case (const gchar *case_name,
const gchar *ridstr)
{
gchar *calobj;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
g_assert_nonnull (case_name);
calobj = tcu_new_icalstring_from_test_case (case_name);
g_assert_nonnull (calobj);
- icalcomp = icalcomponent_new_from_string (calobj);
- g_assert_nonnull (icalcomp);
+ icomp = i_cal_component_new_from_string (calobj);
+ g_assert_nonnull (icomp);
g_free (calobj);
- icalcomponent_set_summary (icalcomp, MODIFIED_SUMMARY_STR);
- icalcomponent_set_sequence (icalcomp, icalcomponent_get_sequence (icalcomp) + 1);
+ i_cal_component_set_summary (icomp, MODIFIED_SUMMARY_STR);
+ i_cal_component_set_sequence (icomp, i_cal_component_get_sequence (icomp) + 1);
- if (ridstr)
- icalcomponent_set_recurrenceid (icalcomp, icaltime_from_string (ridstr));
+ if (ridstr) {
+ ICalTimetype *itt;
- calobj = icalcomponent_as_ical_string_r (icalcomp);
- icalcomponent_free (icalcomp);
+ itt = i_cal_time_from_string (ridstr);
+ i_cal_component_set_recurrenceid (icomp, itt);
+ g_object_unref (itt);
+ }
+
+ calobj = i_cal_component_as_ical_string_r (icomp);
+ g_object_unref (icomp);
return calobj;
}
@@ -1994,7 +2075,7 @@ test_modify_objects (ECalMetaBackend *meta_backend)
ECalCache *cal_cache;
GSList *objects, *old_components = NULL, *new_components = NULL, *offline_changes;
gchar *calobj, *tmp;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
gint old_sequence;
GError *error = NULL;
@@ -2036,15 +2117,15 @@ test_modify_objects (ECalMetaBackend *meta_backend)
g_assert_cmpint (test_backend->load_count, ==, 1);
g_assert_cmpint (test_backend->save_count, ==, 1);
- icalcomp = e_cal_component_get_icalcomponent (old_components->data);
- old_sequence = icalcomponent_get_sequence (icalcomp);
- g_assert_cmpstr (icalcomponent_get_summary (icalcomp), !=, MODIFIED_SUMMARY_STR);
- g_assert_cmpstr (icalcomponent_get_uid (icalcomp), ==, "event-1");
+ icomp = e_cal_component_get_icalcomponent (old_components->data);
+ old_sequence = i_cal_component_get_sequence (icomp);
+ g_assert_cmpstr (i_cal_component_get_summary (icomp), !=, MODIFIED_SUMMARY_STR);
+ g_assert_cmpstr (i_cal_component_get_uid (icomp), ==, "event-1");
- icalcomp = e_cal_component_get_icalcomponent (new_components->data);
- g_assert_cmpint (old_sequence + 1, ==, icalcomponent_get_sequence (icalcomp));
- g_assert_cmpstr (icalcomponent_get_summary (icalcomp), ==, MODIFIED_SUMMARY_STR);
- g_assert_cmpstr (icalcomponent_get_uid (icalcomp), ==, "event-1");
+ icomp = e_cal_component_get_icalcomponent (new_components->data);
+ g_assert_cmpint (old_sequence + 1, ==, i_cal_component_get_sequence (icomp));
+ g_assert_cmpstr (i_cal_component_get_summary (icomp), ==, MODIFIED_SUMMARY_STR);
+ g_assert_cmpstr (i_cal_component_get_uid (icomp), ==, "event-1");
g_slist_free_full (old_components, g_object_unref);
g_slist_free_full (new_components, g_object_unref);
@@ -2068,15 +2149,15 @@ test_modify_objects (ECalMetaBackend *meta_backend)
g_assert_cmpint (test_backend->load_count, ==, 0);
g_assert_cmpint (test_backend->save_count, ==, 0);
- icalcomp = e_cal_component_get_icalcomponent (old_components->data);
- old_sequence = icalcomponent_get_sequence (icalcomp);
- g_assert_cmpstr (icalcomponent_get_summary (icalcomp), !=, MODIFIED_SUMMARY_STR);
- g_assert_cmpstr (icalcomponent_get_uid (icalcomp), ==, "event-2");
+ icomp = e_cal_component_get_icalcomponent (old_components->data);
+ old_sequence = i_cal_component_get_sequence (icomp);
+ g_assert_cmpstr (i_cal_component_get_summary (icomp), !=, MODIFIED_SUMMARY_STR);
+ g_assert_cmpstr (i_cal_component_get_uid (icomp), ==, "event-2");
- icalcomp = e_cal_component_get_icalcomponent (new_components->data);
- g_assert_cmpint (old_sequence + 1, ==, icalcomponent_get_sequence (icalcomp));
- g_assert_cmpstr (icalcomponent_get_summary (icalcomp), ==, MODIFIED_SUMMARY_STR);
- g_assert_cmpstr (icalcomponent_get_uid (icalcomp), ==, "event-2");
+ icomp = e_cal_component_get_icalcomponent (new_components->data);
+ g_assert_cmpint (old_sequence + 1, ==, i_cal_component_get_sequence (icomp));
+ g_assert_cmpstr (i_cal_component_get_summary (icomp), ==, MODIFIED_SUMMARY_STR);
+ g_assert_cmpstr (i_cal_component_get_uid (icomp), ==, "event-2");
g_slist_free_full (old_components, g_object_unref);
g_slist_free_full (new_components, g_object_unref);
@@ -2107,15 +2188,15 @@ test_modify_objects (ECalMetaBackend *meta_backend)
g_assert_cmpint (test_backend->load_count, ==, 2);
g_assert_cmpint (test_backend->save_count, ==, 2);
- icalcomp = e_cal_component_get_icalcomponent (old_components->data);
- old_sequence = icalcomponent_get_sequence (icalcomp);
- g_assert_cmpstr (icalcomponent_get_summary (icalcomp), !=, MODIFIED_SUMMARY_STR);
- g_assert_cmpstr (icalcomponent_get_uid (icalcomp), ==, "event-4");
+ icomp = e_cal_component_get_icalcomponent (old_components->data);
+ old_sequence = i_cal_component_get_sequence (icomp);
+ g_assert_cmpstr (i_cal_component_get_summary (icomp), !=, MODIFIED_SUMMARY_STR);
+ g_assert_cmpstr (i_cal_component_get_uid (icomp), ==, "event-4");
- icalcomp = e_cal_component_get_icalcomponent (new_components->data);
- g_assert_cmpint (old_sequence + 1, ==, icalcomponent_get_sequence (icalcomp));
- g_assert_cmpstr (icalcomponent_get_summary (icalcomp), ==, MODIFIED_SUMMARY_STR);
- g_assert_cmpstr (icalcomponent_get_uid (icalcomp), ==, "event-4");
+ icomp = e_cal_component_get_icalcomponent (new_components->data);
+ g_assert_cmpint (old_sequence + 1, ==, i_cal_component_get_sequence (icomp));
+ g_assert_cmpstr (i_cal_component_get_summary (icomp), ==, MODIFIED_SUMMARY_STR);
+ g_assert_cmpstr (i_cal_component_get_uid (icomp), ==, "event-4");
g_slist_free_full (old_components, g_object_unref);
g_slist_free_full (new_components, g_object_unref);
@@ -2147,15 +2228,15 @@ test_modify_objects (ECalMetaBackend *meta_backend)
g_assert_cmpint (test_backend->load_count, ==, 3);
g_assert_cmpint (test_backend->save_count, ==, 3);
- icalcomp = e_cal_component_get_icalcomponent (old_components->data);
- old_sequence = icalcomponent_get_sequence (icalcomp);
- g_assert_cmpstr (icalcomponent_get_uid (icalcomp), ==, "event-6");
- g_assert_cmpstr (icalcomponent_get_summary (icalcomp), !=, MODIFIED_SUMMARY_STR);
+ icomp = e_cal_component_get_icalcomponent (old_components->data);
+ old_sequence = i_cal_component_get_sequence (icomp);
+ g_assert_cmpstr (i_cal_component_get_uid (icomp), ==, "event-6");
+ g_assert_cmpstr (i_cal_component_get_summary (icomp), !=, MODIFIED_SUMMARY_STR);
- icalcomp = e_cal_component_get_icalcomponent (new_components->data);
- g_assert_cmpstr (icalcomponent_get_uid (icalcomp), ==, "event-6");
- g_assert_cmpstr (icalcomponent_get_summary (icalcomp), ==, MODIFIED_SUMMARY_STR);
- g_assert_cmpint (old_sequence + 1, ==, icalcomponent_get_sequence (icalcomp));
+ icomp = e_cal_component_get_icalcomponent (new_components->data);
+ g_assert_cmpstr (i_cal_component_get_uid (icomp), ==, "event-6");
+ g_assert_cmpstr (i_cal_component_get_summary (icomp), ==, MODIFIED_SUMMARY_STR);
+ g_assert_cmpint (old_sequence + 1, ==, i_cal_component_get_sequence (icomp));
g_slist_free_full (old_components, g_object_unref);
g_slist_free_full (new_components, g_object_unref);
@@ -2355,7 +2436,7 @@ test_receive_objects (ECalMetaBackend *meta_backend)
ECalBackendSyncClass *backend_class;
ECalCache *cal_cache;
gchar *calobj;
- icalcomponent *icalcomp;
+ ICalComponent *icomp, *firsticomp;
GSList *ids, *old_components = NULL, *new_components = NULL;
GError *error = NULL;
@@ -2375,14 +2456,17 @@ test_receive_objects (ECalMetaBackend *meta_backend)
calobj = tcu_new_icalstring_from_test_case ("invite-1");
g_assert_nonnull (calobj);
- icalcomp = icalcomponent_new_from_string (calobj);
- g_assert_nonnull (icalcomp);
- g_assert_nonnull (icalcomponent_get_first_component (icalcomp, ICAL_VEVENT_COMPONENT));
+ icomp = i_cal_component_new_from_string (calobj);
+ g_assert_nonnull (icomp);
+
+ firsticomp = i_cal_component_get_first_component (icomp, ICAL_VEVENT_COMPONENT);
+ g_assert_nonnull (firsticomp);
+
g_free (calobj);
- icalcomponent_add_component (test_backend->vcalendar, icalcomponent_new_clone
(icalcomponent_get_first_component (icalcomp, ICAL_VEVENT_COMPONENT)));
+ i_cal_component_take_component (test_backend->vcalendar, i_cal_component_new_clone (firsticomp));
- icalcomponent_free (icalcomp);
+ g_object_unref (icomp);
/* To get the 'invite' component into local cache */
e_cal_meta_backend_test_call_refresh (meta_backend);
@@ -3240,7 +3324,7 @@ test_get_object (ECalMetaBackend *meta_backend)
ECalMetaBackendTest *test_backend;
ECalBackendSyncClass *backend_class;
ECalCache *cal_cache;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
gchar *calobj = NULL;
GError *error = NULL;
@@ -3270,11 +3354,11 @@ test_get_object (ECalMetaBackend *meta_backend)
g_assert (strstr (calobj, "UID:event-6"));
g_assert (strstr (calobj, "RECURRENCE-ID;TZID=America/New_York:20170225T134900"));
- icalcomp = icalcomponent_new_from_string (calobj);
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_isa (icalcomp), ==, ICAL_VCALENDAR_COMPONENT);
- g_assert_cmpint (icalcomponent_count_components (icalcomp, ICAL_VEVENT_COMPONENT), ==, 2);
- icalcomponent_free (icalcomp);
+ icomp = i_cal_component_new_from_string (calobj);
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_isa (icomp), ==, I_CAL_VCALENDAR_COMPONENT);
+ g_assert_cmpint (i_cal_component_count_components (icomp, I_CAL_VEVENT_COMPONENT), ==, 2);
+ g_object_unref (icomp);
g_free (calobj);
calobj = NULL;
@@ -3288,10 +3372,10 @@ test_get_object (ECalMetaBackend *meta_backend)
g_assert (strstr (calobj, "UID:event-6"));
g_assert (strstr (calobj, "RECURRENCE-ID;TZID=America/New_York:20170225T134900"));
- icalcomp = icalcomponent_new_from_string (calobj);
- g_assert_nonnull (icalcomp);
- g_assert_cmpint (icalcomponent_isa (icalcomp), ==, ICAL_VEVENT_COMPONENT);
- icalcomponent_free (icalcomp);
+ icomp = i_cal_component_new_from_string (calobj);
+ g_assert_nonnull (icomp);
+ g_assert_cmpint (i_cal_component_isa (icomp), ==, I_CAL_VEVENT_COMPONENT);
+ g_object_unref (icomp);
g_free (calobj);
calobj = NULL;
@@ -3385,7 +3469,7 @@ test_refresh (ECalMetaBackend *meta_backend)
ECalCache *cal_cache;
ECache *cache;
guint count;
- icalcomponent *icalcomp;
+ ICalComponent *icomp;
gchar *sync_tag;
GError *error = NULL;
@@ -3466,11 +3550,11 @@ test_refresh (ECalMetaBackend *meta_backend)
NULL);
/* Modify the master object, thus the detached instance will be recognized */
- for (icalcomp = icalcomponent_get_first_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;
- icalcomp = icalcomponent_get_next_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT)) {
- if (g_strcmp0 ("event-6", icalcomponent_get_uid (icalcomp)) == 0) {
- icalcomponent_set_sequence (icalcomp, icalcomponent_get_sequence (icalcomp) + 1);
+ for (icomp = i_cal_component_get_first_component (test_backend->vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;
+ g_object_unref (icomp), icomp = i_cal_component_get_next_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT)) {
+ if (g_strcmp0 ("event-6", i_cal_component_get_uid (icomp)) == 0) {
+ i_cal_component_set_sequence (icomp, i_cal_component_get_sequence (icomp) + 1);
}
}
@@ -3531,12 +3615,12 @@ test_refresh (ECalMetaBackend *meta_backend)
ecmb_test_remove_component (test_backend, "event-6", NULL);
ecmb_test_remove_component (test_backend, "event-6", "20170225T134900");
- for (icalcomp = icalcomponent_get_first_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT);
- icalcomp;
- icalcomp = icalcomponent_get_next_component (test_backend->vcalendar, ICAL_VEVENT_COMPONENT)) {
- if (g_strcmp0 ("event-5", icalcomponent_get_uid (icalcomp)) == 0 ||
- g_strcmp0 ("event-9", icalcomponent_get_uid (icalcomp)) == 0) {
- icalcomponent_set_sequence (icalcomp, icalcomponent_get_sequence (icalcomp) + 1);
+ for (icomp = i_cal_component_get_first_component (test_backend->vcalendar, I_CAL_VEVENT_COMPONENT);
+ icomp;
+ g_object_unref (icomp), icomp = i_cal_component_get_next_component (test_backend->vcalendar,
I_CAL_VEVENT_COMPONENT)) {
+ if (g_strcmp0 ("event-5", i_cal_component_get_uid (icomp)) == 0 ||
+ g_strcmp0 ("event-9", i_cal_component_get_uid (icomp)) == 0) {
+ i_cal_component_set_sequence (icomp, i_cal_component_get_sequence (icomp) + 1);
}
}
diff --git a/tests/libedata-cal/test-intervaltree.c b/tests/libedata-cal/test-intervaltree.c
index e0c102557..f1f65a9f6 100644
--- a/tests/libedata-cal/test-intervaltree.c
+++ b/tests/libedata-cal/test-intervaltree.c
@@ -158,7 +158,7 @@ create_test_component (time_t start,
txt = g_strdup_printf ("%" G_GINT64_FORMAT "- %" G_GINT64_FORMAT, (gint64) start, (gint64) end);
- summary = e_cal_component_new (txt, NULL);
+ summary = e_cal_component_text_new (txt, NULL);
e_cal_component_set_summary (comp, summary);
e_cal_component_text_free (summary);
@@ -416,7 +416,7 @@ mem_test (void)
e_intervaltree_insert (tree, start, end, comp);
g_assert (((GObject *) comp)->ref_count == 2);
- e_cal_component_get_uid (comp, &uid);
+ 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
