Changeset 3355

Show
Ignore:
Timestamp:
06/13/08 14:09:20 (4 months ago)
Author:
dgollub
Message:

Fix build of engine error testcase by porting to the OSyncPluginConfig
utilizing the simple_plugin_config() helper.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tests/engine-tests/check_engine_error.c

    r3324 r3355  
    177177        g_free(path); 
    178178        _member_add_objtype(debug->member1, "mockobjtype1"); 
    179         osync_member_set_config(debug->member1, "<config><directory><path>data1</path><objtype>mockobjtype1</objtype></directory></config>"); 
     179        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjformat1", NULL); 
     180        osync_member_set_config(debug->member1, config1); 
     181        osync_plugin_config_unref(config1); 
    180182         
    181183        debug->member2 = osync_member_new(&error); 
    …… 
    189191 
    190192        _member_add_objtype(debug->member2, "mockobjtype1"); 
    191         osync_member_set_config(debug->member2, "<config><directory><path>data2</path><objtype>mockobjtype1</objtype></directory></config>"); 
     193 
     194        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjformat1", NULL); 
     195        osync_member_set_config(debug->member2, config2); 
     196        osync_plugin_config_unref(config2); 
    192197         
    193198         
    …… 
    261266 
    262267        _member_add_objtype(debug->member1, "mockobjtype1"); 
    263         osync_member_set_config(debug->member1, "<config><directory><path>data1</path><objtype>mockobjtype1</objtype></directory></config>"); 
     268        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjformat1", NULL); 
     269        osync_member_set_config(debug->member1, config1); 
     270        osync_plugin_config_unref(config1); 
     271 
    264272         
    265273        debug->member2 = osync_member_new(&error); 
    …… 
    273281 
    274282        _member_add_objtype(debug->member2, "mockobjtype1"); 
    275         osync_member_set_config(debug->member2, "<config><directory><path>data2</path><objtype>mockobjtype1</objtype></directory></config>"); 
    276          
     283        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjformat1", NULL); 
     284        osync_member_set_config(debug->member2, config2); 
     285        osync_plugin_config_unref(config2); 
    277286         
    278287         
    …… 
    427436 
    428437        _member_add_objtype(debug->member1, "mockobjtype1"); 
    429         osync_member_set_config(debug->member1, "<config><directory><path>data1</path><objtype>mockobjtype1</objtype></directory></config>"); 
     438        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjformat1", NULL); 
     439        osync_member_set_config(debug->member1, config1); 
     440        osync_plugin_config_unref(config1); 
     441 
    430442         
    431443        debug->member2 = osync_member_new(&error); 
    …… 
    438450        g_free(path); 
    439451 
    440         osync_member_set_config(debug->member2, "<config><directory><path>data2</path><objtype>mockobjtype1</objtype></directory></config>"); 
    441          
    442          
     452        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjformat1", NULL); 
     453        osync_member_set_config(debug->member2, config2); 
     454        osync_plugin_config_unref(config2); 
     455 
    443456         
    444457        debug->plugin = osync_plugin_new(&error); 
    …… 
    495508 
    496509        _member_add_objtype(debug->member1, "mockobjtype1"); 
    497         osync_member_set_config(debug->member1, "<config><directory><path>data1</path><objtype>mockobjtype1</objtype></directory></config>"); 
     510        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjformat1", NULL); 
     511        osync_member_set_config(debug->member1, config1); 
     512        osync_plugin_config_unref(config1); 
     513 
    498514         
    499515        debug->member2 = osync_member_new(&error); 
    …… 
    506522        g_free(path); 
    507523        _member_add_objtype(debug->member2, "mockobjtype1"); 
    508         osync_member_set_config(debug->member2, "<config><directory><path>data2</path><objtype>mockobjtype1</objtype></directory></config>"); 
    509          
     524        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjformat1", NULL); 
     525        osync_member_set_config(debug->member2, config2); 
     526        osync_plugin_config_unref(config2); 
     527 
    510528         
    511529        debug->plugin = osync_plugin_new(&error);