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=d913b0f4830fb9a1ef035941e206911abeb1e3c3;hp=d1c20529b646951e9a4ebcf2b1afc4f38ec019ea;hpb=a881757839b7abb008873a68c67e17b3ba39669b;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 d1c2052..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,34 +24,48 @@
 // 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
 {
 
+namespace Internal
+{
+namespace Adaptor
+{
+class Timer;
+}
+}
+
 class Timer : public BaseHandle
 {
 public:
-  typedef SignalV2< bool () > TimerSignalV2;
-  static Timer New( unsigned int milliSec );
+  void MockEmitSignal();
+
+public:
+  typedef Signal< bool () > TimerSignalType;
   Timer();
+  static Timer New( unsigned int milliSec );
   Timer( const Timer& timer );
   Timer& operator=( const Timer& timer );
-  virtual ~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:
-  Dali::Timer::TimerSignalV2 mTickSignal;
-  unsigned int mInterval;
-  bool mIsRunning;
+  Timer(Internal::Adaptor::Timer* timer);
 };
 
 } // namespace Dali
 
+namespace Test
+{
+int GetTimerCount();
+void EmitGlobalTimerSignal();
+}
+
 #endif // __DALI_TOOLKIT_TOOLKIT_TIMER_H__