Menu
▾
▴
[Opensync-commits] r962 - in trunk/tests: . mobiles
|
From: <svn...@op...> - 2009-03-02 14:31:07
|
Author: bellmich Date: Mon Mar 2 15:30:56 2009 New Revision: 962 URL: http://libsyncml.opensync.org/changeset/962 Log: make all tests thread safe by using only sml_fail_unless Modified: trunk/tests/check_data_sync_api.c trunk/tests/check_ds.c trunk/tests/check_http.c trunk/tests/check_obex.c trunk/tests/check_session.c trunk/tests/check_xml_assembler.c trunk/tests/mobiles/libsyncml_ds_server.c trunk/tests/mobiles/obex_mobile_ds_client.c Modified: trunk/tests/check_data_sync_api.c ============================================================================== --- trunk/tests/check_data_sync_api.c Mon Mar 2 15:17:28 2009 (r961) +++ trunk/tests/check_data_sync_api.c Mon Mar 2 15:30:56 2009 (r962) @@ -64,7 +64,7 @@ char *name = g_strdup_printf("%d", count); if (!smlDataSyncAddChange(client, client_source, SML_CHANGE_ADD, name , test_data, strlen(test_data), NULL, error)) - fail("%s", smlErrorPrint(error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(error)); smlSafeCFree(&name); } } @@ -84,7 +84,7 @@ switch (type) { case SML_DATA_SYNC_EVENT_ERROR: - fail("error from ds api: %s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "error from ds api: %s", smlErrorPrint(&error)); break; case SML_DATA_SYNC_EVENT_CONNECT: /* g_message("Remote device was successfully connected."); */ @@ -152,12 +152,12 @@ /* clients should never receive a change in this test */ if (dsObject == client) - fail("A change was received from the server."); + sml_fail_unless(FALSE, "A change was received from the server."); /* check the source */ if (strcmp(server_source, source)) - fail("The source %s is wrong.", server_source); + sml_fail_unless(FALSE, "The source %s is wrong.", server_source); /* handle the item */ GList *list = client_items; @@ -175,7 +175,7 @@ /* item with correct uid */ if (strcmp(list->data, data)) - fail("The data of the item %s was wrong(%s != %s).", uid, data, list->data); + sml_fail_unless(FALSE, "The data of the item %s was wrong(%s != %s).", uid, data, list->data); } smlSafeCFree(&data); @@ -318,7 +318,7 @@ return; error: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); } void run_testbed() @@ -367,7 +367,7 @@ return; error: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); } START_TEST (check_text_vcard_21) @@ -402,7 +402,7 @@ return; error: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); } END_TEST @@ -441,7 +441,7 @@ return; error: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); } END_TEST @@ -477,7 +477,7 @@ return; error: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); } END_TEST Modified: trunk/tests/check_ds.c ============================================================================== --- trunk/tests/check_ds.c Mon Mar 2 15:17:28 2009 (r961) +++ trunk/tests/check_ds.c Mon Mar 2 15:30:56 2009 (r962) @@ -280,7 +280,7 @@ g_assert(!data); g_assert(size == 0); } else { - fail("An unexpected SyncML change type %d was received.", type); + sml_fail_unless(FALSE, "An unexpected SyncML change type %d was received.", type); } if (data) @@ -452,7 +452,7 @@ smlDsSessionRecvMap(session, command, corr->dsession); break; default: - fail("An unexpected command type %d was received.", command->type); + sml_fail_unless(FALSE, "An unexpected command type %d was received.", command->type); break; } break; @@ -463,7 +463,7 @@ smlDsSessionRecvSync(session, command, corr->dsession); break; default: - fail("An unexpected command type %d was received.", command->type); + sml_fail_unless(FALSE, "An unexpected command type %d was received.", command->type); break; } break; @@ -474,10 +474,10 @@ g_atomic_int_add(&session_ends, 1); break; case SML_SESSION_EVENT_ERROR: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); break; default: - fail("An unexpected session event %d was received.", type); + sml_fail_unless(FALSE, "An unexpected session event %d was received.", type); break; } Modified: trunk/tests/check_http.c ============================================================================== --- trunk/tests/check_http.c Mon Mar 2 15:17:28 2009 (r961) +++ trunk/tests/check_http.c Mon Mar 2 15:30:56 2009 (r962) @@ -171,7 +171,7 @@ g_atomic_int_inc(&client_errors); break; default: - fail("An unexpected transport event %d was received.", type); + sml_fail_unless(FALSE, "An unexpected transport event %d was received.", type); break; } @@ -223,7 +223,7 @@ } else if (GPOINTER_TO_INT(userdata) == 3) { sml_fail_unless(smlTransportDisconnect(tsp, link, &locerror), "%s", smlErrorPrint(&locerror)); } else { - fail("Some unexpected userdata %i was detected.", GPOINTER_TO_INT(userdata)); + sml_fail_unless(FALSE, "Some unexpected userdata %i was detected.", GPOINTER_TO_INT(userdata)); } } else if (!strcmp(data->data, "error")) { sml_fail_unless(data->size == 6, NULL); @@ -235,11 +235,11 @@ smlTransportSetError(tsp, link, &newerror); smlErrorDeref(&newerror); } else { - fail("The received data was not expected (%s).", data->data); + sml_fail_unless(FALSE, "The received data was not expected (%s).", data->data); } break; default: - fail("An unexpected transport event %d was received.", type); + sml_fail_unless(FALSE, "An unexpected transport event %d was received.", type); break; } Modified: trunk/tests/check_obex.c ============================================================================== --- trunk/tests/check_obex.c Mon Mar 2 15:17:28 2009 (r961) +++ trunk/tests/check_obex.c Mon Mar 2 15:30:56 2009 (r962) @@ -128,7 +128,7 @@ g_atomic_int_inc(&client_errors); break; default: - fail("An unexpected transport event %d was received.", type); + sml_fail_unless(FALSE, "An unexpected transport event %d was received.", type); break; } @@ -169,7 +169,7 @@ } else if (GPOINTER_TO_INT(userdata) == 3) { sml_fail_unless(smlTransportDisconnect(tsp, link, &error), NULL); } else { - fail("The userdata %d was not expected.", GPOINTER_TO_INT(userdata)); + sml_fail_unless(FALSE, "The userdata %d was not expected.", GPOINTER_TO_INT(userdata)); } } else if (!strcmp(data->data, "error")) { sml_fail_unless(data->size == 6, NULL); @@ -181,7 +181,7 @@ smlTransportSetError(tsp, link, &newerror); smlErrorDeref(&newerror); } else { - fail("The received data was not expected (%s).", data->data); + sml_fail_unless(FALSE, "The received data was not expected (%s).", data->data); } break; case SML_TRANSPORT_EVENT_CONNECT_DONE: @@ -195,10 +195,10 @@ g_atomic_int_inc(&server_disconnect_done); break; case SML_TRANSPORT_EVENT_ERROR: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); break; default: - fail("An unexpected transport event %d was received.", type); + sml_fail_unless(FALSE, "An unexpected transport event %d was received.", type); break; } Modified: trunk/tests/check_session.c ============================================================================== --- trunk/tests/check_session.c Mon Mar 2 15:17:28 2009 (r961) +++ trunk/tests/check_session.c Mon Mar 2 15:30:56 2009 (r962) @@ -458,7 +458,7 @@ if (GPOINTER_TO_INT(userdata) == 2) g_atomic_int_inc(&errors_received); else { - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); abort(); } break; Modified: trunk/tests/check_xml_assembler.c ============================================================================== --- trunk/tests/check_xml_assembler.c Mon Mar 2 15:17:28 2009 (r961) +++ trunk/tests/check_xml_assembler.c Mon Mar 2 15:30:56 2009 (r962) @@ -1519,7 +1519,7 @@ sml_fail_unless(smlAssemblerAddStatus(assm, status, &error) == SML_ASSEMBLER_RESULT_OK, NULL); sml_fail_unless(error == NULL, NULL); } else if (res != SML_ASSEMBLER_RESULT_OK) { - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); } smlStatusUnref(status); @@ -1549,7 +1549,7 @@ sml_fail_unless(smlAssemblerStartCommand(assm, NULL, cmd1, &error), NULL); sml_fail_unless(error == NULL, NULL); } else if (res != SML_ASSEMBLER_RESULT_OK) { - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); } smlCommandUnref(cmd1); Modified: trunk/tests/mobiles/libsyncml_ds_server.c ============================================================================== --- trunk/tests/mobiles/libsyncml_ds_server.c Mon Mar 2 15:17:28 2009 (r961) +++ trunk/tests/mobiles/libsyncml_ds_server.c Mon Mar 2 15:30:56 2009 (r962) @@ -49,7 +49,7 @@ switch (type) { case SML_DATA_SYNC_EVENT_ERROR: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); break; case SML_DATA_SYNC_EVENT_CONNECT: case SML_DATA_SYNC_EVENT_DISCONNECT: @@ -65,7 +65,7 @@ "%s", smlErrorPrint(&error)); break; default: - fail("The unexpected data sync event %d was received.", type); + sml_fail_unless(FALSE, "The unexpected data sync event %d was received.", type); break; } smlTrace(TRACE_EXIT, "%s", __func__); @@ -117,7 +117,7 @@ "%s", smlErrorPrint(&error)); break; default: - fail("The unsupported transport type %d was used for testing.", tspType); + sml_fail_unless(FALSE, "The unsupported transport type %d was used for testing.", tspType); } sml_fail_unless( Modified: trunk/tests/mobiles/obex_mobile_ds_client.c ============================================================================== --- trunk/tests/mobiles/obex_mobile_ds_client.c Mon Mar 2 15:17:28 2009 (r961) +++ trunk/tests/mobiles/obex_mobile_ds_client.c Mon Mar 2 15:30:56 2009 (r962) @@ -267,7 +267,7 @@ data->data, data->size, libsyncml_msg_notification_data, libsyncml_msg_notification_size)) - fail("wrong notification message"); + sml_fail_unless(FALSE, "wrong notification message"); mobile_state = TEST_MOBILE_STATE_WAIT_FOR_ALERT; obex_mobile_send(link, mobile_msg_alert_data, mobile_msg_alert_size); } else if (mobile_state == TEST_MOBILE_STATE_WAIT_FOR_ALERT) { @@ -276,7 +276,7 @@ data->data, data->size, libsyncml_msg_alert_data, libsyncml_msg_alert_size)) - fail("wrong alert message"); + sml_fail_unless(FALSE, "wrong alert message"); mobile_state = TEST_MOBILE_STATE_WAIT_FOR_SYNC; obex_mobile_send(link, mobile_msg_sync_data, mobile_msg_sync_size); } else if (mobile_state == TEST_MOBILE_STATE_WAIT_FOR_SYNC) { @@ -285,7 +285,7 @@ data->data, data->size, libsyncml_msg_sync_data, libsyncml_msg_sync_size)) - fail("wrong sync message"); + sml_fail_unless(FALSE, "wrong sync message"); mobile_state = TEST_MOBILE_STATE_WAIT_FOR_END; obex_mobile_send(link, mobile_msg_map_data, mobile_msg_map_size); } else if (mobile_state == TEST_MOBILE_STATE_WAIT_FOR_END) { @@ -294,13 +294,13 @@ data->data, data->size, libsyncml_msg_end_data, libsyncml_msg_end_size)) - fail("wrong end message"); + sml_fail_unless(FALSE, "wrong end message"); mobile_state = TEST_MOBILE_STATE_FINISHED; /* The disconnect must be issued by obex client * but the mobile is the OBEX server. */ } else { - fail("The unexpected mobile state %d is set.", mobile_state); + sml_fail_unless(FALSE, "The unexpected mobile state %d is set.", mobile_state); } break; case SML_TRANSPORT_EVENT_CONNECT_DONE: @@ -312,10 +312,10 @@ mobile_state = TEST_MOBILE_STATE_DISCONNECTED; break; case SML_TRANSPORT_EVENT_ERROR: - fail("%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); break; default: - fail("The unexpected transport event %d was received.", type); + sml_fail_unless(FALSE, "The unexpected transport event %d was received.", type); break; } |
