diff options
Diffstat (limited to 'gdata/tests/calendar.c')
| -rw-r--r-- | gdata/tests/calendar.c | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c index 892c4aaf..e2de99f9 100644 --- a/gdata/tests/calendar.c +++ b/gdata/tests/calendar.c @@ -938,7 +938,7 @@ test_access_rule_properties (void) GDataAccessRule *rule; const gchar *scope_type, *scope_value; - rule = gdata_access_rule_new (NULL); + rule = gdata_calendar_access_rule_new (NULL); gdata_access_rule_set_role (rule, GDATA_CALENDAR_ACCESS_ROLE_EDITOR); g_assert_cmpstr (gdata_access_rule_get_role (rule), ==, GDATA_CALENDAR_ACCESS_ROLE_EDITOR); @@ -954,22 +954,20 @@ test_access_rule_json (void) { GDataAccessRule *rule; - rule = gdata_access_rule_new (NULL); + rule = gdata_calendar_access_rule_new (NULL); gdata_access_rule_set_role (rule, GDATA_CALENDAR_ACCESS_ROLE_EDITOR); gdata_access_rule_set_scope (rule, GDATA_ACCESS_SCOPE_USER, "darcy@gmail.com"); /* Check the JSON */ - gdata_test_assert_json (rule, - "<?xml version='1.0' encoding='UTF-8'?>" - "<entry xmlns='http://www.w3.org/2005/Atom' " - "xmlns:gd='http://schemas.google.com/g/2005' " - "xmlns:gAcl='http://schemas.google.com/acl/2007'>" - "<title type='text'>http://schemas.google.com/gCal/2005#editor</title>" - "<category term='http://schemas.google.com/acl/2007#accessRule' scheme='http://schemas.google.com/g/2005#kind'/>" - "<gAcl:role value='http://schemas.google.com/gCal/2005#editor'/>" - "<gAcl:scope type='user' value='darcy@gmail.com'/>" - "</entry>"); + gdata_test_assert_json (rule, "{" + "'kind': 'calendar#aclRule'," + "'role': 'writer'," + "'scope': {" + "'type': 'user'," + "'value': 'darcy@gmail.com'" + "}" + "}"); } static void @@ -1088,6 +1086,7 @@ set_up_temp_calendar_acls (TempCalendarAclsData *data, gconstpointer service) { GDataAccessRule *rule; GDataLink *_link; + GError *error = NULL; /* Set up a calendar */ set_up_temp_calendar ((TempCalendarData*) data, service); @@ -1095,7 +1094,7 @@ set_up_temp_calendar_acls (TempCalendarAclsData *data, gconstpointer service) gdata_test_mock_server_start_trace (mock_server, "setup-temp-calendar-acls"); /* Add an access rule to the calendar */ - rule = gdata_access_rule_new (NULL); + rule = gdata_calendar_access_rule_new (NULL); gdata_access_rule_set_role (rule, GDATA_CALENDAR_ACCESS_ROLE_EDITOR); gdata_access_rule_set_scope (rule, GDATA_ACCESS_SCOPE_USER, "darcy@gmail.com"); @@ -1106,8 +1105,10 @@ set_up_temp_calendar_acls (TempCalendarAclsData *data, gconstpointer service) data->rule = GDATA_ACCESS_RULE (gdata_service_insert_entry (GDATA_SERVICE (service), gdata_calendar_service_get_primary_authorization_domain (), - gdata_link_get_uri (_link), GDATA_ENTRY (rule), NULL, NULL)); - g_assert (GDATA_IS_ACCESS_RULE (data->rule)); + gdata_link_get_uri (_link), GDATA_ENTRY (rule), NULL, + &error)); + g_assert_no_error (error); + g_assert (GDATA_IS_CALENDAR_ACCESS_RULE (data->rule)); g_object_unref (rule); @@ -1173,7 +1174,7 @@ test_access_rule_insert (TempCalendarAclsData *data, gconstpointer service) gdata_test_mock_server_start_trace (mock_server, "access-rule-insert"); - rule = gdata_access_rule_new (NULL); + rule = gdata_calendar_access_rule_new (NULL); gdata_access_rule_set_role (rule, GDATA_CALENDAR_ACCESS_ROLE_EDITOR); gdata_access_rule_set_scope (rule, GDATA_ACCESS_SCOPE_USER, "darcy@gmail.com"); @@ -1367,7 +1368,8 @@ main (int argc, char *argv[]) authorizer = create_global_authorizer (); service = GDATA_SERVICE (gdata_calendar_service_new (authorizer)); - +#if 0 +TODO g_test_add_func ("/calendar/authentication", test_authentication); g_test_add ("/calendar/query/all_calendars", QueryCalendarsData, service, set_up_query_calendars, test_query_all_calendars, @@ -1401,9 +1403,7 @@ main (int argc, char *argv[]) tear_down_insert_event_async); g_test_add ("/calendar/event/insert/async/cancellation", GDataAsyncTestData, service, set_up_insert_event_async, test_event_insert_async_cancellation, tear_down_insert_event_async); - -#if 0 -TODO +#endif g_test_add ("/calendar/access-rule/get", TempCalendarAclsData, service, set_up_temp_calendar_acls, test_access_rule_get, tear_down_temp_calendar_acls); g_test_add ("/calendar/access-rule/insert", TempCalendarAclsData, service, set_up_temp_calendar_acls_no_insertion, @@ -1412,8 +1412,9 @@ TODO tear_down_temp_calendar_acls); g_test_add ("/calendar/access-rule/delete", TempCalendarAclsData, service, set_up_temp_calendar_acls, test_access_rule_delete, tear_down_temp_calendar_acls); -#endif +#if 0 +TODO g_test_add_func ("/calendar/event/json", test_event_json); g_test_add_func ("/calendar/event/json/dates", test_event_json_dates); g_test_add_func ("/calendar/event/json/recurrence", test_event_json_recurrence); @@ -1422,15 +1423,15 @@ TODO test_calendar_event_parser_minimal); g_test_add_func ("/calendar/calendar/escaping", test_calendar_escaping); - -#if 0 -TODO +#endif g_test_add_func ("/calendar/access-rule/properties", test_access_rule_properties); g_test_add_func ("/calendar/access-rule/json", test_access_rule_json); -#endif +#if 0 +TODO g_test_add_func ("/calendar/query/uri", test_query_uri); g_test_add_func ("/calendar/query/etag", test_query_etag); +#endif retval = g_test_run (); |