summaryrefslogtreecommitdiff
path: root/src/tests/eio
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/tests/eio
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/tests/eio')
-rw-r--r--src/tests/eio/eio_model_test_file.c6
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c6
-rw-r--r--src/tests/eio/eio_test_manager.c14
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c4
-rw-r--r--src/tests/eio/eio_test_sentry.c80
5 files changed, 55 insertions, 55 deletions
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 3352e355b4..824ef68649 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -111,10 +111,10 @@ START_TEST(eio_model_test_test_file)
111 111
112 fail_if(!eina_init(), "ERROR: Cannot init Eina!\n"); 112 fail_if(!eina_init(), "ERROR: Cannot init Eina!\n");
113 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 113 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
114 fail_if(!eo_init(), "ERROR: Cannot init EO!\n"); 114 fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
115 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n"); 115 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
116 116
117 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, EFL_MODEL_TEST_FILENAME_PATH)); 117 filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, EFL_MODEL_TEST_FILENAME_PATH));
118 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 118 fail_if(!filemodel, "ERROR: Cannot init model!\n");
119 119
120 handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL); 120 handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL);
@@ -141,7 +141,7 @@ START_TEST(eio_model_test_test_file)
141 eina_promise_then(promise, &promise_then_count, &error_promise_then, NULL); 141 eina_promise_then(promise, &promise_then_count, &error_promise_then, NULL);
142 ecore_main_loop_begin(); 142 ecore_main_loop_begin();
143 143
144 eo_unref(filemodel); 144 efl_unref(filemodel);
145 145
146 eio_shutdown(); 146 eio_shutdown();
147 ecore_shutdown(); 147 ecore_shutdown();
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 126b1d7156..d0ff492643 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -89,12 +89,12 @@ START_TEST(eio_model_test_test_monitor_add)
89 89
90 fail_if(!eina_init(), "ERROR: Cannot init Eina!\n"); 90 fail_if(!eina_init(), "ERROR: Cannot init Eina!\n");
91 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 91 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
92 fail_if(!eo_init(), "ERROR: Cannot init EO!\n"); 92 fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
93 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n"); 93 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
94 94
95 tmpdir = eina_environment_tmp_get(); 95 tmpdir = eina_environment_tmp_get();
96 96
97 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir)); 97 filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, tmpdir));
98 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 98 fail_if(!filemodel, "ERROR: Cannot init model!\n");
99 99
100 efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel); 100 efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
@@ -107,7 +107,7 @@ START_TEST(eio_model_test_test_monitor_add)
107 107
108 ecore_main_loop_begin(); 108 ecore_main_loop_begin();
109 109
110 eo_unref(filemodel); 110 efl_unref(filemodel);
111 111
112 eio_shutdown(); 112 eio_shutdown();
113 ecore_shutdown(); 113 ecore_shutdown();
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 795c0e23fd..c1ac397c8a 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -113,7 +113,7 @@ _do_ls_test(Efl_Io_Manager_Test_Stat_Ls_Func ls_func,
113{ 113{
114 int main_files = 0; 114 int main_files = 0;
115 115
116 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 116 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
117 Eina_Promise *promise = NULL; 117 Eina_Promise *promise = NULL;
118 118
119 efl_event_callback_add(job, event, filter_cb, NULL); 119 efl_event_callback_add(job, event, filter_cb, NULL);
@@ -126,7 +126,7 @@ _do_ls_test(Efl_Io_Manager_Test_Stat_Ls_Func ls_func,
126 126
127 fail_if(main_files != DONE_CALLED); 127 fail_if(main_files != DONE_CALLED);
128 128
129 eo_unref(job); 129 efl_unref(job);
130} 130}
131 131
132static void 132static void
@@ -160,7 +160,7 @@ START_TEST(efl_io_manager_test_file_direct_stat)
160 Eina_Tmpstr *nested_dirname = create_test_dirs(test_dirname); 160 Eina_Tmpstr *nested_dirname = create_test_dirs(test_dirname);
161 Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]); 161 Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]);
162 162
163 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 163 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
164 Eina_Promise *promise = NULL; 164 Eina_Promise *promise = NULL;
165 // Start testing 165 // Start testing
166 is_dir = EINA_TRUE; 166 is_dir = EINA_TRUE;
@@ -173,7 +173,7 @@ START_TEST(efl_io_manager_test_file_direct_stat)
173 promise = efl_io_manager_file_direct_stat(job, nested_filename); 173 promise = efl_io_manager_file_direct_stat(job, nested_filename);
174 eina_promise_then(promise, &_stat_done_cb, &_error_cb, &is_dir); 174 eina_promise_then(promise, &_stat_done_cb, &_error_cb, &is_dir);
175 ecore_main_loop_begin(); 175 ecore_main_loop_begin();
176 eo_unref(job); 176 efl_unref(job);
177 177
178 // Cleanup 178 // Cleanup
179 fail_if(!ecore_file_recursive_rm(test_dirname)); 179 fail_if(!ecore_file_recursive_rm(test_dirname));
@@ -254,13 +254,13 @@ START_TEST(efl_io_manager_test_open)
254 Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]); 254 Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]);
255 255
256 opened_file = EINA_FALSE; 256 opened_file = EINA_FALSE;
257 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 257 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
258 Eina_Promise *promise = NULL; 258 Eina_Promise *promise = NULL;
259 259
260 promise = efl_io_manager_file_open(job, nested_filename, EINA_FALSE); 260 promise = efl_io_manager_file_open(job, nested_filename, EINA_FALSE);
261 eina_promise_then(promise, &_open_done_cb, &_error_cb, &opened_file); 261 eina_promise_then(promise, &_open_done_cb, &_error_cb, &opened_file);
262 ecore_main_loop_begin(); 262 ecore_main_loop_begin();
263 eo_unref(job); 263 efl_unref(job);
264 fail_if(!opened_file); 264 fail_if(!opened_file);
265 265
266 // Cleanup 266 // Cleanup
@@ -289,7 +289,7 @@ START_TEST(efl_io_instantiated)
289 289
290 manager = efl_provider_find(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS); 290 manager = efl_provider_find(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS);
291 fail_if(manager == NULL); 291 fail_if(manager == NULL);
292 fail_if(!eo_isa(manager, EFL_IO_MANAGER_CLASS)); 292 fail_if(!efl_isa(manager, EFL_IO_MANAGER_CLASS));
293 293
294 eio_shutdown(); 294 eio_shutdown();
295 295
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index 77aa30c232..3733589a3d 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -129,7 +129,7 @@ START_TEST(eio_test_job_xattr_set)
129 129
130 fprintf(stderr, "eio_test_job_xattr_set\n"); fflush(stderr); 130 fprintf(stderr, "eio_test_job_xattr_set\n"); fflush(stderr);
131 131
132 job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 132 job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
133 133
134 test_file_path = get_full_path(XATTR_TEST_DIR, filename); 134 test_file_path = get_full_path(XATTR_TEST_DIR, filename);
135 fd = open(test_file_path, 135 fd = open(test_file_path,
@@ -184,7 +184,7 @@ START_TEST(eio_test_job_xattr_set)
184 184
185 free(attrib_promises); 185 free(attrib_promises);
186 186
187 eo_unref(job); 187 efl_unref(job);
188 close(fd); 188 close(fd);
189 unlink(test_file_path); 189 unlink(test_file_path);
190 eina_tmpstr_del(test_file_path); 190 eina_tmpstr_del(test_file_path);
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index e00a7d8529..902d6532bb 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -146,14 +146,14 @@ START_TEST(eio_test_sentry_add_and_remove)
146 usleep(500000); 146 usleep(500000);
147 147
148 //monitor directory 148 //monitor directory
149 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 149 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
150 fail_if(!eio_sentry_add(sentry, filename)); 150 fail_if(!eio_sentry_add(sentry, filename));
151 151
152 usleep(500000); 152 usleep(500000);
153 153
154 eio_sentry_del(sentry, filename); 154 eio_sentry_del(sentry, filename);
155 155
156 eo_unref(sentry); 156 efl_unref(sentry);
157 157
158 _common_shutdown(dirname); 158 _common_shutdown(dirname);
159} 159}
@@ -172,7 +172,7 @@ START_TEST(eio_test_sentry_add_remove_add)
172 usleep(500000); 172 usleep(500000);
173 173
174 //monitor directory 174 //monitor directory
175 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 175 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
176 fail_if(!eio_sentry_add(sentry, filename)); 176 fail_if(!eio_sentry_add(sentry, filename));
177 eio_sentry_del(sentry, filename); 177 eio_sentry_del(sentry, filename);
178 178
@@ -181,7 +181,7 @@ START_TEST(eio_test_sentry_add_remove_add)
181 fail_if(!eio_sentry_add(sentry, filename)); 181 fail_if(!eio_sentry_add(sentry, filename));
182 eio_sentry_del(sentry, filename); 182 eio_sentry_del(sentry, filename);
183 183
184 eo_unref(sentry); 184 efl_unref(sentry);
185 185
186 _common_shutdown(dirname); 186 _common_shutdown(dirname);
187} 187}
@@ -202,7 +202,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove)
202 //sleep to avoid catching event generated by above manipulations 202 //sleep to avoid catching event generated by above manipulations
203 usleep(500000); 203 usleep(500000);
204 204
205 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 205 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
206 206
207 //monitor directory 207 //monitor directory
208 fail_if(!eio_sentry_add(sentry, filename1)); 208 fail_if(!eio_sentry_add(sentry, filename1));
@@ -211,7 +211,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove)
211 eio_sentry_del(sentry, filename1); 211 eio_sentry_del(sentry, filename1);
212 eio_sentry_del(sentry, filename2); 212 eio_sentry_del(sentry, filename2);
213 213
214 eo_unref(sentry); 214 efl_unref(sentry);
215 215
216 _common_shutdown(dirname); 216 _common_shutdown(dirname);
217} 217}
@@ -232,7 +232,7 @@ START_TEST(eio_test_sentry_directory_file_created_notify)
232 Eo* sentry; 232 Eo* sentry;
233 233
234 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname); 234 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname);
235 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 235 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
236 236
237 //sleep to avoid catching event generated by above manipulations 237 //sleep to avoid catching event generated by above manipulations
238 usleep(500000); 238 usleep(500000);
@@ -245,7 +245,7 @@ START_TEST(eio_test_sentry_directory_file_created_notify)
245 245
246 ecore_main_loop_begin(); 246 ecore_main_loop_begin();
247 247
248 eo_unref(sentry); 248 efl_unref(sentry);
249 249
250 _common_shutdown(dirname); 250 _common_shutdown(dirname);
251} 251}
@@ -259,7 +259,7 @@ START_TEST(eio_test_sentry_directory_file_deleted_notify)
259 259
260 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_deleted_notify", dirname); 260 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_deleted_notify", dirname);
261 _create_file((void*)filename); 261 _create_file((void*)filename);
262 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 262 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
263 263
264 //sleep to avoid catching event generated by above manipulations 264 //sleep to avoid catching event generated by above manipulations
265 usleep(500000); 265 usleep(500000);
@@ -272,7 +272,7 @@ START_TEST(eio_test_sentry_directory_file_deleted_notify)
272 272
273 ecore_main_loop_begin(); 273 ecore_main_loop_begin();
274 274
275 eo_unref(sentry); 275 efl_unref(sentry);
276 276
277 _common_shutdown(dirname); 277 _common_shutdown(dirname);
278} 278}
@@ -286,7 +286,7 @@ START_TEST(eio_test_sentry_directory_file_modified_notify)
286 286
287 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_modified_notify", dirname); 287 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_modified_notify", dirname);
288 _create_file((void*)filename); 288 _create_file((void*)filename);
289 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 289 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
290 290
291 //sleep to avoid catching event generated by above manipulations 291 //sleep to avoid catching event generated by above manipulations
292 usleep(500000); 292 usleep(500000);
@@ -299,7 +299,7 @@ START_TEST(eio_test_sentry_directory_file_modified_notify)
299 299
300 ecore_main_loop_begin(); 300 ecore_main_loop_begin();
301 301
302 eo_unref(sentry); 302 efl_unref(sentry);
303 303
304 //cleanup 304 //cleanup
305 _common_shutdown(dirname); 305 _common_shutdown(dirname);
@@ -314,7 +314,7 @@ START_TEST(eio_test_sentry_directory_file_closed_notify)
314 314
315 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_closed_notify", dirname); 315 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_closed_notify", dirname);
316 _create_file((void*)filename); 316 _create_file((void*)filename);
317 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 317 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
318 318
319 //sleep to avoid catching event generated by above manipulations 319 //sleep to avoid catching event generated by above manipulations
320 usleep(500000); 320 usleep(500000);
@@ -326,7 +326,7 @@ START_TEST(eio_test_sentry_directory_file_closed_notify)
326 326
327 ecore_main_loop_begin(); 327 ecore_main_loop_begin();
328 328
329 eo_unref(sentry); 329 efl_unref(sentry);
330 330
331 _common_shutdown(dirname); 331 _common_shutdown(dirname);
332} 332}
@@ -339,7 +339,7 @@ START_TEST(eio_test_sentry_directory_directory_created_notify)
339 Eo *sentry; 339 Eo *sentry;
340 340
341 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname); 341 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname);
342 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 342 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
343 343
344 //sleep to avoid catching event generated by above manipulations 344 //sleep to avoid catching event generated by above manipulations
345 usleep(500000); 345 usleep(500000);
@@ -352,7 +352,7 @@ START_TEST(eio_test_sentry_directory_directory_created_notify)
352 352
353 ecore_main_loop_begin(); 353 ecore_main_loop_begin();
354 354
355 eo_unref(sentry); 355 efl_unref(sentry);
356 356
357 _common_shutdown(dirname); 357 _common_shutdown(dirname);
358} 358}
@@ -366,7 +366,7 @@ START_TEST(eio_test_sentry_directory_directory_deleted_notify)
366 366
367 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_deleted_notify", dirname); 367 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_deleted_notify", dirname);
368 _create_directory((void*)filename); 368 _create_directory((void*)filename);
369 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 369 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
370 370
371 //sleep to avoid catching event generated by above manipulations 371 //sleep to avoid catching event generated by above manipulations
372 usleep(500000); 372 usleep(500000);
@@ -379,7 +379,7 @@ START_TEST(eio_test_sentry_directory_directory_deleted_notify)
379 379
380 ecore_main_loop_begin(); 380 ecore_main_loop_begin();
381 381
382 eo_unref(sentry); 382 efl_unref(sentry);
383 383
384 _common_shutdown(dirname); 384 _common_shutdown(dirname);
385} 385}
@@ -393,7 +393,7 @@ START_TEST(eio_test_sentry_directory_directory_modified_notify)
393 393
394 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_modified_notify", dirname); 394 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_modified_notify", dirname);
395 _create_directory((void*)filename); 395 _create_directory((void*)filename);
396 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 396 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
397 397
398 //sleep to avoid catching event generated by above manipulations 398 //sleep to avoid catching event generated by above manipulations
399 usleep(500000); 399 usleep(500000);
@@ -406,7 +406,7 @@ START_TEST(eio_test_sentry_directory_directory_modified_notify)
406 406
407 ecore_main_loop_begin(); 407 ecore_main_loop_begin();
408 408
409 eo_unref(sentry); 409 efl_unref(sentry);
410 410
411 _common_shutdown(dirname); 411 _common_shutdown(dirname);
412} 412}
@@ -415,7 +415,7 @@ END_TEST
415START_TEST(eio_test_sentry_directory_directory_self_deleted_notify) 415START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
416{ 416{
417 Eina_Tmpstr *dirname = _common_init(); 417 Eina_Tmpstr *dirname = _common_init();
418 Eo *sentry = eo_add(EIO_SENTRY_CLASS, NULL); 418 Eo *sentry = efl_add(EIO_SENTRY_CLASS, NULL);
419 419
420 //sleep to avoid catching event generated by above manipulations 420 //sleep to avoid catching event generated by above manipulations
421 usleep(500000); 421 usleep(500000);
@@ -428,7 +428,7 @@ START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
428 428
429 ecore_main_loop_begin(); 429 ecore_main_loop_begin();
430 430
431 eo_unref(sentry); 431 efl_unref(sentry);
432 432
433 _common_shutdown(dirname); 433 _common_shutdown(dirname);
434} 434}
@@ -444,7 +444,7 @@ START_TEST(eio_test_sentry_file_file_modified_notify)
444 444
445 filename = eina_stringshare_printf("%s/filecreated", dirname); 445 filename = eina_stringshare_printf("%s/filecreated", dirname);
446 _create_file((void*)filename); 446 _create_file((void*)filename);
447 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 447 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
448 448
449 //sleep to avoid catching event generated by above manipulations 449 //sleep to avoid catching event generated by above manipulations
450 usleep(500000); 450 usleep(500000);
@@ -457,7 +457,7 @@ START_TEST(eio_test_sentry_file_file_modified_notify)
457 457
458 ecore_main_loop_begin(); 458 ecore_main_loop_begin();
459 459
460 eo_unref(sentry); 460 efl_unref(sentry);
461 461
462 //cleanup 462 //cleanup
463 _common_shutdown(dirname); 463 _common_shutdown(dirname);
@@ -472,7 +472,7 @@ START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
472 472
473 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_attrib_modified_notify", dirname); 473 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_attrib_modified_notify", dirname);
474 _create_file((void*)filename); 474 _create_file((void*)filename);
475 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 475 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
476 476
477 //sleep to avoid catching event generated by above manipulations 477 //sleep to avoid catching event generated by above manipulations
478 usleep(500000); 478 usleep(500000);
@@ -485,7 +485,7 @@ START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
485 485
486 ecore_main_loop_begin(); 486 ecore_main_loop_begin();
487 487
488 eo_unref(sentry); 488 efl_unref(sentry);
489 489
490 _common_shutdown(dirname); 490 _common_shutdown(dirname);
491} 491}
@@ -500,7 +500,7 @@ START_TEST(eio_test_sentry_file_file_closed_notify)
500 500
501 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_closed_notify", dirname); 501 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_closed_notify", dirname);
502 _create_file((void*)filename); 502 _create_file((void*)filename);
503 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 503 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
504 504
505 //sleep to avoid catching event generated by above manipulations 505 //sleep to avoid catching event generated by above manipulations
506 usleep(500000); 506 usleep(500000);
@@ -512,7 +512,7 @@ START_TEST(eio_test_sentry_file_file_closed_notify)
512 512
513 ecore_main_loop_begin(); 513 ecore_main_loop_begin();
514 514
515 eo_unref(sentry); 515 efl_unref(sentry);
516 516
517 _common_shutdown(dirname); 517 _common_shutdown(dirname);
518} 518}
@@ -526,7 +526,7 @@ START_TEST(eio_test_sentry_file_file_self_deleted_notify)
526 526
527 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_self_deleted_notify", dirname); 527 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_self_deleted_notify", dirname);
528 _create_file((void*)filename); 528 _create_file((void*)filename);
529 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 529 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
530 530
531 //sleep to avoid catching event generated by above manipulations 531 //sleep to avoid catching event generated by above manipulations
532 usleep(500000); 532 usleep(500000);
@@ -539,7 +539,7 @@ START_TEST(eio_test_sentry_file_file_self_deleted_notify)
539 539
540 ecore_main_loop_begin(); 540 ecore_main_loop_begin();
541 541
542 eo_unref(sentry); 542 efl_unref(sentry);
543 543
544 _common_shutdown(dirname); 544 _common_shutdown(dirname);
545} 545}
@@ -555,7 +555,7 @@ START_TEST(eio_test_sentry_two_monitors_one_event)
555 555
556 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 556 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
557 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname); 557 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname);
558 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 558 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
559 559
560 //sleep to avoid catching event generated by above manipulations 560 //sleep to avoid catching event generated by above manipulations
561 usleep(500000); 561 usleep(500000);
@@ -569,7 +569,7 @@ START_TEST(eio_test_sentry_two_monitors_one_event)
569 569
570 ecore_main_loop_begin(); 570 ecore_main_loop_begin();
571 571
572 eo_unref(sentry); 572 efl_unref(sentry);
573 573
574 _delete_directory((void*)dirname2); 574 _delete_directory((void*)dirname2);
575 _common_shutdown(dirname); 575 _common_shutdown(dirname);
@@ -587,7 +587,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
587 587
588 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 588 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
589 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname); 589 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
590 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 590 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
591 591
592 //sleep to avoid catching event generated by above manipulations 592 //sleep to avoid catching event generated by above manipulations
593 usleep(500000); 593 usleep(500000);
@@ -602,7 +602,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
602 602
603 ecore_main_loop_begin(); 603 ecore_main_loop_begin();
604 604
605 eo_unref(sentry); 605 efl_unref(sentry);
606 606
607 _delete_directory((void*)dirname2); 607 _delete_directory((void*)dirname2);
608 _common_shutdown(dirname); 608 _common_shutdown(dirname);
@@ -624,7 +624,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
624 624
625 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 625 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
626 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname); 626 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
627 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 627 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
628 628
629 //sleep to avoid catching event generated by above manipulations 629 //sleep to avoid catching event generated by above manipulations
630 usleep(500000); 630 usleep(500000);
@@ -640,7 +640,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
640 640
641 ecore_main_loop_begin(); 641 ecore_main_loop_begin();
642 642
643 eo_unref(sentry); 643 efl_unref(sentry);
644 644
645 _delete_directory((void*)dirname2); 645 _delete_directory((void*)dirname2);
646 _common_shutdown(dirname); 646 _common_shutdown(dirname);
@@ -658,7 +658,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory)
658 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_2", dirname); 658 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_2", dirname);
659 _create_file((void*)filename); 659 _create_file((void*)filename);
660 _create_file((void*)filename2); 660 _create_file((void*)filename2);
661 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 661 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
662 662
663 //sleep to avoid catching event generated by above manipulations 663 //sleep to avoid catching event generated by above manipulations
664 usleep(500000); 664 usleep(500000);
@@ -672,7 +672,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory)
672 672
673 ecore_main_loop_begin(); 673 ecore_main_loop_begin();
674 674
675 eo_unref(sentry); 675 efl_unref(sentry);
676 676
677 //cleanup 677 //cleanup
678 _common_shutdown(dirname); 678 _common_shutdown(dirname);
@@ -691,7 +691,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
691 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_one_removed_2", dirname); 691 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_one_removed_2", dirname);
692 _create_file((void*)filename); 692 _create_file((void*)filename);
693 _create_file((void*)filename2); 693 _create_file((void*)filename2);
694 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 694 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
695 695
696 //sleep to avoid catching event generated by above manipulations 696 //sleep to avoid catching event generated by above manipulations
697 usleep(500000); 697 usleep(500000);
@@ -708,7 +708,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
708 708
709 ecore_main_loop_begin(); 709 ecore_main_loop_begin();
710 710
711 eo_unref(sentry); 711 efl_unref(sentry);
712 712
713 //cleanup 713 //cleanup
714 _common_shutdown(dirname); 714 _common_shutdown(dirname);