From: JunSeok, Kim Date: Mon, 27 Aug 2018 04:57:09 +0000 (+0900) Subject: e_test_event: added time parameter to work() and addTimer() X-Git-Tag: submit/tizen/20181030.101450~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98951fa3506b4787cb0aff091c0ca37fda5705db;p=platform%2Fcore%2Fuifw%2Fe-tizen-testcase.git e_test_event: added time parameter to work() and addTimer() Change-Id: I98b638a9364b8f39889cbdbc896e1520e3bc05cb --- diff --git a/src/e_test_event.cpp b/src/e_test_event.cpp index 9049924..0cf023d 100644 --- a/src/e_test_event.cpp +++ b/src/e_test_event.cpp @@ -917,10 +917,18 @@ finish: void etRunner::work() { - /* give a turn to deal with deferred job for E_TEST_WORK_TIME */ - worker.timer = ecore_timer_add(worker.waitTime, - _cb_work_timeout, - this); + /* give a turn to deal with deferred job for given time*/ + addTimer(worker.waitTime); + elm_run(); +} + +void +etRunner::work(double time) +{ + /* give a turn to deal with deferred job for given time*/ + if (time < 0.0) time = 0.0; + + addTimer(time); elm_run(); } @@ -928,10 +936,7 @@ void etRunner::finishWork() { if (worker.timer) - { - ecore_timer_del(worker.timer); - worker.timer = NULL; - } + delTimer(); elm_exit(); } @@ -985,12 +990,19 @@ etRunner::addTimer() } void -etRunner::waitForDestroy() +etRunner::addTimer(double time) { - setWaitTime(E_TEST_WORK_TIME); - addTimer(); + delTimer(); - elm_run(); + worker.timer = ecore_timer_add(time, + _cb_work_timeout, + this); +} + +void +etRunner::waitForDestroy() +{ + work(E_TEST_WORK_TIME); } Eina_Bool diff --git a/src/e_test_event.h b/src/e_test_event.h index 40150d5..9c29342 100644 --- a/src/e_test_event.h +++ b/src/e_test_event.h @@ -77,11 +77,13 @@ public: Eina_Bool init(); void shutdown(); void work(); + void work(double time); void finishWork(); void printWinInfoList(); void setWaitTime(double time) { worker.waitTime = time; }; void delTimer(); void addTimer(); + void addTimer(double time); void waitForDestroy(); Eina_Bool registerWin(etWin *tw);