summaryrefslogtreecommitdiff
path: root/src/tests/ecore/ecore_test_ecore.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-26 12:16:20 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-26 14:02:51 -0500
commit28fe00b94e55575c15684959b89a614d5a579309 (patch)
tree8188fc04dee84accff78db30b8d3014cf1f49033 /src/tests/ecore/ecore_test_ecore.c
parent403c014bd25e399b4d4fa6c17f9a2f1583250070 (diff)
efl: create Efl.App class, the parent of Efl.Loop
Diffstat (limited to 'src/tests/ecore/ecore_test_ecore.c')
-rw-r--r--src/tests/ecore/ecore_test_ecore.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index 492c2aa033..de04c643cc 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -317,7 +317,7 @@ START_TEST(ecore_test_efl_loop_fd)
317 ret = pipe(comm); 317 ret = pipe(comm);
318 fail_if(ret != 0); 318 fail_if(ret != 0);
319 319
320 fd = efl_add(EFL_LOOP_FD_CLASS, efl_main_loop_get(), 320 fd = efl_add(EFL_LOOP_FD_CLASS, efl_app_main_loop_get(efl_app_get()),
321 efl_loop_fd_set(efl_added, comm[0]), 321 efl_loop_fd_set(efl_added, comm[0]),
322 efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did)); 322 efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did));
323 fail_if(fd == NULL); 323 fail_if(fd == NULL);
@@ -360,7 +360,7 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
360 ret = pipe(comm); 360 ret = pipe(comm);
361 fail_if(ret != 0); 361 fail_if(ret != 0);
362 362
363 fd = efl_add(EFL_LOOP_FD_CLASS, efl_main_loop_get(), 363 fd = efl_add(EFL_LOOP_FD_CLASS, efl_app_main_loop_get(efl_app_get()),
364 efl_loop_fd_set(efl_added, comm[0]), 364 efl_loop_fd_set(efl_added, comm[0]),
365 efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did), 365 efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did),
366 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_del_cb, &dead)); 366 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_del_cb, &dead));
@@ -863,44 +863,44 @@ START_TEST(ecore_test_efl_loop_register)
863 863
864 ecore_init(); 864 ecore_init();
865 865
866 t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_CLASS); 866 t = efl_provider_find(efl_app_main_loop_get(efl_app_get()), EFL_LOOP_CLASS);
867 fail_if(!efl_isa(t, EFL_LOOP_CLASS)); 867 fail_if(!efl_isa(t, EFL_LOOP_CLASS));
868 868
869 t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS); 869 t = efl_provider_find(efl_app_main_loop_get(efl_app_get()), EFL_LOOP_TIMER_CLASS);
870 fail_if(t != NULL); 870 fail_if(t != NULL);
871 871
872 n = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get()); 872 n = efl_add(EFL_LOOP_TIMER_CLASS, efl_app_main_loop_get(efl_app_get()));
873 fail_if(n != NULL); 873 fail_if(n != NULL);
874 874
875 n = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(), 875 n = efl_add(EFL_LOOP_TIMER_CLASS, efl_app_main_loop_get(efl_app_get()),
876 efl_loop_timer_interval_set(efl_added, 1.0)); 876 efl_loop_timer_interval_set(efl_added, 1.0));
877 efl_loop_register(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS, n); 877 efl_loop_register(efl_app_main_loop_get(efl_app_get()), EFL_LOOP_TIMER_CLASS, n);
878 878
879 t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS); 879 t = efl_provider_find(efl_app_main_loop_get(efl_app_get()), EFL_LOOP_TIMER_CLASS);
880 fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS)); 880 fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS));
881 fail_if(t != n); 881 fail_if(t != n);
882 882
883 efl_loop_unregister(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS, n); 883 efl_loop_unregister(efl_app_main_loop_get(efl_app_get()), EFL_LOOP_TIMER_CLASS, n);
884 884
885 t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS); 885 t = efl_provider_find(efl_app_main_loop_get(efl_app_get()), EFL_LOOP_TIMER_CLASS);
886 fail_if(t != NULL); 886 fail_if(t != NULL);
887 887
888 ecore_shutdown(); 888 ecore_shutdown();
889} 889}
890END_TEST 890END_TEST
891 891
892START_TEST(ecore_test_efl_app_version) 892START_TEST(ecore_test_efl_build_version)
893{ 893{
894 const Efl_Version *ver; 894 const Efl_Version *ver;
895 Eo *loop; 895 Eo *app;
896 896
897 ecore_init(); 897 ecore_init();
898 898
899 loop = efl_loop_main_get(EFL_LOOP_CLASS); 899 app = efl_app_get();
900 fail_if(!efl_isa(loop, EFL_LOOP_CLASS)); 900 fail_if(!efl_isa(app, EFL_APP_CLASS));
901 901
902 efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, 0, 0, NULL, EFL_BUILD_ID); 902 efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, 0, 0, NULL, EFL_BUILD_ID);
903 ver = efl_loop_app_efl_version_get(loop); 903 ver = efl_app_build_efl_version_get(app);
904 fail_if(!ver); 904 fail_if(!ver);
905 fail_if(ver->major != EFL_VERSION_MAJOR); 905 fail_if(ver->major != EFL_VERSION_MAJOR);
906 fail_if(ver->minor != EFL_VERSION_MINOR); 906 fail_if(ver->minor != EFL_VERSION_MINOR);
@@ -909,7 +909,7 @@ START_TEST(ecore_test_efl_app_version)
909 fail_if(ver->flavor); 909 fail_if(ver->flavor);
910 fail_if(!eina_streq(ver->build_id, EFL_BUILD_ID)); 910 fail_if(!eina_streq(ver->build_id, EFL_BUILD_ID));
911 911
912 ver = efl_loop_efl_version_get(loop); 912 ver = efl_app_efl_version_get(app);
913 fail_if(!ver); 913 fail_if(!ver);
914 fail_if(ver->major != EFL_VERSION_MAJOR); 914 fail_if(ver->major != EFL_VERSION_MAJOR);
915 fail_if(ver->minor != EFL_VERSION_MINOR); 915 fail_if(ver->minor != EFL_VERSION_MINOR);
@@ -941,5 +941,5 @@ void ecore_test_ecore(TCase *tc)
941 tcase_add_test(tc, ecore_test_efl_loop_fd); 941 tcase_add_test(tc, ecore_test_efl_loop_fd);
942 tcase_add_test(tc, ecore_test_efl_loop_fd_lifecycle); 942 tcase_add_test(tc, ecore_test_efl_loop_fd_lifecycle);
943 tcase_add_test(tc, ecore_test_efl_loop_register); 943 tcase_add_test(tc, ecore_test_efl_loop_register);
944 tcase_add_test(tc, ecore_test_efl_app_version); 944 tcase_add_test(tc, ecore_test_efl_build_version);
945} 945}