[Opensync-commits] r963 - in trunk/tests: . mobiles

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

Author: bellmich
Date: Mon Mar  2 15:50:50 2009
New Revision: 963
URL: http://libsyncml.opensync.org/changeset/963

Log:
sanitized some sml_fail_unless calls

(sml_fail_unless requires some more careful block handling than fail)

Modified:
   trunk/tests/check_data_sync_api.c
   trunk/tests/mobiles/obex_mobile_ds_client.c
   trunk/tests/support.c

Modified: trunk/tests/check_data_sync_api.c
==============================================================================
--- trunk/tests/check_data_sync_api.c	Mon Mar  2 15:30:56 2009	(r962)
+++ trunk/tests/check_data_sync_api.c	Mon Mar  2 15:50:50 2009	(r963)
@@ -63,8 +63,9 @@
 			const char *test_data = list->data;
 			char *name = g_strdup_printf("%d", count);
 			if (!smlDataSyncAddChange(client, client_source, SML_CHANGE_ADD,
-					name , test_data, strlen(test_data), NULL, error))
+					name , test_data, strlen(test_data), NULL, error)) {
 				sml_fail_unless(FALSE, "%s", smlErrorPrint(error));
+			}
 			smlSafeCFree(&name);
 		}
 	}
@@ -151,13 +152,15 @@
 
 	/* clients should never receive a change in this test */
 
-	if (dsObject == client)
+	if (dsObject == client) {
 		sml_fail_unless(FALSE, "A change was received from the server.");
+	}
 
 	/* check the source */
 
-	if (strcmp(server_source, source))
+	if (strcmp(server_source, source)) {
 		sml_fail_unless(FALSE, "The source %s is wrong.", server_source);
+	}
 
 	/* handle the item */
 	GList *list = client_items;
@@ -174,8 +177,9 @@
 		smlSafeCFree(&name);
 
 		/* item with correct uid */
-		if (strcmp(list->data, data))
+		if (strcmp(list->data, data)) {
 			sml_fail_unless(FALSE, "The data of the item %s was wrong(%s != %s).", uid, data, list->data);
+		}
 	}
 	smlSafeCFree(&data);
 

Modified: trunk/tests/mobiles/obex_mobile_ds_client.c
==============================================================================
--- trunk/tests/mobiles/obex_mobile_ds_client.c	Mon Mar  2 15:30:56 2009	(r962)
+++ trunk/tests/mobiles/obex_mobile_ds_client.c	Mon Mar  2 15:50:50 2009	(r963)
@@ -266,8 +266,9 @@
 				if (!equal_messages(
 						data->data, data->size,
 						libsyncml_msg_notification_data,
-						libsyncml_msg_notification_size))
+						libsyncml_msg_notification_size)) {
 					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) {
@@ -275,8 +276,9 @@
 				if (!equal_messages(
 						data->data, data->size,
 						libsyncml_msg_alert_data,
-						libsyncml_msg_alert_size))
+						libsyncml_msg_alert_size)) {
 					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) {
@@ -284,8 +286,9 @@
 				if (!equal_messages(
 						data->data, data->size,
 						libsyncml_msg_sync_data,
-						libsyncml_msg_sync_size))
+						libsyncml_msg_sync_size)) {
 					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) {
@@ -293,8 +296,9 @@
 				if (!equal_messages(
 						data->data, data->size,
 						libsyncml_msg_end_data,
-						libsyncml_msg_end_size))
+						libsyncml_msg_end_size)) {
 					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.

Modified: trunk/tests/support.c
==============================================================================
--- trunk/tests/support.c	Mon Mar  2 15:30:56 2009	(r962)
+++ trunk/tests/support.c	Mon Mar  2 15:50:50 2009	(r963)
@@ -87,19 +87,19 @@
 	if (fkt_name) {
 		testbed = g_strdup_printf("%s/testbed.XXXXXX", g_get_tmp_dir());
 		if (mkdtemp(testbed))
-			fail("Cannot setup testbed at %s.", testbed);
+			sml_fail_unless(FALSE, "Cannot setup testbed at %s.", testbed);
 		
 		char *command = NULL;
 		if (fkt_name) {
 			command = g_strdup_printf("cp -R %s%sdata/%s/* %s", g_getenv("srcdir") ? g_getenv("srcdir") : "", g_getenv("srcdir") ? "/" : "", fkt_name, testbed);
 			if (system(command))
-				fail("Cannot execute command \"%s\".", command);
+				sml_fail_unless(FALSE, "Cannot execute command \"%s\".", command);
 			g_free(command);
 		}
 		
 		olddir = g_get_current_dir();
 		if (chdir(testbed))
-			fail("Cannot change to testbed directory %s.", testbed);
+			sml_fail_unless(FALSE, "Cannot change to testbed directory %s.", testbed);
 		
 		smlTrace(TRACE_INTERNAL, "%s: Seting up %s at %s", __func__, VA_STRING(fkt_name), VA_STRING(testbed));
 	}
@@ -112,9 +112,9 @@
 {
 	char *command = g_strdup_printf("rm -rf %s", path);
 	if (olddir && chdir(olddir))
-		fail("Cannot change to old directory \"%s\".", olddir);
+		sml_fail_unless(FALSE, "Cannot change to old directory \"%s\".", olddir);
 	if (system(command))
-		fail("Cannot execute command \"%s\".", command);
+		sml_fail_unless(FALSE, "Cannot execute command \"%s\".", command);
 	g_free(command);
 	smlTrace(TRACE_INTERNAL, "%s: Tearing down %s", __func__, VA_STRING(path));
 	g_free(path);