[Opensync-commits] r1169 - trunk/tests

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

Author: bellmich
Date: Mon Jul 13 13:18:52 2009
New Revision: 1169
URL: http://libsyncml.opensync.org/changeset/1169

Log:
migrated check_data_sync_api from SmlError to GError

Modified:
   trunk/tests/check_data_sync_api.c

Modified: trunk/tests/check_data_sync_api.c
==============================================================================
--- trunk/tests/check_data_sync_api.c	Mon Jul 13 13:15:37 2009	(r1168)
+++ trunk/tests/check_data_sync_api.c	Mon Jul 13 13:18:52 2009	(r1169)
@@ -49,7 +49,7 @@
 
 SmlBool sendAllChanges(
 		SmlDataSyncObject *dsObject,
-		SmlError **error)
+		GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s", __func__);
 
@@ -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)) {
-				sml_fail_unless(FALSE, "%s", smlErrorPrint(error));
+				sml_fail_unless(FALSE, "%s", (*error)->message);
 			}
 			smlSafeCFree(&name);
 		}
@@ -78,17 +78,17 @@
 			SmlDataSyncObject *dsObject,
 			SmlDataSyncEventType type,
 			void *userdata,
-			SmlError *error)
+			const GError *error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p)", __func__, dsObject, type, userdata, error);
-	SmlError *locerror = NULL;
+	GError *locerror = NULL;
 	
 	switch (type) {
 		case SML_DATA_SYNC_EVENT_ERROR:
 			if (dsObject == client) {
-				sml_fail_unless(FALSE, "OMA DS client failed: %s", smlErrorPrint(&error));
+				sml_fail_unless(FALSE, "OMA DS client failed: %s", error->message);
 			} else {
-				sml_fail_unless(FALSE, "OMA DS server failed: %s", smlErrorPrint(&error));
+				sml_fail_unless(FALSE, "OMA DS server failed: %s", error->message);
 			}
 			break;
 		case SML_DATA_SYNC_EVENT_CONNECT:
@@ -136,9 +136,9 @@
 	return;
 
 error:
-	fprintf(stderr, "An error occured while handling events: %s\n", smlErrorPrint(&locerror));
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&locerror));
-	smlErrorDeref(&locerror);
+	fprintf(stderr, "An error occured while handling events: %s\n", locerror->message);
+	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, locerror->message);
+	g_error_free(locerror);
 	exit(3);
 }
 
@@ -150,7 +150,7 @@
 			char *data,
 			unsigned int size,
 			void *userdata,
-			SmlError **error)
+			GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s: %s ==> %s(%p, %d, %p, %d, %p, %p)", __func__, VA_STRING(source), VA_STRING(uid), dsObject, type, data, size, userdata, error);
 
@@ -196,7 +196,7 @@
 //                        const char *source,
 //                        SmlAlertType type,
 //                        void *userdata,
-//                        SmlError **error)
+//                        GError **error)
 //{
 //	smlTrace(TRACE_ENTRY, "%s - %s: %d", __func__, VA_STRING(source), type);
 //	/* find the appropriate datasoure */
@@ -229,7 +229,7 @@
 //	smlTrace(TRACE_EXIT, "%s - slow == %d", __func__, datastore->slow);
 //	return type;
 //error:
-//	smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, smlErrorPrint(error));
+//	smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, (*error)->message);
 //	return SML_ALERT_UNKNOWN;
 //}
 
@@ -237,7 +237,7 @@
 {
 	/* general init */
 	setup_testbed(NULL);
-	SmlError *error = NULL;
+	GError *error = NULL;
 	client_items = NULL;
 	
 #ifdef ENABLE_OPENOBEX_TCP
@@ -326,12 +326,12 @@
 
 	return;
 error:
-	sml_fail_unless(FALSE, "%s", smlErrorPrint(&error));
+	sml_fail_unless(FALSE, "%s", error->message);
 }
 
 void run_testbed()
 {
-	SmlError *error = NULL;
+	GError *error = NULL;
 	locks = 2;
 
 	/* init the sync */
@@ -375,12 +375,12 @@
 
 	return;
 error:
-	sml_fail_unless(FALSE, "%s", smlErrorPrint(&error));
+	sml_fail_unless(FALSE, "%s", error->message);
 }
 
 START_TEST (ds_api_text_vcard_21)
 {
-	SmlError *error = NULL;
+	GError *error = NULL;
 	init_testbed("HTTP", "17001");
 
 	/* register datastore
@@ -410,13 +410,13 @@
 
 	return;
 error:
-	sml_fail_unless(FALSE, "%s", smlErrorPrint(&error));
+	sml_fail_unless(FALSE, "%s", error->message);
 }
 END_TEST
 
 START_TEST (ds_api_image_jpeg)
 {
-	SmlError *error = NULL;
+	GError *error = NULL;
 	init_testbed("OBEX", "17002");
 
 	/* register datastore
@@ -449,13 +449,13 @@
 
 	return;
 error:
-	sml_fail_unless(FALSE, "%s", smlErrorPrint(&error));
+	sml_fail_unless(FALSE, "%s", error->message);
 }
 END_TEST
 
 START_TEST (ds_api_unknown_ct)
 {
-	SmlError *error = NULL;
+	GError *error = NULL;
 	init_testbed("HTTP", "17003");
 
 	/* register datastore
@@ -485,13 +485,13 @@
 
 	return;
 error:
-	sml_fail_unless(FALSE, "%s", smlErrorPrint(&error));
+	sml_fail_unless(FALSE, "%s", error->message);
 }
 END_TEST
 
 START_TEST (ds_api_multi_text_vcard_21)
 {
-	SmlError *error = NULL;
+	GError *error = NULL;
 	init_testbed("HTTP", "17004");
 
 	/* register datastore
@@ -525,7 +525,7 @@
 
 	return;
 error:
-	sml_fail_unless(FALSE, "%s", smlErrorPrint(&error));
+	sml_fail_unless(FALSE, "%s", error->message);
 }
 END_TEST