X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-timer.h;h=fdd44b4c877e37003ed4278399f1a04574bc3e41;hb=2951af4fa549b8383cebb3464fd14eb86a993e25;hp=8f23022221a4f0594751a27a3e56e4bab9e71f4d;hpb=998d982768c7f211d948cfd7921ec27ff739ce49;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
index 8f23022..fdd44b4 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TOOLKIT_TIMER_H__
-#define __DALI_TOOLKIT_TOOLKIT_TIMER_H__
+#ifndef DALI_TOOLKIT_TOOLKIT_TIMER_H
+#define DALI_TOOLKIT_TOOLKIT_TIMER_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -22,9 +22,9 @@
 #include <string>
 
 // PUBLIC INCLUDES
-#define __DALI_TIMER_H__
+#define DALI_TIMER_H
 #include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali
 {
@@ -40,24 +40,33 @@ class Timer;
 class Timer : public BaseHandle
 {
 public:
-  typedef SignalV2< bool () > TimerSignalV2;
+  void MockEmitSignal();
+
+public:
+  typedef Signal< bool () > TimerSignalType;
   Timer();
   static Timer New( unsigned int milliSec );
   Timer( const Timer& timer );
   Timer& operator=( const Timer& timer );
   ~Timer();
   static Timer DownCast( BaseHandle handle );
-  using BaseHandle::operator=;
   void Start();
   void Stop();
   void SetInterval( unsigned int milliSec );
   unsigned int GetInterval() const;
   bool IsRunning() const;
-  TimerSignalV2& TickSignal();
+  TimerSignalType& TickSignal();
 private:
   Timer(Internal::Adaptor::Timer* timer);
 };
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TOOLKIT_TIMER_H__
+namespace Test
+{
+int GetTimerCount();
+void EmitGlobalTimerSignal();
+bool AreTimersRunning();
+}
+
+#endif // DALI_TOOLKIT_TOOLKIT_TIMER_H