[UTC][dali-adaptor][ACR-1301][Add new Timer APIs]

Change-Id: Id9b9774390ef3fd076e95d5f1020a5bc1a9e1303
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/src/utc/dali-adaptor/tct-dali-adaptor-core_mobile.h b/src/utc/dali-adaptor/tct-dali-adaptor-core_mobile.h
index 0a81689a549711fc98a8ae411ff7db12afb13fce..120b84ddf903c0ab705493482e2b05a39569a360 100755 (executable)
--- a/src/utc/dali-adaptor/tct-dali-adaptor-core_mobile.h
+++ b/src/utc/dali-adaptor/tct-dali-adaptor-core_mobile.h
@@ -42,6 +42,8 @@ extern int UtcDaliTimerConstructorP(void);
 extern int UtcDaliTimerDowncastP(void);
 extern int UtcDaliTimerDowncastN(void);
 extern int UtcDaliTimerIsRunningP(void);
+extern int UtcDaliTimerSetGetIntervalP2(void);
+extern int UtcDaliTimerSetGetIntervalP3(void);
 extern int UtcDaliWindowNewP(void);
 extern int UtcDaliWindowNewP2(void);
 extern int UtcDaliWindowIndicatorVisibilityChangeP(void);
@@ -160,6 +162,8 @@ testcase tc_array[] = {
        {"UtcDaliTimerDowncastP",UtcDaliTimerDowncastP,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliTimerDowncastN",UtcDaliTimerDowncastN,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliTimerIsRunningP",UtcDaliTimerIsRunningP,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
+       {"UtcDaliTimerSetGetIntervalP2",UtcDaliTimerSetGetIntervalP2,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
+       {"UtcDaliTimerSetGetIntervalP3",UtcDaliTimerSetGetIntervalP3,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliWindowNewP",UtcDaliWindowNewP,utc_Dali_Window_startup,utc_Dali_Window_cleanup},
        {"UtcDaliWindowNewP2",UtcDaliWindowNewP2,utc_Dali_Window_startup,utc_Dali_Window_cleanup},
        {"UtcDaliWindowIndicatorVisibilityChangeP",UtcDaliWindowIndicatorVisibilityChangeP,utc_Dali_Window_startup,utc_Dali_Window_cleanup},

diff --git a/src/utc/dali-adaptor/tct-dali-adaptor-core_tizeniot.h b/src/utc/dali-adaptor/tct-dali-adaptor-core_tizeniot.h
index 0a81689a549711fc98a8ae411ff7db12afb13fce..120b84ddf903c0ab705493482e2b05a39569a360 100755 (executable)
--- a/src/utc/dali-adaptor/tct-dali-adaptor-core_tizeniot.h
+++ b/src/utc/dali-adaptor/tct-dali-adaptor-core_tizeniot.h
@@ -42,6 +42,8 @@ extern int UtcDaliTimerConstructorP(void);
 extern int UtcDaliTimerDowncastP(void);
 extern int UtcDaliTimerDowncastN(void);
 extern int UtcDaliTimerIsRunningP(void);
+extern int UtcDaliTimerSetGetIntervalP2(void);
+extern int UtcDaliTimerSetGetIntervalP3(void);
 extern int UtcDaliWindowNewP(void);
 extern int UtcDaliWindowNewP2(void);
 extern int UtcDaliWindowIndicatorVisibilityChangeP(void);
@@ -160,6 +162,8 @@ testcase tc_array[] = {
        {"UtcDaliTimerDowncastP",UtcDaliTimerDowncastP,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliTimerDowncastN",UtcDaliTimerDowncastN,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliTimerIsRunningP",UtcDaliTimerIsRunningP,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
+       {"UtcDaliTimerSetGetIntervalP2",UtcDaliTimerSetGetIntervalP2,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
+       {"UtcDaliTimerSetGetIntervalP3",UtcDaliTimerSetGetIntervalP3,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliWindowNewP",UtcDaliWindowNewP,utc_Dali_Window_startup,utc_Dali_Window_cleanup},
        {"UtcDaliWindowNewP2",UtcDaliWindowNewP2,utc_Dali_Window_startup,utc_Dali_Window_cleanup},
        {"UtcDaliWindowIndicatorVisibilityChangeP",UtcDaliWindowIndicatorVisibilityChangeP,utc_Dali_Window_startup,utc_Dali_Window_cleanup},

diff --git a/src/utc/dali-adaptor/tct-dali-adaptor-core_wearable.h b/src/utc/dali-adaptor/tct-dali-adaptor-core_wearable.h
index 008d608176ce0d0990280dc50e5c8059de903aae..180db95673613cc35a7d0e35251015d3581ff401 100755 (executable)
--- a/src/utc/dali-adaptor/tct-dali-adaptor-core_wearable.h
+++ b/src/utc/dali-adaptor/tct-dali-adaptor-core_wearable.h
@@ -48,6 +48,8 @@ extern int UtcDaliTimerConstructorP(void);
 extern int UtcDaliTimerDowncastP(void);
 extern int UtcDaliTimerDowncastN(void);
 extern int UtcDaliTimerIsRunningP(void);
+extern int UtcDaliTimerSetGetIntervalP2(void);
+extern int UtcDaliTimerSetGetIntervalP3(void);
 extern int UtcDaliWindowNewP(void);
 extern int UtcDaliWindowNewP2(void);
 extern int UtcDaliWindowIndicatorVisibilityChangeP(void);
@@ -198,6 +200,8 @@ testcase tc_array[] = {
        {"UtcDaliTimerDowncastP",UtcDaliTimerDowncastP,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliTimerDowncastN",UtcDaliTimerDowncastN,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliTimerIsRunningP",UtcDaliTimerIsRunningP,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
+       {"UtcDaliTimerSetGetIntervalP2",UtcDaliTimerSetGetIntervalP2,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
+       {"UtcDaliTimerSetGetIntervalP3",UtcDaliTimerSetGetIntervalP3,utc_Dali_Timer_startup,utc_Dali_Timer_cleanup},
        {"UtcDaliWindowNewP",UtcDaliWindowNewP,utc_Dali_Window_startup,utc_Dali_Window_cleanup},
        {"UtcDaliWindowNewP2",UtcDaliWindowNewP2,utc_Dali_Window_startup,utc_Dali_Window_cleanup},
        {"UtcDaliWindowIndicatorVisibilityChangeP",UtcDaliWindowIndicatorVisibilityChangeP,utc_Dali_Window_startup,utc_Dali_Window_cleanup},

diff --git a/src/utc/dali-adaptor/timer/utc-dali-timer.cpp b/src/utc/dali-adaptor/timer/utc-dali-timer.cpp
index 1d692f6b17308fa6179e94c1f9d59c48cf840366..f975329166cbb288ef2c17e38b560aee92f480f2 100755 (executable)
--- a/src/utc/dali-adaptor/timer/utc-dali-timer.cpp
+++ b/src/utc/dali-adaptor/timer/utc-dali-timer.cpp
@@ -31,6 +31,8 @@ unsigned int gTimerSetTimeInMilliSec = DEFAULT_TIME_INTERVAL_IN_MILLISEC;
 unsigned int gTimerGetTimeInMilliSec = DEFAULT_TIME_INTERVAL_IN_MILLISEC;
 
 void TimerSetGetIntervalP();
+void TimerSetGetIntervalP2();
+void TimerSetGetIntervalP3();
 void TimerStartStopP();
 void TimerAssignmentOperatorP();
 void TimerTickSignalP();
@@ -48,6 +50,8 @@ namespace
   {
     TIMER_CONSTRUCTOR_P,
     TIMER_SET_GET_INTERVAL_P,
+    TIMER_SET_GET_INTERVAL_P2,
+    TIMER_SET_GET_INTERVAL_P3,
     TIMER_START_STOP_P,
     TIMER_ASSIGNMENT_OPERATOR_P,
     TIMER_TICK_SIGNAL_P,
@@ -94,6 +98,14 @@ namespace
           TimerSetGetIntervalP();
           break;
 
+        case TIMER_SET_GET_INTERVAL_P2:
+          TimerSetGetIntervalP2();
+          break;
+
+        case TIMER_SET_GET_INTERVAL_P3:
+          TimerSetGetIntervalP3();
+          break;
+
         case TIMER_START_STOP_P:
           TimerStartStopP();
           break;
@@ -193,6 +205,62 @@ void TimerSetGetIntervalP()
   DaliLog::PrintPass();
 }
 
+void TimerSetGetIntervalP2()
+{
+  bool bIsRunning = false;
+  gTimerSetTimeInMilliSec = 5000u;
+  unsigned int gTimerGetTimeInMilliSec = DEFAULT_TIME_INTERVAL_IN_MILLISEC;
+
+  Timer timer = TimerInit();
+  DALI_CHECK_FAIL(!timer,"Timer object is not created");
+
+  timer.SetInterval(PERIODIC_TICK_INTERVAL);
+
+  gTimerGetTimeInMilliSec = timer.GetInterval();
+  DALI_CHECK_FAIL(gTimerGetTimeInMilliSec != PERIODIC_TICK_INTERVAL, "Failed to Get the default GetInterval.");
+  bIsRunning = timer.IsRunning();
+  DALI_CHECK_FAIL(!bIsRunning, "Timer should be running after SetInterval.");
+
+  timer.SetInterval(gTimerSetTimeInMilliSec, false);
+
+  gTimerGetTimeInMilliSec = timer.GetInterval();
+  DALI_CHECK_FAIL(gTimerGetTimeInMilliSec != gTimerSetTimeInMilliSec, "GetIntervaland SetInterval value mismatched.");
+  bIsRunning = timer.IsRunning();
+  DALI_CHECK_FAIL(bIsRunning, "Timer should be stopped after SetInterval(interval, false).");
+
+  timer.Reset();
+
+  DaliLog::PrintPass();
+}
+
+void TimerSetGetIntervalP3()
+{
+  bool bIsRunning = false;
+  gTimerSetTimeInMilliSec = 5000u;
+  unsigned int gTimerGetTimeInMilliSec = DEFAULT_TIME_INTERVAL_IN_MILLISEC;
+
+  Timer timer = TimerInit();
+  DALI_CHECK_FAIL(!timer,"Timer object is not created");
+
+  timer.SetInterval(PERIODIC_TICK_INTERVAL);
+
+  gTimerGetTimeInMilliSec = timer.GetInterval();
+  DALI_CHECK_FAIL(gTimerGetTimeInMilliSec != PERIODIC_TICK_INTERVAL, "Failed to Get the default GetInterval.");
+  bIsRunning = timer.IsRunning();
+  DALI_CHECK_FAIL(!bIsRunning, "Timer should be running after SetInterval.");
+
+  timer.SetInterval(gTimerSetTimeInMilliSec, true);
+
+  gTimerGetTimeInMilliSec = timer.GetInterval();
+  DALI_CHECK_FAIL(gTimerGetTimeInMilliSec != gTimerSetTimeInMilliSec, "GetIntervaland SetInterval value mismatched.");
+  bIsRunning = timer.IsRunning();
+  DALI_CHECK_FAIL(!bIsRunning, "Timer should be still running after SetInterval(interval, true).");
+
+  timer.Reset();
+
+  DaliLog::PrintPass();
+}
+
 void TimerStartStopP()
 {
   bool bIsRunning = false;
@@ -478,3 +546,35 @@ int UtcDaliTimerIsRunningP(void)
   application.MainLoop();
   return test_return_value;
 }
+
+/**
+ * @testcase        UtcDaliTimerSetGetIntervalP2
+ * @since_tizen     5.0
+ * @description     checks for Timer::SetGetIntervalP2() functionality
+ */
+
+int UtcDaliTimerSetGetIntervalP2(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Timer_TestApp testApp( application, TIMER_SET_GET_INTERVAL_P2);
+  application.MainLoop();
+  return test_return_value;
+}
+
+/**
+ * @testcase        UtcDaliTimerSetGetIntervalP3
+ * @since_tizen     5.0
+ * @description     checks for Timer::SetGetIntervalP3() functionality
+ */
+
+int UtcDaliTimerSetGetIntervalP3(void)
+{
+  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Timer_TestApp testApp( application, TIMER_SET_GET_INTERVAL_P3);
+  application.MainLoop();
+  return test_return_value;
+}