X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-event-thread-callback.h;h=f3dc1344d2d9c397915f68c21f9b095eef02d1c4;hb=59314022f6789147a47a8b098433e211b6185625;hp=a0303bec805a07befbe1404a50720ed344005fa8;hpb=475209602f0a7ad74883059a818cbbe41be263e1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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..f3dc134 100644 --- 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 @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,13 +20,13 @@ #define __DALI_EVENT_THREAD_CALLBACK_H_ // EXTERNAL INCLUDES -#include +#include #include namespace Dali { -class DALI_IMPORT_API EventThreadCallback +class DALI_TOOLKIT_API EventThreadCallback { public: @@ -36,12 +36,10 @@ public: void Trigger(); - bool WaitingForTrigger(unsigned int count, unsigned int seconds ); + bool WaitingForTrigger(); CallbackBase* GetCallback(); - static EventThreadCallback* Get(); - private: // undefined copy constructor. @@ -68,7 +66,7 @@ namespace Test * * Will wait for a maximum of 30s before failing the test and returning. */ -bool WaitForEventThreadTrigger( int triggerCount ); +bool WaitForEventThreadTrigger( int triggerCount, int timeoutInSeconds=30 ); }