Changeset 3398

Show
Ignore:
Timestamp:
07/07/08 09:53:02 (2 months ago)
Author:
dgollub
Message:

Updated simple config file generating function to generate valid
configuartion with a single objtype.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tests/client-tests/check_proxy.c

    r3356 r3398  
    102102        fail_unless(error == NULL, NULL); 
    103103         
    104         OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockformat1", NULL); 
     104        OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL); 
    105105        fail_unless(osync_client_proxy_initialize(proxy, initialize_callback, GINT_TO_POINTER(1), testbed, testbed, "mock-sync", "test", testbed, config, &error), NULL); 
    106106        osync_plugin_config_unref(config); 
    …… 
    144144        fail_unless(error == NULL, NULL); 
    145145         
    146         OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockformat1", NULL); 
     146        OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL); 
    147147        fail_unless(osync_client_proxy_initialize(proxy, initialize_callback, GINT_TO_POINTER(1), testbed, testbed, "mock-sync", "test", testbed, config, &error), NULL); 
    148148        osync_plugin_config_unref(config); 
    …… 
    203203        fail_unless(error == NULL, NULL); 
    204204         
    205         OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockformat1", NULL); 
     205        OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL); 
    206206        fail_unless(osync_client_proxy_initialize(proxy, initialize_callback, GINT_TO_POINTER(1), testbed, testbed, "mock-sync", "test", testbed, config, &error), NULL); 
    207207        osync_plugin_config_unref(config); 

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

    r3355 r3398  
    177177        g_free(path); 
    178178        _member_add_objtype(debug->member1, "mockobjtype1"); 
    179         OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjformat1", NULL); 
     179        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockobjformat1", NULL); 
    180180        osync_member_set_config(debug->member1, config1); 
    181181        osync_plugin_config_unref(config1); 
    …… 
    192192        _member_add_objtype(debug->member2, "mockobjtype1"); 
    193193 
    194         OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjformat1", NULL); 
     194        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjtype1", "mockobjformat1", NULL); 
    195195        osync_member_set_config(debug->member2, config2); 
    196196        osync_plugin_config_unref(config2); 
    …… 
    266266 
    267267        _member_add_objtype(debug->member1, "mockobjtype1"); 
    268         OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjformat1", NULL); 
     268        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockobjformat1", NULL); 
    269269        osync_member_set_config(debug->member1, config1); 
    270270        osync_plugin_config_unref(config1); 
    …… 
    281281 
    282282        _member_add_objtype(debug->member2, "mockobjtype1"); 
    283         OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjformat1", NULL); 
     283        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjtype1", "mockobjformat1", NULL); 
    284284        osync_member_set_config(debug->member2, config2); 
    285285        osync_plugin_config_unref(config2); 
    …… 
    436436 
    437437        _member_add_objtype(debug->member1, "mockobjtype1"); 
    438         OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjformat1", NULL); 
     438        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockobjformat1", NULL); 
    439439        osync_member_set_config(debug->member1, config1); 
    440440        osync_plugin_config_unref(config1); 
    …… 
    450450        g_free(path); 
    451451 
    452         OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjformat1", NULL); 
     452        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjtype1", "mockobjformat1", NULL); 
    453453        osync_member_set_config(debug->member2, config2); 
    454454        osync_plugin_config_unref(config2); 
    …… 
    508508 
    509509        _member_add_objtype(debug->member1, "mockobjtype1"); 
    510         OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjformat1", NULL); 
     510        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockobjformat1", NULL); 
    511511        osync_member_set_config(debug->member1, config1); 
    512512        osync_plugin_config_unref(config1); 
    …… 
    522522        g_free(path); 
    523523        _member_add_objtype(debug->member2, "mockobjtype1"); 
    524         OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjformat1", NULL); 
     524        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "data2", "mockobjtype1", "mockobjformat1", NULL); 
    525525        osync_member_set_config(debug->member2, config2); 
    526526        osync_plugin_config_unref(config2); 

  • trunk/tests/support.c

    r3378 r3398  
    678678 *  
    679679 */ 
    680 OSyncPluginConfig *simple_plugin_config(OSyncPluginConfig *config, const char *path, const char *objformat, const char *format_config) { 
     680OSyncPluginConfig *simple_plugin_config(OSyncPluginConfig *config, const char *path, const char *objtype, const char *objformat, const char *format_config) { 
     681 
     682        osync_assert(objtype); 
     683        osync_assert(objformat); 
    681684 
    682685        OSyncError *error = NULL; 
    …… 
    693696 
    694697        OSyncPluginRessource *res = osync_plugin_ressource_new(&error); 
     698        osync_plugin_ressource_set_objtype(res, objtype); 
    695699        osync_plugin_ressource_set_path(res, path);  
    696700 

  • trunk/tests/support.h

    r3378 r3398  
    9797 
    9898/* Plugin config helper */ 
    99 OSyncPluginConfig *simple_plugin_config(OSyncPluginConfig *config, const char *path, const char *objformat, const char *format_config); 
     99OSyncPluginConfig *simple_plugin_config(OSyncPluginConfig *config, const char *path, const char *objtype, const char *objformat, const char *format_config); 
    100100 
    101101/* gdiff is GNU diff in Solaris */ 

  • trunk/tests/sync-tests/check_sync.c

    r3357 r3398  
    22542254         
    22552255        OSyncMember *member1 = osync_group_nth_member(group, 0); 
    2256         OSyncPluginConfig *config1 = simple_plugin_config(NULL, "file-1", "mockformat1", NULL); 
    2257         simple_plugin_config(config1, "file2-1", "mockformat2", NULL); 
    2258         simple_plugin_config(config1, "file3-1", "mockformat3", NULL); 
     2256        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "file-1", "mockobjtype1", "mockformat1", NULL); 
     2257        simple_plugin_config(config1, "file2-1", "mockobjtype2", "mockformat2", NULL); 
     2258        simple_plugin_config(config1, "file3-1", "mockobjtype3", "mockformat3", NULL); 
    22592259        osync_member_set_config(member1, config1); 
    22602260        osync_plugin_config_unref(config1); 
    22612261 
    22622262        OSyncMember *member2 = osync_group_nth_member(group, 1); 
    2263         OSyncPluginConfig *config2 = simple_plugin_config(NULL, "file-2", "mockformat1", NULL); 
    2264         simple_plugin_config(config2, "file2-2", "mockformat2", NULL); 
    2265         simple_plugin_config(config2, "file3-2", "mockformat3", NULL); 
     2263        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "file-2", "mockobjtype1", "mockformat1", NULL); 
     2264        simple_plugin_config(config2, "file2-2", "mockobjtype2", "mockformat2", NULL); 
     2265        simple_plugin_config(config2, "file3-2", "mockobjtype3", "mockformat3", NULL); 
    22662266        osync_member_set_config(member2, config2); 
    22672267        osync_plugin_config_unref(config2); 
    …… 
    24612461         
    24622462        OSyncMember *member1 = osync_group_nth_member(group, 0); 
    2463         OSyncPluginConfig *config1 = simple_plugin_config(NULL, "file-1", "mockformat1", NULL); 
    2464         simple_plugin_config(config1, "file2-1", "mockformat2", NULL); 
    2465         simple_plugin_config(config1, "file3-1", "mockformat3", NULL); 
     2463        OSyncPluginConfig *config1 = simple_plugin_config(NULL, "file-1", "mockobjtype1", "mockformat1", NULL); 
     2464        simple_plugin_config(config1, "file2-1", "mockobjtype2", "mockformat2", NULL); 
     2465        simple_plugin_config(config1, "file3-1", "mockobjtype3", "mockformat3", NULL); 
    24662466        osync_member_set_config(member1, config1); 
    24672467        osync_plugin_config_unref(config1); 
    24682468 
    24692469        OSyncMember *member2 = osync_group_nth_member(group, 1); 
    2470         OSyncPluginConfig *config2 = simple_plugin_config(NULL, "file-2", "mockformat1", NULL); 
     2470        OSyncPluginConfig *config2 = simple_plugin_config(NULL, "file-2", "mockobjtype1", "mockformat1", NULL); 
    24712471        osync_member_set_config(member2, config2); 
    24722472        osync_plugin_config_unref(config2);