Changeset 3359

Show
Ignore:
Timestamp:
06/13/08 14:26:08 (3 months ago)
Author:
dgollub
Message:

Removing traces of file-sync fork and renaming OSyncFileDir to MockDir?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tests/mock-plugin/mock_sync.c

    r3358 r3359  
    4747{ 
    4848        while (env->directories) { 
    49                 OSyncFileDir *dir = env->directories->data; 
     49                MockDir *dir = env->directories->data; 
    5050                 
    5151                if (dir->sink) 
    …… 
    6969{ 
    7070        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    71         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     71        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    7272        mock_env *env = data; 
    7373 
    …… 
    7777                GList *o = env->directories; 
    7878                for (; o; o = o->next) { 
    79                         OSyncFileDir *sink_dir = o->data; 
     79                        MockDir *sink_dir = o->data; 
    8080                        sink_dir->committed_all = TRUE; 
    8181                } 
    …… 
    125125 
    126126        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    127         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     127        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    128128        mock_env *env = data; 
    129129 
    …… 
    131131                GList *o = env->directories; 
    132132                for (; o; o = o->next) { 
    133                         OSyncFileDir *sink_dir = o->data; 
     133                        MockDir *sink_dir = o->data; 
    134134                        if (!g_getenv("NO_COMMITTED_ALL_CHECK")) 
    135135                                fail_unless(sink_dir->committed_all == TRUE, NULL); 
    …… 
    166166        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change); 
    167167        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    168         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     168        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    169169        OSyncError *error = NULL; 
    170170         
    …… 
    204204        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change); 
    205205        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    206         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     206        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    207207        OSyncError *error = NULL; 
    208208        OSyncData *odata = NULL; 
    …… 
    256256 * 
    257257 */ 
    258 static void mock_report_dir(OSyncFileDir *directory, const char *subdir, OSyncContext *ctx, OSyncPluginInfo *info) 
     258static void mock_report_dir(MockDir *directory, const char *subdir, OSyncContext *ctx, OSyncPluginInfo *info) 
    259259{ 
    260260        GError *gerror = NULL; 
    …… 
    356356        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); 
    357357        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    358         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     358        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    359359        OSyncError *error = NULL; 
    360360 
    …… 
    417417        osync_trace(TRACE_ENTRY, "%s", __func__); 
    418418        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    419         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     419        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    420420         
    421421        char *filename = NULL; 
    …… 
    461461        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, context, contexts, changes); 
    462462        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    463         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     463        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    464464 
    465465        fail_unless(dir->committed_all == FALSE, NULL); 
    …… 
    504504        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, context); 
    505505        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    506         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     506        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    507507 
    508508        fail_unless(dir->committed_all == FALSE, NULL); 
    …… 
    524524        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); 
    525525        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    526         OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 
     526        MockDir *dir = osync_objtype_sink_get_userdata(sink); 
    527527 
    528528        if (mock_get_error(info->memberid, "SYNC_DONE_ERROR")) { 
    …… 
    581581        GList *o = env->directories; 
    582582        for (; o; o = o->next) { 
    583                 OSyncFileDir *dir = o->data; 
     583                MockDir *dir = o->data; 
    584584                /* We register the given objtype here */ 
    585585                OSyncObjTypeSink *sink = osync_objtype_sink_new(dir->objtype, error); 
    …… 
    627627                functions.sync_done = mock_sync_done; 
    628628                 
    629                 /* We pass the OSyncFileDir object to the sink, so we dont have to look it up 
     629                /* We pass the MockDir object to the sink, so we dont have to look it up 
    630630                 * again once the functions are called */ 
    631631                osync_objtype_sink_set_functions(sink, functions, dir); 
    …… 
    688688        GList *o = env->directories; 
    689689        for (; o; o = o->next) { 
    690                 OSyncFileDir *dir = o->data; 
     690                MockDir *dir = o->data; 
    691691         
    692692                if (dir->hashtable) { 
    …… 
    710710        GList *o = env->directories; 
    711711        for (; o; o = o->next) { 
    712                 OSyncFileDir *dir = o->data; 
     712                MockDir *dir = o->data; 
    713713                osync_objtype_sink_set_available(dir->sink, TRUE); 
    714714        } 
    …… 
    737737         
    738738        osync_plugin_set_name(plugin, "mock-sync"); 
    739         osync_plugin_set_longname(plugin, "File Synchronization Plugin"); 
     739        osync_plugin_set_longname(plugin, "Mock Synchronization Plugin"); 
    740740        osync_plugin_set_description(plugin, "Plugin to synchronize files on the local filesystem"); 
    741741         

  • trunk/tests/mock-plugin/mock_sync.h

    r3211 r3359  
    6565} mock_env; 
    6666 
    67 typedef struct OSyncFileDir { 
     67typedef struct MockDir { 
    6868        char *objtype; 
    6969        char *path; 
    …… 
    7575        mock_env *env; 
    7676        osync_bool committed_all; 
    77 } OSyncFileDir; 
     77} MockDir; 
    7878 
    7979#endif //_FILE_PLUGIN_H