Menu
▾
▴
[Opensync-commits] r1168 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 11:15:54
|
Author: bellmich Date: Mon Jul 13 13:15:37 2009 New Revision: 1168 URL: http://libsyncml.opensync.org/changeset/1168 Log: migrated check_ds from SmlError to GError Modified: trunk/tests/check_ds.c Modified: trunk/tests/check_ds.c ============================================================================== --- trunk/tests/check_ds.c Mon Jul 13 12:23:54 2009 (r1167) +++ trunk/tests/check_ds.c Mon Jul 13 13:15:37 2009 (r1168) @@ -116,7 +116,7 @@ { smlTrace(TRACE_INTERNAL, "%s(%p, %p)", __func__, source, callback); SmlSessionThread *check = user_data; - SmlError *error = NULL; + GError *error = NULL; smlAssert(check != NULL); smlAssert(check->data != NULL); @@ -160,7 +160,7 @@ SmlSessionThread *smlSessionRunAsync(SmlSession *session, SmlTransportData **input) { smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, session, input); - SmlError *error = NULL; + GError *error = NULL; SmlSessionThread *thread = g_malloc0(sizeof(SmlSessionThread)); @@ -267,7 +267,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static SmlBool _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, SmlError **error) +static SmlBool _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), VA_STRING(data), size, VA_STRING(contenttype), userdata, error); @@ -331,51 +331,42 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static void _add_reply(SmlDsSession *session, SmlStatus *status, const char *newuid, void *userdata) +static void _add_reply(SmlDsSession *session, SmlStatus *status, void *userdata) { - smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, session, status, VA_STRING(newuid), userdata); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata); sml_fail_unless(status != NULL, NULL); sml_fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL); sml_fail_unless(GPOINTER_TO_INT(userdata) == 1 || GPOINTER_TO_INT(userdata) == 2, NULL); - if (GPOINTER_TO_INT(userdata) == 1) { - sml_fail_unless(newuid != NULL, NULL); - sml_fail_unless(!strcmp(newuid, "newuid"), NULL); - } else { - sml_fail_unless(newuid == NULL, NULL); - } - + /* the newuid will only be received by the mapping callback */ + g_atomic_int_add(&add_replies_received, 1); smlTrace(TRACE_EXIT, "%s", __func__); } -static void _modify_reply(SmlDsSession *session, SmlStatus *status, const char *newuid, void *userdata) +static void _modify_reply(SmlDsSession *session, SmlStatus *status, void *userdata) { - smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, session, status, VA_STRING(newuid), userdata); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata); sml_fail_unless(status != NULL, NULL); sml_fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL); sml_fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL); - sml_fail_unless(newuid == NULL, NULL); - g_atomic_int_add(&modify_replies_received, 1); smlTrace(TRACE_EXIT, "%s", __func__); } -static void _delete_reply(SmlDsSession *session, SmlStatus *status, const char *newuid, void *userdata) +static void _delete_reply(SmlDsSession *session, SmlStatus *status, void *userdata) { - smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, session, status, VA_STRING(newuid), userdata); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata); sml_fail_unless(status != NULL, NULL); sml_fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL); sml_fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL); - sml_fail_unless(newuid == NULL, NULL); - g_atomic_int_add(&delete_replies_received, 1); smlTrace(TRACE_EXIT, "%s", __func__); @@ -398,7 +389,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -417,7 +408,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -431,7 +422,7 @@ } END_TEST -static void _event_callback(SmlSession *session, SmlSessionEventType type, SmlCommand *command, SmlCommand *parent, SmlStatus *reply, SmlError *error, void *userdata) +static void _event_callback(SmlSession *session, SmlSessionEventType type, SmlCommand *command, SmlCommand *parent, SmlStatus *reply, const GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, parent, reply); @@ -488,7 +479,7 @@ g_atomic_int_add(&session_ends, 1); break; case SML_SESSION_EVENT_ERROR: - sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", error->message); break; default: sml_fail_unless(FALSE, "An unexpected session event %d was received.", type); @@ -521,7 +512,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -536,9 +527,9 @@ smlDsServerSetConnectCallback(server, _recv_init_alert, server_corr); /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -633,7 +624,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -650,9 +641,9 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -759,7 +750,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -777,9 +768,9 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -908,7 +899,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -926,9 +917,9 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -1076,7 +1067,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -1094,9 +1085,9 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -1255,7 +1246,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -1273,9 +1264,9 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -1449,7 +1440,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -1467,9 +1458,9 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -1634,7 +1625,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -1652,9 +1643,9 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -1842,7 +1833,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -1860,9 +1851,9 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); /* All stuff must be sent at once. */ smlSessionSetLocalMaxMsgSize(session2, defaultMaxObjSize); @@ -2043,7 +2034,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("/vcards", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -2061,10 +2052,10 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr->thread = smlSessionRunAsync(session, &to_session); smlSessionSetRemoteMaxMsgSize(session, limit); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetRemoteMaxMsgSize(session2, limit); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); @@ -2239,7 +2230,7 @@ setup_testbed(NULL); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); @@ -2285,10 +2276,10 @@ /* Start a new session from the client */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); client_corr1->thread = smlSessionRunAsync(session, &to_session); smlSessionSetSendingMaxMsgSize(session, limit); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); server_corr->thread = smlSessionRunAsync(session2, &to_session2); smlSessionSetSendingMaxMsgSize(session2, limit); |
