[evolution-data-server/treitter-client-gdbus] Port EDataCal method 'getTimezone' and add a regression test.
- From: Travis Reitter <treitter src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server/treitter-client-gdbus] Port EDataCal method 'getTimezone' and add a regression test.
- Date: Tue, 22 Dec 2009 06:58:31 +0000 (UTC)
commit 031d1cd73edec84c80af2839ef1e80b81f2a6eff
Author: Travis Reitter <treitter gmail com>
Date: Mon Dec 21 22:57:12 2009 -0800
Port EDataCal method 'getTimezone' and add a regression test.
calendar/libecal/e-cal.c | 4 +-
calendar/libecal/e-data-cal-gdbus-bindings.h | 15 ++++++++++++
calendar/tests/ecal/Makefile.am | 3 ++
calendar/tests/ecal/ecal-test-utils.c | 16 +++++++++++++
calendar/tests/ecal/ecal-test-utils.h | 4 +++
calendar/tests/ecal/test-ecal-get-timezone.c | 31 ++++++++++++++++++++++++++
6 files changed, 71 insertions(+), 2 deletions(-)
---
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index c01c2ac..5332966 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -3683,7 +3683,7 @@ e_cal_get_timezone (ECal *ecal, const gchar *tzid, icaltimezone **zone, GError *
e_return_error_if_fail (zone, E_CALENDAR_STATUS_INVALID_ARG);
e_return_error_if_fail (E_IS_CAL (ecal), E_CALENDAR_STATUS_INVALID_ARG);
priv = ecal->priv;
- e_return_error_if_fail (priv->proxy, E_CALENDAR_STATUS_REPOSITORY_OFFLINE);
+ e_return_error_if_fail (priv->gdbus_proxy, E_CALENDAR_STATUS_REPOSITORY_OFFLINE);
*zone = NULL;
if (priv->load_state != E_CAL_LOAD_LOADED) {
@@ -3719,7 +3719,7 @@ e_cal_get_timezone (ECal *ecal, const gchar *tzid, icaltimezone **zone, GError *
if (!systzid) {
/* call the backend */
LOCK_CONN ();
- if (!org_gnome_evolution_dataserver_calendar_Cal_get_timezone (priv->proxy, tzid, &object, error)) {
+ if (!e_data_cal_gdbus_get_timezone_sync (priv->gdbus_proxy, tzid, &object, error)) {
UNLOCK_CONN ();
E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_CORBA_EXCEPTION, error);
}
diff --git a/calendar/libecal/e-data-cal-gdbus-bindings.h b/calendar/libecal/e-data-cal-gdbus-bindings.h
index dc82f46..0f24e70 100644
--- a/calendar/libecal/e-data-cal-gdbus-bindings.h
+++ b/calendar/libecal/e-data-cal-gdbus-bindings.h
@@ -291,4 +291,19 @@ e_data_cal_gdbus_remove_object_sync (GDBusProxy *proxy,
return demarshal_retvals__VOID (retvals);
}
+static gboolean
+e_data_cal_gdbus_get_timezone_sync (GDBusProxy *proxy,
+ const char *IN_tzid,
+ char **OUT_object,
+ GError **error)
+{
+ GVariant *parameters;
+ GVariant *retvals;
+
+ parameters = g_variant_new ("(s)", IN_tzid);
+ retvals = g_dbus_proxy_invoke_method_sync (proxy, "getTimezone", parameters, -1, NULL, error);
+
+ return demarshal_retvals__STRING (retvals, OUT_object);
+}
+
G_END_DECLS
diff --git a/calendar/tests/ecal/Makefile.am b/calendar/tests/ecal/Makefile.am
index 815e38c..812701d 100644
--- a/calendar/tests/ecal/Makefile.am
+++ b/calendar/tests/ecal/Makefile.am
@@ -34,6 +34,7 @@ test_scripts = \
TESTS = \
test-ecal-remove \
test-ecal-open \
+ test-ecal-get-timezone \
test-ecal-get-alarm-email-address \
test-ecal-get-cal-address \
test-ecal-get-ldap-attribute \
@@ -74,6 +75,8 @@ test_ecal_get_object_list_LDADD=$(TEST_ECAL_LIBS)
test_ecal_get_object_list_CPPFLAGS=$(TEST_ECAL_CPPFLAGS)
test_ecal_get_objects_for_uid_LDADD=$(TEST_ECAL_LIBS)
test_ecal_get_objects_for_uid_CPPFLAGS=$(TEST_ECAL_CPPFLAGS)
+test_ecal_get_timezone_LDADD=$(TEST_ECAL_LIBS)
+test_ecal_get_timezone_CPPFLAGS=$(TEST_ECAL_CPPFLAGS)
test_ecal_modify_object_LDADD=$(TEST_ECAL_LIBS)
test_ecal_modify_object_CPPFLAGS=$(TEST_ECAL_CPPFLAGS)
test_ecal_open_LDADD=$(TEST_ECAL_LIBS)
diff --git a/calendar/tests/ecal/ecal-test-utils.c b/calendar/tests/ecal/ecal-test-utils.c
index 49c4b08..5c959e1 100644
--- a/calendar/tests/ecal/ecal-test-utils.c
+++ b/calendar/tests/ecal/ecal-test-utils.c
@@ -531,3 +531,19 @@ ecal_test_utils_cal_component_set_icalcomponent (ECalComponent *e_component,
g_error ("Could not set icalcomponent\n");
}
}
+
+icaltimezone*
+ecal_test_utils_cal_get_timezone (ECal *cal,
+ const char *tzid)
+{
+ GError *error = NULL;
+ icaltimezone *zone = NULL;
+
+ if (!e_cal_get_timezone (cal, tzid, &zone, &error)) {
+ g_warning ("failed to get icaltimezone* for ID '%s'; %s\n", tzid, error->message);
+ exit(1);
+ }
+ g_print ("successfully got icaltimezone* for ID '%s'\n", tzid);
+
+ return zone;
+}
diff --git a/calendar/tests/ecal/ecal-test-utils.h b/calendar/tests/ecal/ecal-test-utils.h
index 77918f8..aea710f 100644
--- a/calendar/tests/ecal/ecal-test-utils.h
+++ b/calendar/tests/ecal/ecal-test-utils.h
@@ -116,4 +116,8 @@ void
ecal_test_utils_cal_component_set_icalcomponent (ECalComponent *e_component,
icalcomponent *component);
+icaltimezone*
+ecal_test_utils_cal_get_timezone (ECal *cal,
+ const char *tzid);
+
#endif /* _ECAL_TEST_UTILS_H */
diff --git a/calendar/tests/ecal/test-ecal-get-timezone.c b/calendar/tests/ecal/test-ecal-get-timezone.c
new file mode 100644
index 0000000..3f6961b
--- /dev/null
+++ b/calendar/tests/ecal/test-ecal-get-timezone.c
@@ -0,0 +1,31 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+#include <stdlib.h>
+#include <libecal/e-cal.h>
+#include <libical/ical.h>
+
+#include "ecal-test-utils.h"
+
+gint
+main (gint argc, gchar **argv)
+{
+ ECal *cal;
+ char *uri = NULL;
+ icaltimezone *zone;
+ icaltimezone *utc_zone;
+
+ g_type_init ();
+
+ cal = ecal_test_utils_cal_new_temp (&uri, E_CAL_SOURCE_TYPE_EVENT);
+ ecal_test_utils_cal_open (cal, FALSE);
+
+ zone = ecal_test_utils_cal_get_timezone (cal, "UTC");
+ utc_zone = icaltimezone_get_utc_timezone ();
+
+ g_assert (!g_strcmp0 (icaltimezone_get_tzid (zone),
+ icaltimezone_get_tzid (utc_zone)));
+
+ ecal_test_utils_cal_remove (cal);
+
+ return 0;
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]