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

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 29abb84..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,56 +1,72 @@
-#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.
-//
+#ifndef DALI_TOOLKIT_TOOLKIT_TIMER_H
+#define DALI_TOOLKIT_TOOLKIT_TIMER_H
+
+/*
+ * 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.
+ * 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>
 
 // 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
 {
 
+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
 
-#endif // __DALI_TOOLKIT_TOOLKIT_TIMER_H__
+namespace Test
+{
+int GetTimerCount();
+void EmitGlobalTimerSignal();
+bool AreTimersRunning();
+}
+
+#endif // DALI_TOOLKIT_TOOLKIT_TIMER_H