projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Previous model height return problem fixed" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-event-thread-callback.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h
index
a0303be
..
d718e10
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h
@@
-36,12
+36,10
@@
public:
void Trigger();
void Trigger();
- bool WaitingForTrigger(
unsigned int count, unsigned int seconds
);
+ bool WaitingForTrigger();
CallbackBase* GetCallback();
CallbackBase* GetCallback();
- static EventThreadCallback* Get();
-
private:
// undefined copy constructor.
private:
// undefined copy constructor.
@@
-68,7
+66,7
@@
namespace Test
*
* Will wait for a maximum of 30s before failing the test and returning.
*/
*
* Will wait for a maximum of 30s before failing the test and returning.
*/
-bool WaitForEventThreadTrigger( int triggerCount );
+bool WaitForEventThreadTrigger( int triggerCount
, int timeoutInSeconds=30
);
}
}