[Opensync-commits] r1194 - trunk/tests/mobiles

[<svn...@op...>]

Author: bellmich
Date: Mon Jul 13 15:03:15 2009
New Revision: 1194
URL: http://libsyncml.opensync.org/changeset/1194

Log:
fixed wrong error handling in mobile tests

Modified:
   trunk/tests/mobiles/libsyncml_ds_server.c
   trunk/tests/mobiles/obex_mobile_ds_client.c

Modified: trunk/tests/mobiles/libsyncml_ds_server.c
==============================================================================
--- trunk/tests/mobiles/libsyncml_ds_server.c	Mon Jul 13 15:01:30 2009	(r1193)
+++ trunk/tests/mobiles/libsyncml_ds_server.c	Mon Jul 13 15:03:15 2009	(r1194)
@@ -52,7 +52,7 @@
 	
 	switch (type) {
 		case SML_DATA_SYNC_EVENT_ERROR:
-			sml_fail_unless(FALSE, "%s", error->message);
+			sml_fail_unless(FALSE, "%s", GET_ERROR_MESSAGE(error));
 			smlAssert(FALSE);
 			break;
 		case SML_DATA_SYNC_EVENT_CONNECT:
@@ -66,7 +66,7 @@
 		case SML_DATA_SYNC_EVENT_GOT_ALL_CHANGES:
 			sml_fail_unless(
 				smlDataSyncSendChanges(dsObject, &locerror),
-				"%s", locerror->message);
+				"%s", GET_ERROR_MESSAGE(locerror));
 			break;
 		default:
 			sml_fail_unless(FALSE, "The unexpected data sync event %d was received.", type);
@@ -100,7 +100,7 @@
 			SML_SESSION_TYPE_SERVER,
 			tspType,
 			&error);
-	sml_fail_unless(dsObject != NULL, "%s", error->message);
+	sml_fail_unless(dsObject != NULL, "%s", GET_ERROR_MESSAGE(error));
 
 	switch(tspType)
 	{
@@ -111,13 +111,13 @@
 					SML_DATA_SYNC_CONFIG_CONNECTION_TYPE,
 					SML_DATA_SYNC_CONFIG_CONNECTION_NET,
 					&error),
-				"%s", error->message);
+				"%s", GET_ERROR_MESSAGE(error));
 			sml_fail_unless(
 				smlDataSyncSetOption(
 					dsObject,
 					SML_TRANSPORT_CONFIG_PORT,
 					obex_port, &error),
-				"%s", error->message);
+				"%s", GET_ERROR_MESSAGE(error));
 			break;
 		default:
 			sml_fail_unless(FALSE, "The unsupported transport type %d was used for testing.", tspType);
@@ -128,43 +128,43 @@
 			dsObject,
 			SML_TRANSPORT_CONFIG_URL,
 			"127.0.0.1", &error),
-		"%s", error->message);
+		"%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(
 		smlDataSyncSetOption(
 			dsObject,
 			SML_DATA_SYNC_CONFIG_MAX_MSG_SIZE,
 			maxMsgSize, &error),
-		"%s", error->message);
+		"%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(
 		smlDataSyncSetOption(
 			dsObject,
 			SML_DATA_SYNC_CONFIG_MAX_OBJ_SIZE,
 			maxObjSize, &error),
-		"%s", error->message);
+		"%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(
 		smlDataSyncSetOption(
 			dsObject,
 			SML_DATA_SYNC_CONFIG_USE_WBXML,
 			enableWbxml, &error),
-		"%s", error->message);
+		"%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(
 		smlDataSyncSetOption(
 			dsObject,
 			SML_DATA_SYNC_CONFIG_IDENTIFIER,
 			identifier, &error),
-		"%s", error->message);
+		"%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(
 		smlDataSyncSetOption(
 			dsObject,
 			SML_DATA_SYNC_CONFIG_USE_TIMESTAMP_ANCHOR,
 			useTimestamp, &error),
-		"%s", error->message);
+		"%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(
 		smlDataSyncSetOption(
 			dsObject,
 			SML_DATA_SYNC_CONFIG_VERSION,
 			"1.1", &error),
-		"%s", error->message);
+		"%s", GET_ERROR_MESSAGE(error));
 
 	smlDataSyncRegisterEventCallback(dsObject, _libsyncml_event_callback, NULL);
 	smlDataSyncRegisterChangeCallback(dsObject, _recv_change, NULL);
@@ -179,14 +179,14 @@
 				NULL,
 				locList[2*i], /* source */
 				&error),
-			"%s", error->message);
+			"%s", GET_ERROR_MESSAGE(error));
 		sml_fail_unless(error == NULL, NULL);
 	}
 
-	sml_fail_unless(smlDataSyncInit(dsObject, &error), "%s", error->message);
-	sml_fail_unless(error == NULL, "%s", error->message);
-	sml_fail_unless(smlDataSyncRun(dsObject, &error), "%s", error->message);
-	sml_fail_unless(error == NULL, "%s", error->message);
+	sml_fail_unless(smlDataSyncInit(dsObject, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlDataSyncRun(dsObject, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error));
 }
 
 void libsyncml_disconnect()

Modified: trunk/tests/mobiles/obex_mobile_ds_client.c
==============================================================================
--- trunk/tests/mobiles/obex_mobile_ds_client.c	Mon Jul 13 15:01:30 2009	(r1193)
+++ trunk/tests/mobiles/obex_mobile_ds_client.c	Mon Jul 13 15:03:15 2009	(r1194)
@@ -80,14 +80,14 @@
 		mimetype = SML_MIMETYPE_WBXML;
 
 	char *msg = smlTryMalloc0(size, &error);
-	sml_fail_unless(msg != NULL, "%s", error->message);
+	sml_fail_unless(msg != NULL, "%s", GET_ERROR_MESSAGE(error));
 	memcpy(msg, data, size);
 
 	SmlTransportData *tsp_data = smlTransportDataNew(msg, size, mimetype, TRUE, &error);
 	sml_fail_unless(tsp_data != NULL, NULL);
 	sml_fail_unless(error == NULL, NULL);
 
-	sml_fail_unless(smlTransportSend(mobile_tsp, link_, tsp_data, &error), "%s", error->message);
+	sml_fail_unless(smlTransportSend(mobile_tsp, link_, tsp_data, &error), "%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(error == NULL, NULL);
 	
 	smlTransportDataDeref(tsp_data);
@@ -317,7 +317,7 @@
 			mobile_state = TEST_MOBILE_STATE_DISCONNECTED;
 			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, "The unexpected transport event %d was received.", type);