X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-timer.h;h=0110eaac87e6715ab4e3856cb604e73f9e767842;hb=51bd29a1b76ba44dd3b0cc34db1193ab83fa7661;hp=c479fb87f526d4264b50b229ddbd487fa3e7e591;hpb=fc6bf44b9a9ba244d7c8a92a88b4b8688c5bfa0b;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 c479fb8..0110eaa 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
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_TOOLKIT_TIMER_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -24,7 +24,7 @@
 // PUBLIC INCLUDES
 #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,7 +40,10 @@ 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 );
@@ -52,11 +55,17 @@ public:
   void SetInterval( unsigned int milliSec );
   unsigned int GetInterval() const;
   bool IsRunning() const;
-  TimerSignalV2& TickSignal();
+  TimerSignalType& TickSignal();
 private:
   Timer(Internal::Adaptor::Timer* timer);
 };
 
 } // namespace Dali
 
+namespace Test
+{
+int GetTimerCount();
+void EmitGlobalTimerSignal();
+}
+
 #endif // __DALI_TOOLKIT_TOOLKIT_TIMER_H__