Menu
▾
▴
[Opensync-commits] r1175 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 12:00:18
|
Author: bellmich Date: Mon Jul 13 14:00:10 2009 New Revision: 1175 URL: http://libsyncml.opensync.org/changeset/1175 Log: migrated check_obex from SmlError to GError Modified: trunk/tests/check_obex.c Modified: trunk/tests/check_obex.c ============================================================================== --- trunk/tests/check_obex.c Mon Jul 13 13:57:22 2009 (r1174) +++ trunk/tests/check_obex.c Mon Jul 13 14:00:10 2009 (r1175) @@ -23,6 +23,7 @@ #include <libsyncml/sml_transport_internals.h> #include <libsyncml/transports/obex_internals.h> +#include <libsyncml/sml_error_internals.h> START_TEST (obex_get_result_macro) { @@ -55,10 +56,10 @@ { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportFree(tsp); } @@ -68,19 +69,19 @@ { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportSetConfigOption(tsp, "URL", "127.0.0.1", &error), NULL); sml_fail_unless(smlTransportSetConnectionType(tsp, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), NULL); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportFree(tsp); } @@ -90,10 +91,10 @@ { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportFree(tsp); } @@ -104,7 +105,7 @@ int client_receives = 0; int client_errors = 0; -SmlBool _recv_client_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) +gboolean _recv_client_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, const GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %p, %d)", __func__, tsp, link_, type); @@ -140,10 +141,12 @@ int server_disconnect_done = 0; int server_receives = 0; -SmlBool _recv_server_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) +gboolean _recv_server_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, const GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%d, %p)", __func__, type, error); - + + GError *locerror = NULL; + switch (type) { case SML_TRANSPORT_EVENT_DATA: g_atomic_int_inc(&server_receives); @@ -154,20 +157,20 @@ sml_fail_unless(link_ != NULL, NULL); if (GPOINTER_TO_INT(userdata) == 1) { - data = smlTransportDataNew((char *)"answer", 7, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"answer", 7, SML_MIMETYPE_XML, FALSE, &locerror); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(locerror == NULL, "%s", locerror->message); - sml_fail_unless(smlTransportSend(tsp, link_, data, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", locerror->message); smlTransportDataDeref(data); } else if (GPOINTER_TO_INT(userdata) == 2) { - SmlError *newerror = NULL; - smlErrorSet(&newerror, SML_ERROR_GENERIC, "test"); - smlTransportSetError(tsp, link_, &newerror); - smlErrorDeref(&newerror); + GError *newerror = NULL; + SML_SET_ERROR(&newerror, SML_ERROR_GENERIC, "test"); + smlTransportSendError(tsp, link_, newerror); + SML_ERROR_FREE(newerror); } else if (GPOINTER_TO_INT(userdata) == 3) { - sml_fail_unless(smlTransportDisconnect(tsp, link_, &error), NULL); + sml_fail_unless(smlTransportDisconnect(tsp, link_, &locerror), NULL); } else { sml_fail_unless(FALSE, "The userdata %d was not expected.", GPOINTER_TO_INT(userdata)); } @@ -176,10 +179,10 @@ sml_fail_unless(data->type == SML_MIMETYPE_XML, NULL); sml_fail_unless(link_ != NULL, NULL); - SmlError *newerror = NULL; - smlErrorSet(&newerror, SML_ERROR_GENERIC, "test2"); - smlTransportSetError(tsp, link_, &newerror); - smlErrorDeref(&newerror); + GError *newerror = NULL; + SML_SET_ERROR(&newerror, SML_ERROR_GENERIC, "test2"); + smlTransportSendError(tsp, link_, newerror); + SML_ERROR_FREE(newerror); } else { sml_fail_unless(FALSE, "The received data was not expected (%s).", data->data); } @@ -195,7 +198,7 @@ g_atomic_int_inc(&server_disconnect_done); break; case SML_TRANSPORT_EVENT_ERROR: - sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", error->message); break; default: sml_fail_unless(FALSE, "An unexpected transport event %d was received.", type); @@ -225,13 +228,13 @@ { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportSetConnectionType(tsp, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); /* Don't use the default port 650 here because this is a reserved port in Unix. * Therefore the port is usually only allowed for the root user. @@ -240,11 +243,11 @@ smlTransportSetEventCallback(tsp, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportFree(tsp); } @@ -254,7 +257,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); @@ -268,17 +271,17 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -301,7 +304,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); @@ -315,28 +318,28 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(3)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); while (server_receives < 1) { usleep(50); }; sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while ((client_disconnect_done < 1 || server_disconnect_done < 1 @@ -379,7 +382,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); @@ -393,26 +396,26 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -438,7 +441,7 @@ int num = 10; - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); @@ -452,12 +455,12 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; @@ -467,10 +470,10 @@ for (i = 0; i < num; i++) { data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); @@ -482,7 +485,7 @@ } sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -506,7 +509,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); SmlTransport *client1 = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); SmlTransport *client2 = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); @@ -532,44 +535,44 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client1, &error), NULL); sml_fail_unless(smlTransportConnect(client2, &error), NULL); sml_fail_unless(smlTransportConnect(client3, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; @@ -599,7 +602,7 @@ int num = 1000; - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); SmlTransport *client1 = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); SmlTransport *client2 = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); @@ -626,20 +629,20 @@ smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); /* Always start the server first. */ - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client1, &error), NULL); sml_fail_unless(smlTransportConnect(client2, &error), NULL); sml_fail_unless(smlTransportConnect(client3, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; @@ -649,23 +652,23 @@ for (i = 0; i < num; i++) { data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); while (1) { @@ -678,7 +681,7 @@ sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; @@ -706,7 +709,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *client = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); sml_fail_unless(smlTransportSetConfigOption(client, "URL", "127.0.0.1", &error), NULL); @@ -715,18 +718,18 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); sleep(1); while (client_errors < 1) { usleep(50); }; sml_fail_unless(!smlTransportDisconnect(client, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); /* The client is stateful and so disconnect is false * because the client was never connected. @@ -747,7 +750,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); @@ -761,18 +764,18 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(4)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_errors < 1 || server_connect_done < 1) { usleep(50); }; sml_fail_unless(!smlTransportDisconnect(client, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); while (server_disconnect_done < 1) { usleep(50); }; @@ -796,7 +799,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); SmlTransport *client1 = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); SmlTransport *client2 = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); @@ -822,44 +825,44 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportConnect(client1, &error), NULL); sml_fail_unless(smlTransportConnect(client2, &error), NULL); sml_fail_unless(smlTransportConnect(client3, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportDataDeref(data); sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; |
