summaryrefslogtreecommitdiff
path: root/src/tests/ecore
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/tests/ecore/ecore_test_args.c12
-rw-r--r--src/tests/ecore/ecore_test_ecore.c8
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c12
-rw-r--r--src/tests/ecore/ecore_test_timer.c8
4 files changed, 12 insertions, 28 deletions
diff --git a/src/tests/ecore/ecore_test_args.c b/src/tests/ecore/ecore_test_args.c
index 84ff61aeee..eb6d13c3e2 100644
--- a/src/tests/ecore/ecore_test_args.c
+++ b/src/tests/ecore/ecore_test_args.c
@@ -5,7 +5,7 @@
5#include <Ecore.h> 5#include <Ecore.h>
6#include "ecore_suite.h" 6#include "ecore_suite.h"
7 7
8static Eina_Bool 8static void
9_cb_args1(void *data EINA_UNUSED, const Eo_Event *event) 9_cb_args1(void *data EINA_UNUSED, const Eo_Event *event)
10{ 10{
11 Efl_Loop_Args *args = event->info; 11 Efl_Loop_Args *args = event->info;
@@ -22,7 +22,6 @@ _cb_args1(void *data EINA_UNUSED, const Eo_Event *event)
22 fail_if(!!strcmp(efl_loop_args_arg_get(args, 6), "g")); 22 fail_if(!!strcmp(efl_loop_args_arg_get(args, 6), "g"));
23 fail_if(!!strcmp(efl_loop_args_arg_get(args, 7), "h")); 23 fail_if(!!strcmp(efl_loop_args_arg_get(args, 7), "h"));
24 ecore_main_loop_quit(); 24 ecore_main_loop_quit();
25 return EO_CALLBACK_CONTINUE;
26} 25}
27 26
28START_TEST(ecore_test_args1) 27START_TEST(ecore_test_args1)
@@ -41,7 +40,7 @@ START_TEST(ecore_test_args1)
41} 40}
42END_TEST 41END_TEST
43 42
44static Eina_Bool 43static void
45_cb_args2(void *data EINA_UNUSED, const Eo_Event *event) 44_cb_args2(void *data EINA_UNUSED, const Eo_Event *event)
46{ 45{
47 Efl_Loop_Args *args = event->info; 46 Efl_Loop_Args *args = event->info;
@@ -51,7 +50,6 @@ _cb_args2(void *data EINA_UNUSED, const Eo_Event *event)
51 fail_if(n != 1); 50 fail_if(n != 1);
52 fail_if(!!strcmp(efl_loop_args_arg_get(args, 0), "hello world")); 51 fail_if(!!strcmp(efl_loop_args_arg_get(args, 0), "hello world"));
53 ecore_main_loop_quit(); 52 ecore_main_loop_quit();
54 return EO_CALLBACK_CONTINUE;
55} 53}
56 54
57START_TEST(ecore_test_args2) 55START_TEST(ecore_test_args2)
@@ -70,7 +68,7 @@ START_TEST(ecore_test_args2)
70} 68}
71END_TEST 69END_TEST
72 70
73static Eina_Bool 71static void
74_cb_args3(void *data EINA_UNUSED, const Eo_Event *event) 72_cb_args3(void *data EINA_UNUSED, const Eo_Event *event)
75{ 73{
76 Efl_Loop_Args *args = event->info; 74 Efl_Loop_Args *args = event->info;
@@ -79,7 +77,6 @@ _cb_args3(void *data EINA_UNUSED, const Eo_Event *event)
79 n = efl_loop_args_arg_num_get(args); 77 n = efl_loop_args_arg_num_get(args);
80 fail_if(n != 0); 78 fail_if(n != 0);
81 ecore_main_loop_quit(); 79 ecore_main_loop_quit();
82 return EO_CALLBACK_CONTINUE;
83} 80}
84 81
85START_TEST(ecore_test_args3) 82START_TEST(ecore_test_args3)
@@ -93,7 +90,7 @@ START_TEST(ecore_test_args3)
93} 90}
94END_TEST 91END_TEST
95 92
96static Eina_Bool 93static void
97_cb_args4(void *data EINA_UNUSED, const Eo_Event *event) 94_cb_args4(void *data EINA_UNUSED, const Eo_Event *event)
98{ 95{
99 Efl_Loop_Args *args = event->info; 96 Efl_Loop_Args *args = event->info;
@@ -105,7 +102,6 @@ _cb_args4(void *data EINA_UNUSED, const Eo_Event *event)
105 fail_if(!!strcmp(efl_loop_args_arg_get(args, 1), "xxxxx")); 102 fail_if(!!strcmp(efl_loop_args_arg_get(args, 1), "xxxxx"));
106 fail_if(!!strcmp(efl_loop_args_arg_get(args, 2), "y")); 103 fail_if(!!strcmp(efl_loop_args_arg_get(args, 2), "y"));
107 ecore_main_loop_quit(); 104 ecore_main_loop_quit();
108 return EO_CALLBACK_CONTINUE;
109} 105}
110 106
111START_TEST(ecore_test_args4) 107START_TEST(ecore_test_args4)
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index 338bb74a20..41858c0558 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -267,15 +267,13 @@ START_TEST(ecore_test_ecore_main_loop_fd_handler)
267} 267}
268END_TEST 268END_TEST
269 269
270static Eina_Bool 270static void
271_eo_read_cb(void *data, const Eo_Event *info EINA_UNUSED) 271_eo_read_cb(void *data, const Eo_Event *info EINA_UNUSED)
272{ 272{
273 Eina_Bool *did = data; 273 Eina_Bool *did = data;
274 274
275 *did = EINA_TRUE; 275 *did = EINA_TRUE;
276 ecore_main_loop_quit(); 276 ecore_main_loop_quit();
277
278 return EO_CALLBACK_CONTINUE;
279} 277}
280 278
281START_TEST(ecore_test_efl_loop_fd) 279START_TEST(ecore_test_efl_loop_fd)
@@ -310,14 +308,12 @@ START_TEST(ecore_test_efl_loop_fd)
310} 308}
311END_TEST 309END_TEST
312 310
313static Eina_Bool 311static void
314_eo_del_cb(void *data, const Eo_Event *ev EINA_UNUSED) 312_eo_del_cb(void *data, const Eo_Event *ev EINA_UNUSED)
315{ 313{
316 Eina_Bool *dead = data; 314 Eina_Bool *dead = data;
317 315
318 *dead = EINA_TRUE; 316 *dead = EINA_TRUE;
319
320 return EINA_TRUE;
321} 317}
322 318
323START_TEST(ecore_test_efl_loop_fd_lifecycle) 319START_TEST(ecore_test_efl_loop_fd_lifecycle)
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 480e5a2b8b..dda71e3be6 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -11,7 +11,7 @@
11 11
12#include "ecore_suite.h" 12#include "ecore_suite.h"
13 13
14static Eina_Bool _failed_cb(void *data, const Eo_Event *event EINA_UNUSED) 14static void _failed_cb(void *data, const Eo_Event *event EINA_UNUSED)
15{ 15{
16 Eina_Bool *pulse_context_failed = data; 16 Eina_Bool *pulse_context_failed = data;
17 17
@@ -21,22 +21,16 @@ static Eina_Bool _failed_cb(void *data, const Eo_Event *event EINA_UNUSED)
21 *pulse_context_failed = (pa_check == 0); 21 *pulse_context_failed = (pa_check == 0);
22 } 22 }
23 ecore_main_loop_quit(); 23 ecore_main_loop_quit();
24
25 return EINA_TRUE;
26} 24}
27 25
28static Eina_Bool _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 26static void _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
29{ 27{
30 ecore_main_loop_quit(); 28 ecore_main_loop_quit();
31
32 return EINA_TRUE;
33} 29}
34 30
35static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) 31static void _looped_cb(void *data EINA_UNUSED, const Eo_Event *event)
36{ 32{
37 ecore_audio_obj_in_looped_set(event->object, EINA_FALSE); 33 ecore_audio_obj_in_looped_set(event->object, EINA_FALSE);
38
39 return EINA_TRUE;
40} 34}
41 35
42#ifdef HAVE_PULSE 36#ifdef HAVE_PULSE
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 336538f164..4394643548 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -252,20 +252,18 @@ _test_time_cb(void *data)
252 return EINA_TRUE; 252 return EINA_TRUE;
253} 253}
254 254
255static Eina_Bool 255static void
256_test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED) 256_test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED)
257{ 257{
258 Eina_Bool *die = data; 258 Eina_Bool *die = data;
259 259
260 *die = EINA_TRUE; 260 *die = EINA_TRUE;
261
262 return EINA_TRUE;
263} 261}
264 262
265static Eina_Bool 263static void
266_test_run_cb(void *data, const Eo_Event *ev EINA_UNUSED) 264_test_run_cb(void *data, const Eo_Event *ev EINA_UNUSED)
267{ 265{
268 return _test_time_cb(data); 266 _test_time_cb(data);
269} 267}
270 268
271START_TEST(ecore_test_timer_lifecycle) 269START_TEST(ecore_test_timer_lifecycle)