[Opensync-commits] r5155 - format-plugins/vformat/tests

[<dg...@su...>]

Author: savago
Date: Thu Jan 15 19:50:07 2009
New Revision: 5155
URL: http://www.opensync.org/changeset/5155

Log:
Porting vformat test for new osync_format_env_detect_objformat_full.

Modified:
   format-plugins/vformat/tests/conversion.c

Modified: format-plugins/vformat/tests/conversion.c
==============================================================================
--- format-plugins/vformat/tests/conversion.c	Thu Jan 15 19:48:12 2009	(r5154)
+++ format-plugins/vformat/tests/conversion.c	Thu Jan 15 19:50:07 2009	(r5155)
@@ -40,7 +40,7 @@
 
 	osync_change_set_data(change, data);
 	
-	sourceformat = osync_format_env_detect_objformat_full(format_env, data, &error);
+	osync_format_env_detect_objformat_full(format_env, data, &sourceformat, &error);
 	fail_unless(sourceformat != NULL, NULL);
 
 	
@@ -68,7 +68,9 @@
 	// Create new change .. duplicate and give new uid
 	OSyncChange *newchange = osync_change_new(&error);
 	OSyncData *newdata = osync_data_clone(data, &error);
-	osync_data_set_objformat(newdata, osync_format_env_detect_objformat_full(format_env, newdata, &error));
+
+	osync_format_env_detect_objformat_full(format_env, newdata, &sourceformat, &error);
+	osync_data_set_objformat(newdata, sourceformat);
 
 	osync_change_set_data(newchange, newdata);
 	char *newuid = g_strdup_printf("%s_original", osync_change_get_uid(change)); 
@@ -177,7 +179,8 @@
 	osync_change_set_data(lchange, ldata);
 
 
-	OSyncObjFormat *sourceformat = osync_format_env_detect_objformat_full(format_env, ldata, &error);
+	OSyncObjFormat *sourceformat;
+	osync_format_env_detect_objformat_full(format_env, ldata, &sourceformat, &error);
 	fail_unless(sourceformat != NULL, NULL);
 	osync_data_set_objformat(ldata, sourceformat);
 
@@ -195,7 +198,7 @@
 
 	osync_change_set_data(rchange, rdata);
 
-	sourceformat = osync_format_env_detect_objformat_full(format_env, rdata, &error);
+	osync_format_env_detect_objformat_full(format_env, rdata, &sourceformat, &error);
 	fail_unless(sourceformat != NULL, NULL);
 	osync_data_set_objformat(rdata, sourceformat);
 
@@ -266,7 +269,7 @@
 
 	osync_change_set_data(change, data);
 
-	sourceformat = osync_format_env_detect_objformat_full(format_env, data, &error);
+	osync_format_env_detect_objformat_full(format_env, data, &sourceformat, &error);
 	fail_unless(sourceformat != NULL, NULL);
 
 	// targetformat