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=26080f936f851754221bb16e4e5e3834c24b96db;hp=908dbf0f516655e84f5bbf753d864161b8159754;hpb=8eb92d99dfc9cb3954f6802abdd9d438ef47eba5;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 908dbf0..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
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_TOOLKIT_TIMER_H__
 #define __DALI_TOOLKIT_TOOLKIT_TIMER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // EXTERNAL INCLUDES
 #include <string>
@@ -23,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
 {
@@ -39,24 +40,32 @@ 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 );
-  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:
   Timer(Internal::Adaptor::Timer* timer);
 };
 
 } // namespace Dali
 
+namespace Test
+{
+int GetTimerCount();
+void EmitGlobalTimerSignal();
+}
+
 #endif // __DALI_TOOLKIT_TOOLKIT_TIMER_H__