Ticket #1124: multisync_hybrid.diff

tests/support.c

@@ -524 +524 @@
         }
 }
 
+
+void conflict_handler_choose_member(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data)
+{
+        OSyncChange *change = NULL;
+        OSyncError *error = NULL;
+
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, engine, mapping, user_data);
+        
+        num_mapping_conflicts++;
+        fail_unless(num_engine_end_conflicts == 0, NULL);
+
+        change = osync_mapping_engine_member_change(mapping, GPOINTER_TO_UINT(user_data));
+        osync_assert(osync_engine_mapping_solve(engine, mapping, change, &error));
+        osync_assert(error == NULL);
+        
+        osync_trace(TRACE_EXIT, "%s", __func__);
+}
+
 void conflict_handler_choose_first(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data)
 {
         OSyncChange *change = NULL;

tests/support.h

@@ -123 +123 @@
 void mapping_status(OSyncEngineMappingUpdate *status, void *user_data);
 
 /* Conflict handlers */
+void conflict_handler_choose_member(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data);
 void conflict_handler_choose_first(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data);
 void conflict_handler_choose_deleted(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data);
 void conflict_handler_choose_modified(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data);

tests/sync-tests/check_multisync.c

@@ -1045 +1045 @@
         char *testbed = setup_testbed("multisync_conflict_changetype_choose");
         OSyncError *error = NULL;
         OSyncEngine *engine = setup_engine(testbed);
-        osync_engine_set_conflict_callback(engine, conflict_handler_choose_modified, GINT_TO_POINTER(3));
+        osync_engine_set_conflict_callback(engine, conflict_handler_choose_member, GINT_TO_POINTER(2));
 
         fail_unless(osync_engine_initialize(engine, &error), NULL);
         fail_unless(error == NULL, NULL);