(Automated Tests) Changes required after removal of time getters from PlatformAbstraction

Change-Id: I13aad80d074e71edfafb4e184c8ef1ab4c423a06

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
index 1c75449..995e117 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
@@ -48,6 +48,7 @@ TestApplication::TestApplication( bool   initialize,
   mSurfaceHeight( surfaceHeight ),
   mFrame( 0u ),
   mDpi( horizontalDpi, verticalDpi ),
+  mLastVSyncTime(0u),
   mDataRetentionPolicy( policy )
 {
   if ( initialize )
@@ -152,16 +153,12 @@ void TestApplication::SetSurfaceWidth( unsigned int width, unsigned height )
 
 void TestApplication::DoUpdate( unsigned int intervalMilliseconds )
 {
-  uint64_t seconds(0u), nanoseconds(0u);
-  mPlatformAbstraction.GetTimeNanoseconds( seconds, nanoseconds );
-  mLastVSyncTime = ( seconds * 1e3 ) + ( nanoseconds / 1e6 );
-  unsigned int nextVSyncTime = mLastVSyncTime + 16;
-
-  // Update Time values
-  mPlatformAbstraction.IncrementGetTimeResult( intervalMilliseconds );
-
+  unsigned int nextVSyncTime = mLastVSyncTime + intervalMilliseconds;
   float elapsedSeconds = intervalMilliseconds / 1e3f;
+
   mCore->Update( elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus );
+
+  mLastVSyncTime = nextVSyncTime;
 }
 
 bool TestApplication::Render( unsigned int intervalMilliseconds  )

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
index 5ece3f1..1e56f8d 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
@@ -22,16 +22,8 @@
 namespace Dali
 {
 
-namespace
-{
-const unsigned int NANOSECONDS_PER_MILLISECOND = 1000000u;
-const unsigned int NANOSECONDS_PER_SECOND = 1000000000u;
-}
-
 TestPlatformAbstraction::TestPlatformAbstraction()
 : mTrace(),
-  mSeconds( 0u ),
-  mNanoSeconds( 0u ),
   mIsLoadingResult( false ),
   mGetDefaultFontSizeResult( 0 ),
   mResources(),
@@ -48,13 +40,6 @@ TestPlatformAbstraction::~TestPlatformAbstraction()
 {
 }
 
-void TestPlatformAbstraction::GetTimeNanoseconds( uint64_t& seconds, uint64_t& nanoseconds )
-{
-  seconds = mSeconds;
-  nanoseconds = mNanoSeconds;
-  mTrace.PushCall("GetTimeNanoseconds", "");
-}
-
 void TestPlatformAbstraction::Suspend()
 {
   mTrace.PushCall("Suspend", "");
@@ -188,8 +173,6 @@ void TestPlatformAbstraction::Initialize()
   mTrace.Reset();
   mTrace.Enable(true);
   memset(&mResources, 0, sizeof(Resources));
-  mSeconds=0;
-  mNanoSeconds=0;
   mIsLoadingResult=false;
 
   if(mRequest)
@@ -203,7 +186,6 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func)
 {
   switch(func)
   {
-    case GetTimeNanosecondsFunc:              return mTrace.FindMethod("GetTimeNanoseconds");
     case SuspendFunc:                         return mTrace.FindMethod("Suspend");
     case ResumeFunc:                          return mTrace.FindMethod("Resume");
     case LoadResourceFunc:                    return mTrace.FindMethod("LoadResource");
@@ -220,21 +202,6 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func)
   return false;
 }
 
-void TestPlatformAbstraction::SetGetTimeNanosecondsResult(size_t sec, size_t nsec)
-{
-  mSeconds = sec;
-  mNanoSeconds = nsec;
-}
-
-void TestPlatformAbstraction::IncrementGetTimeResult(size_t milliseconds)
-{
-  mNanoSeconds += milliseconds * NANOSECONDS_PER_MILLISECOND;
-  unsigned int additionalSeconds = mNanoSeconds / NANOSECONDS_PER_SECOND;
-
-  mSeconds += additionalSeconds;
-  mNanoSeconds -= additionalSeconds * NANOSECONDS_PER_SECOND;
-}
-
 void TestPlatformAbstraction::SetIsLoadingResult(bool result)
 {
   mIsLoadingResult = result;

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
index b1fb01b..a728ac2 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
@@ -74,11 +74,6 @@ public:
   virtual ~TestPlatformAbstraction();
 
   /**
-   * @copydoc PlatformAbstraction::GetTimeNanoseconds()
-   */
-  virtual void GetTimeNanoseconds( uint64_t& seconds, uint64_t& nanoseconds );
-
-  /**
    * @copydoc PlatformAbstraction::Suspend()
    */
   virtual void Suspend();
@@ -173,7 +168,6 @@ public: // TEST FUNCTIONS
   // Enumeration of Platform Abstraction methods
   typedef enum
   {
-    GetTimeNanosecondsFunc,
     SuspendFunc,
     ResumeFunc,
     LoadResourceFunc,
@@ -197,10 +191,6 @@ public: // TEST FUNCTIONS
 
   bool WasCalled(TestFuncEnum func);
 
-  void SetGetTimeNanosecondsResult(size_t sec, size_t nsec);
-
-  void IncrementGetTimeResult(size_t milliseconds);
-
   void SetIsLoadingResult(bool result);
 
   void SetGetDefaultFontSizeResult(float result);
@@ -226,8 +216,6 @@ public: // TEST FUNCTIONS
 
 private:
   mutable TraceCallStack        mTrace;
-  uint64_t                      mSeconds;
-  uint64_t                      mNanoSeconds;
   bool                          mIsLoadingResult;
   int                           mGetDefaultFontSizeResult;
   Resources                     mResources;