Menu
▾
▴
[Opensync-commits] r1190 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 12:53:12
|
Author: bellmich Date: Mon Jul 13 14:53:05 2009 New Revision: 1190 URL: http://libsyncml.opensync.org/changeset/1190 Log: fixed wrong error handling of OBEX tests Modified: trunk/tests/check_obex.c Modified: trunk/tests/check_obex.c ============================================================================== --- trunk/tests/check_obex.c Mon Jul 13 14:51:30 2009 (r1189) +++ trunk/tests/check_obex.c Mon Jul 13 14:53:05 2009 (r1190) @@ -59,7 +59,7 @@ GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -72,16 +72,16 @@ GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -94,7 +94,7 @@ GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -159,9 +159,9 @@ if (GPOINTER_TO_INT(userdata) == 1) { data = smlTransportDataNew((char *)"answer", 7, SML_MIMETYPE_XML, FALSE, &locerror); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(locerror == NULL, "%s", locerror->message); + sml_fail_unless(locerror == NULL, "%s", GET_ERROR_MESSAGE(locerror)); - sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", locerror->message); + sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", GET_ERROR_MESSAGE(locerror)); smlTransportDataDeref(data); } else if (GPOINTER_TO_INT(userdata) == 2) { @@ -198,7 +198,7 @@ g_atomic_int_inc(&server_disconnect_done); break; case SML_TRANSPORT_EVENT_ERROR: - sml_fail_unless(FALSE, "%s", error->message); + sml_fail_unless(FALSE, "%s", GET_ERROR_MESSAGE(error)); break; default: sml_fail_unless(FALSE, "An unexpected transport event %d was received.", type); @@ -231,10 +231,10 @@ GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportSetConnectionType(tsp, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); /* 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. @@ -243,11 +243,11 @@ smlTransportSetEventCallback(tsp, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -271,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", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -318,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", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); while (server_receives < 1) { usleep(50); }; sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while ((client_disconnect_done < 1 || server_disconnect_done < 1 @@ -396,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", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -455,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", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; @@ -470,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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); @@ -485,7 +485,7 @@ } sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -535,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", 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(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - 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); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - 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); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; @@ -629,20 +629,20 @@ smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); /* Always start the server first. */ - 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(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; @@ -652,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", error->message); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - 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); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - 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); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); while (1) { @@ -681,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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; @@ -718,11 +718,11 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sleep(1); while (client_errors < 1) { usleep(50); }; @@ -764,12 +764,12 @@ 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", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_errors < 1 || server_connect_done < 1) { usleep(50); }; @@ -825,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", 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(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - 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); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - 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); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); 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", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; |
