enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

tests: Pass the interval to elm_test_helper_wait_flag for the caller to change 

Like JackDanielZ suggested.
This commit is contained in:
Ryuan Choi 2014-07-17 22:30:01 +09:00
parent 568a47c19d
commit 057d5456c6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/src/tests/elm_test_fileselector.c
View File

@ -69,13 +69,13 @@ START_TEST (elm_fileselector_selected)
selected = EINA_FALSE;
ck_assert(elm_fileselector_selected_set(fileselector, path));
ck_assert(elm_test_helper_wait_flag(&selected));
ck_assert(elm_test_helper_wait_flag(10, &selected));
ck_assert_str_eq(elm_fileselector_selected_get(fileselector), path);
selected = EINA_FALSE;
ck_assert(elm_fileselector_selected_set(fileselector, exist));
ck_assert(elm_test_helper_wait_flag(&selected));
ck_assert(elm_test_helper_wait_flag(10, &selected));
ck_assert_str_eq(elm_fileselector_selected_get(fileselector), exist);

6
legacy/elementary/src/tests/elm_test_helper.c
View File

@ -5,8 +5,6 @@
#include <Ecore.h>
#include "elm_suite.h"
const double timeout = 10;
typedef struct _Callback_Data
{
Ecore_Timer *timer;
@ -24,12 +22,12 @@ timer_expired_cb(void *user_data)
}
Eina_Bool
elm_test_helper_wait_flag(Eina_Bool *done)
elm_test_helper_wait_flag(double in, Eina_Bool *done)
{
Callback_Data data;
data.did_timeout = EINA_FALSE;
data.timer = ecore_timer_add(timeout, timer_expired_cb, &data);
data.timer = ecore_timer_add(in, timer_expired_cb, &data);
while (*done == EINA_FALSE && data.did_timeout == EINA_FALSE)
ecore_main_loop_iterate();

2
legacy/elementary/src/tests/elm_test_helper.h
View File

@ -3,6 +3,6 @@
#include <Eina.h>
Eina_Bool elm_test_helper_wait_flag(Eina_Bool *done);
Eina_Bool elm_test_helper_wait_flag(double in, Eina_Bool *done);
#endif /* _ELM_TEST_HELPER_H */