summaryrefslogtreecommitdiff
path: root/src/tests/ecore/ecore_test_ecore.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/tests/ecore/ecore_test_ecore.c
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/tests/ecore/ecore_test_ecore.c')
-rw-r--r--src/tests/ecore/ecore_test_ecore.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index ff72c089df..ced99d2062 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -291,7 +291,7 @@ START_TEST(ecore_test_efl_loop_fd)
291 291
292 fd = eo_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(), 292 fd = eo_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
293 efl_loop_fd_set(eo_self, comm[0]), 293 efl_loop_fd_set(eo_self, comm[0]),
294 eo_event_callback_add(eo_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did)); 294 efl_event_callback_add(eo_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did));
295 fail_if(fd == NULL); 295 fail_if(fd == NULL);
296 296
297 ret = write(comm[1], &did, 1); 297 ret = write(comm[1], &did, 1);
@@ -309,7 +309,7 @@ START_TEST(ecore_test_efl_loop_fd)
309END_TEST 309END_TEST
310 310
311static void 311static void
312_eo_del_cb(void *data, const Eo_Event *ev EINA_UNUSED) 312_efl_del_cb(void *data, const Eo_Event *ev EINA_UNUSED)
313{ 313{
314 Eina_Bool *dead = data; 314 Eina_Bool *dead = data;
315 315
@@ -334,8 +334,8 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
334 334
335 fd = eo_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(), 335 fd = eo_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
336 efl_loop_fd_set(eo_self, comm[0]), 336 efl_loop_fd_set(eo_self, comm[0]),
337 eo_event_callback_add(eo_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did), 337 efl_event_callback_add(eo_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did),
338 eo_event_callback_add(eo_self, EO_EVENT_DEL, _eo_del_cb, &dead)); 338 efl_event_callback_add(eo_self, EFL_EVENT_DEL, _efl_del_cb, &dead));
339 eo_ref(fd); 339 eo_ref(fd);
340 fail_if(fd == NULL); 340 fail_if(fd == NULL);
341 341
@@ -352,7 +352,7 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
352 352
353 ret = ecore_shutdown(); 353 ret = ecore_shutdown();
354 354
355 eo_del(fd); 355 efl_del(fd);
356 fail_if(dead == EINA_FALSE); 356 fail_if(dead == EINA_FALSE);
357 357
358 eo_shutdown(); 358 eo_shutdown();
@@ -822,26 +822,26 @@ END_TEST
822 822
823START_TEST(ecore_test_efl_loop_register) 823START_TEST(ecore_test_efl_loop_register)
824{ 824{
825 Eo_Base *t, *n; 825 Efl_Object *t, *n;
826 826
827 ecore_init(); 827 ecore_init();
828 828
829 t = eo_provider_find(ecore_main_loop_get(), EFL_LOOP_CLASS); 829 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_CLASS);
830 fail_if(!eo_isa(t, EFL_LOOP_CLASS)); 830 fail_if(!eo_isa(t, EFL_LOOP_CLASS));
831 831
832 t = eo_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS); 832 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
833 fail_if(t != NULL); 833 fail_if(t != NULL);
834 834
835 n = eo_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get()); 835 n = eo_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get());
836 efl_loop_register(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n); 836 efl_loop_register(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
837 837
838 t = eo_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS); 838 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
839 fail_if(!eo_isa(t, EFL_LOOP_TIMER_CLASS)); 839 fail_if(!eo_isa(t, EFL_LOOP_TIMER_CLASS));
840 fail_if(t != n); 840 fail_if(t != n);
841 841
842 efl_loop_unregister(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n); 842 efl_loop_unregister(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
843 843
844 t = eo_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS); 844 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
845 fail_if(t != NULL); 845 fail_if(t != NULL);
846 846
847 ecore_shutdown(); 847 ecore_shutdown();