[dali_2.3.21] Merge branch '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..6541b3e 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
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H__
-#define __DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H__
+#ifndef DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H
+#define DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -17,50 +17,43 @@
  * limitations under the License.
  *
  */
-#define __DALI_EVENT_THREAD_CALLBACK_H_
+#define DALI_EVENT_THREAD_CALLBACK_H
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali/public-api/signals/callback.h>
 
 namespace Dali
 {
-
-class DALI_IMPORT_API EventThreadCallback
+class DALI_TOOLKIT_API EventThreadCallback
 {
 public:
-
-  EventThreadCallback( CallbackBase* callback );
+  EventThreadCallback(CallbackBase* callback);
 
   ~EventThreadCallback();
 
   void Trigger();
 
-  bool WaitingForTrigger(unsigned int count, unsigned int seconds );
+  bool WaitingForTrigger();
 
   CallbackBase* GetCallback();
 
-  static EventThreadCallback* Get();
-
 private:
-
   // undefined copy constructor.
-  EventThreadCallback( const EventThreadCallback& );
+  EventThreadCallback(const EventThreadCallback&);
 
   // undefined assignment operator
-  EventThreadCallback& operator=( const EventThreadCallback& );
+  EventThreadCallback& operator=(const EventThreadCallback&);
 
 private:
-
   struct Impl;
   Impl* mImpl;
 };
 
-}
+} // namespace Dali
 
 namespace Test
 {
-
 /**
  * Wait for the tested code to create an event trigger, then
  * wait for triggerCount Trigger calls to occur, and execute the trigger
@@ -68,9 +61,8 @@ 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, int executeCallbacks = true);
 
+} // namespace Test
 
-#endif /* __DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H__ */
+#endif // DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H