(Automated Tests) Update test suite after changes to PlatformAbstraction

Change-Id: I39d9eb81195f9326e15a4bcee48b4609cc249186

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 df3ae2e..1c75449 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
@@ -152,9 +152,9 @@ void TestApplication::SetSurfaceWidth( unsigned int width, unsigned height )
 
 void TestApplication::DoUpdate( unsigned int intervalMilliseconds )
 {
 
 void TestApplication::DoUpdate( unsigned int intervalMilliseconds )
 {

-  unsigned int seconds(0u), microseconds(0u);
-  mPlatformAbstraction.GetTimeMicroseconds( seconds, microseconds );
-  mLastVSyncTime = ( seconds * 1e3 ) + ( microseconds / 1e3 );
+  uint64_t seconds(0u), nanoseconds(0u);
+  mPlatformAbstraction.GetTimeNanoseconds( seconds, nanoseconds );
+  mLastVSyncTime = ( seconds * 1e3 ) + ( nanoseconds / 1e6 );

   unsigned int nextVSyncTime = mLastVSyncTime + 16;
 
   // Update Time values
   unsigned int nextVSyncTime = mLastVSyncTime + 16;
 
   // Update Time values

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
index d3bf259..3f61b93 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
@@ -25,6 +25,7 @@
 #include "test-gl-abstraction.h"
 #include "test-render-controller.h"
 #include <dali/public-api/common/dali-common.h>
 #include "test-gl-abstraction.h"
 #include "test-render-controller.h"
 #include <dali/public-api/common/dali-common.h>

+#include <dali/integration-api/resource-policies.h>

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -51,20 +52,18 @@ public:
                    size_t surfaceHeight = DEFAULT_SURFACE_HEIGHT,
                    float  horizontalDpi = DEFAULT_HORIZONTAL_DPI,
                    float  verticalDpi   = DEFAULT_VERTICAL_DPI,
                    size_t surfaceHeight = DEFAULT_SURFACE_HEIGHT,
                    float  horizontalDpi = DEFAULT_HORIZONTAL_DPI,
                    float  verticalDpi   = DEFAULT_VERTICAL_DPI,

-                   ResourcePolicy::DataRetention resourcePolicy = ResourcePolicy::DALI_DISCARDS_ALL_DATA );
-
-
+                   ResourcePolicy::DataRetention policy = ResourcePolicy::DALI_DISCARDS_ALL_DATA);

 
   TestApplication( bool   initialize,
                    size_t surfaceWidth  = DEFAULT_SURFACE_WIDTH,
                    size_t surfaceHeight = DEFAULT_SURFACE_HEIGHT,
                    float  horizontalDpi = DEFAULT_HORIZONTAL_DPI,
                    float  verticalDpi   = DEFAULT_VERTICAL_DPI,
 
   TestApplication( bool   initialize,
                    size_t surfaceWidth  = DEFAULT_SURFACE_WIDTH,
                    size_t surfaceHeight = DEFAULT_SURFACE_HEIGHT,
                    float  horizontalDpi = DEFAULT_HORIZONTAL_DPI,
                    float  verticalDpi   = DEFAULT_VERTICAL_DPI,

-                   ResourcePolicy::DataRetention resourcePolicy = ResourcePolicy::DALI_DISCARDS_ALL_DATA );
+                   ResourcePolicy::DataRetention policy = ResourcePolicy::DALI_DISCARDS_ALL_DATA);

 
   void Initialize();
   virtual ~TestApplication();
 
   void Initialize();
   virtual ~TestApplication();

-  static void LogMessage(Dali::Integration::Log::DebugPriority level, std::string& message);
+  static void LogMessage( Dali::Integration::Log::DebugPriority level, std::string& message );

   Dali::Integration::Core& GetCore();
   TestPlatformAbstraction& GetPlatform();
   TestRenderController& GetRenderController();
   Dali::Integration::Core& GetCore();
   TestPlatformAbstraction& GetPlatform();
   TestRenderController& GetRenderController();

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 d9ea25e..5ece3f1 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,43 +22,44 @@
 namespace Dali
 {
 
 namespace Dali
 {
 

-/**
- * Constructor
- */
+namespace
+{
+const unsigned int NANOSECONDS_PER_MILLISECOND = 1000000u;
+const unsigned int NANOSECONDS_PER_SECOND = 1000000000u;
+}
+

 TestPlatformAbstraction::TestPlatformAbstraction()
 TestPlatformAbstraction::TestPlatformAbstraction()

-: mRequest(0)
+: mTrace(),
+  mSeconds( 0u ),
+  mNanoSeconds( 0u ),
+  mIsLoadingResult( false ),
+  mGetDefaultFontSizeResult( 0 ),
+  mResources(),
+  mRequest( NULL ),
+  mSize(),
+  mClosestSize(),
+  mLoadFileResult(),
+  mSaveFileResult( false )

 {
   Initialize();
 }
 
 {
   Initialize();
 }
 

-/**
- * Destructor
- */

 TestPlatformAbstraction::~TestPlatformAbstraction()
 {
 }
 
 TestPlatformAbstraction::~TestPlatformAbstraction()
 {
 }
 

-/**
- * @copydoc PlatformAbstraction::GetTimeMicroseconds()
- */
-void TestPlatformAbstraction::GetTimeMicroseconds(unsigned int &seconds, unsigned int &microSeconds)
+void TestPlatformAbstraction::GetTimeNanoseconds( uint64_t& seconds, uint64_t& nanoseconds )

 {
   seconds = mSeconds;
 {
   seconds = mSeconds;

-  microSeconds = mMicroSeconds;
-  mTrace.PushCall("GetTimeMicroseconds", "");
+  nanoseconds = mNanoSeconds;
+  mTrace.PushCall("GetTimeNanoseconds", "");

 }
 
 }
 

-/**
- * @copydoc PlatformAbstraction::Suspend()
- */

 void TestPlatformAbstraction::Suspend()
 {
   mTrace.PushCall("Suspend", "");
 }
 
 void TestPlatformAbstraction::Suspend()
 {
   mTrace.PushCall("Suspend", "");
 }
 

-/**
- * @copydoc PlatformAbstraction::Resume()
- */

 void TestPlatformAbstraction::Resume()
 {
   mTrace.PushCall("Resume", "");
 void TestPlatformAbstraction::Resume()
 {
   mTrace.PushCall("Resume", "");


@@ -86,9 +87,6 @@ ImageDimensions TestPlatformAbstraction::GetClosestImageSize( Integration::Resou
   return closestSize;
 }
 
   return closestSize;
 }
 

-/**
- * @copydoc PlatformAbstraction::LoadResource()
- */

 void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request)
 {
   std::ostringstream out;
 void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request)
 {
   std::ostringstream out;


@@ -115,17 +113,11 @@ Integration::BitmapPtr TestPlatformAbstraction::DecodeBuffer( const Integration:
   return Integration::BitmapPtr();
 }
 
   return Integration::BitmapPtr();
 }
 

-/**
- * @copydoc PlatformAbstraction::CancelLoad()
- */

 void TestPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId)
 {
   mTrace.PushCall("CancelLoad", "");
 }
 
 void TestPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId)
 {
   mTrace.PushCall("CancelLoad", "");
 }
 

-/**
- * @copydoc PlatformAbstraction::GetResources()
- */

 void TestPlatformAbstraction::GetResources(Integration::ResourceCache& cache)
 {
   mTrace.PushCall("GetResources", "");
 void TestPlatformAbstraction::GetResources(Integration::ResourceCache& cache)
 {
   mTrace.PushCall("GetResources", "");


@@ -140,35 +132,23 @@ void TestPlatformAbstraction::GetResources(Integration::ResourceCache& cache)
   }
 }
 
   }
 }
 

-/**
- * @copydoc PlatformAbstraction::IsLoading()
- */

 bool TestPlatformAbstraction::IsLoading()
 {
   mTrace.PushCall("IsLoading", "");
   return mIsLoadingResult;
 }
 
 bool TestPlatformAbstraction::IsLoading()
 {
   mTrace.PushCall("IsLoading", "");
   return mIsLoadingResult;
 }
 

-/**
- * @copydoc PlatformAbstraction::GetDefaultFontSize()
- */

 int TestPlatformAbstraction::GetDefaultFontSize() const
 {
 int TestPlatformAbstraction::GetDefaultFontSize() const
 {

-  // TODO
-  return int();
+  mTrace.PushCall("GetDefaultFontSize", "");
+  return mGetDefaultFontSizeResult;

 }
 
 }
 

-/**
- * @copydoc PlatformAbstraction::SetDpi()
- */

 void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical)
 {
   mTrace.PushCall("SetDpi", "");
 }
 
 void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical)
 {
   mTrace.PushCall("SetDpi", "");
 }
 

-/**
- * @copydoc PlatformAbstraction::LoadFile()
- */

 bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
 {
   mTrace.PushCall("LoadFile", "");
 bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
 {
   mTrace.PushCall("LoadFile", "");


@@ -180,9 +160,6 @@ bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vecto
   return mLoadFileResult.loadResult;
 }
 
   return mLoadFileResult.loadResult;
 }
 

-/**
- * @copydoc PlatformAbstraction::LoadShaderBinaryFile()
- */

 bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
 {
   mTrace.PushCall("LoadShaderBinaryFile", "");
 bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const
 {
   mTrace.PushCall("LoadShaderBinaryFile", "");


@@ -194,10 +171,7 @@ bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename,
   return mLoadFileResult.loadResult;
 }
 
   return mLoadFileResult.loadResult;
 }
 

-/**
- * @copydoc PlatformAbstraction::SaveFile()
- */
-bool TestPlatformAbstraction::SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes) const
+bool TestPlatformAbstraction::SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const

 {
   mTrace.PushCall("SaveFile", "");
   return false;
 {
   mTrace.PushCall("SaveFile", "");
   return false;


@@ -215,7 +189,7 @@ void TestPlatformAbstraction::Initialize()
   mTrace.Enable(true);
   memset(&mResources, 0, sizeof(Resources));
   mSeconds=0;
   mTrace.Enable(true);
   memset(&mResources, 0, sizeof(Resources));
   mSeconds=0;

-  mMicroSeconds=0;
+  mNanoSeconds=0;

   mIsLoadingResult=false;
 
   if(mRequest)
   mIsLoadingResult=false;
 
   if(mRequest)


@@ -225,12 +199,11 @@ void TestPlatformAbstraction::Initialize()
   }
 }
 
   }
 }
 

-

 bool TestPlatformAbstraction::WasCalled(TestFuncEnum func)
 {
   switch(func)
   {
 bool TestPlatformAbstraction::WasCalled(TestFuncEnum func)
 {
   switch(func)
   {

-    case GetTimeMicrosecondsFunc:             return mTrace.FindMethod("GetTimeMicroseconds");
+    case GetTimeNanosecondsFunc:              return mTrace.FindMethod("GetTimeNanoseconds");

     case SuspendFunc:                         return mTrace.FindMethod("Suspend");
     case ResumeFunc:                          return mTrace.FindMethod("Resume");
     case LoadResourceFunc:                    return mTrace.FindMethod("LoadResource");
     case SuspendFunc:                         return mTrace.FindMethod("Suspend");
     case ResumeFunc:                          return mTrace.FindMethod("Resume");
     case LoadResourceFunc:                    return mTrace.FindMethod("LoadResource");


@@ -247,19 +220,19 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func)
   return false;
 }
 
   return false;
 }
 

-void TestPlatformAbstraction::SetGetTimeMicrosecondsResult(size_t sec, size_t usec)
+void TestPlatformAbstraction::SetGetTimeNanosecondsResult(size_t sec, size_t nsec)

 {
   mSeconds = sec;
 {
   mSeconds = sec;

-  mMicroSeconds = usec;
+  mNanoSeconds = nsec;

 }
 
 void TestPlatformAbstraction::IncrementGetTimeResult(size_t milliseconds)
 {
 }
 
 void TestPlatformAbstraction::IncrementGetTimeResult(size_t milliseconds)
 {

-  mMicroSeconds += milliseconds * 1000u;
-  unsigned int additionalSeconds = mMicroSeconds / 1000000u;
+  mNanoSeconds += milliseconds * NANOSECONDS_PER_MILLISECOND;
+  unsigned int additionalSeconds = mNanoSeconds / NANOSECONDS_PER_SECOND;

 
   mSeconds += additionalSeconds;
 
   mSeconds += additionalSeconds;

-  mMicroSeconds -= additionalSeconds * 1000000u;
+  mNanoSeconds -= additionalSeconds * NANOSECONDS_PER_SECOND;

 }
 
 void TestPlatformAbstraction::SetIsLoadingResult(bool result)
 }
 
 void TestPlatformAbstraction::SetIsLoadingResult(bool 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 3502e70..b1fb01b 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
@@ -21,15 +21,13 @@
 // EXTERNAL INCLUDES
 #include <stdint.h>
 #include <cstring>
 // EXTERNAL INCLUDES
 #include <stdint.h>
 #include <cstring>

-#include <dali/public-api/images/image-operations.h>
+#include <string>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/devel-api/common/set-wrapper.h>

 #include <dali/integration-api/platform-abstraction.h>
 
 #include "test-trace-call-stack.h"
 
 #include <dali/integration-api/platform-abstraction.h>
 
 #include "test-trace-call-stack.h"
 

-

 namespace Dali
 {
 
 namespace Dali
 {
 


@@ -76,9 +74,9 @@ public:
   virtual ~TestPlatformAbstraction();
 
   /**
   virtual ~TestPlatformAbstraction();
 
   /**

-   * @copydoc PlatformAbstraction::GetTimeMicroseconds()
+   * @copydoc PlatformAbstraction::GetTimeNanoseconds()

    */
    */

-  virtual void GetTimeMicroseconds(unsigned int &seconds, unsigned int &microSeconds);
+  virtual void GetTimeNanoseconds( uint64_t& seconds, uint64_t& nanoseconds );

 
   /**
    * @copydoc PlatformAbstraction::Suspend()
 
   /**
    * @copydoc PlatformAbstraction::Suspend()


@@ -156,15 +154,17 @@ public:
   /**
    * @copydoc PlatformAbstraction::LoadShaderBinaryFile()
    */
   /**
    * @copydoc PlatformAbstraction::LoadShaderBinaryFile()
    */

-  virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer
-) const;
-
-  virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; }
+  virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const;

 
   /**
    * @copydoc PlatformAbstraction::SaveFile()
    */
 
   /**
    * @copydoc PlatformAbstraction::SaveFile()
    */

-  virtual bool SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes) const;
+  virtual bool SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const;
+
+ /**
+  * @copydoc PlatformAbstraction::SaveShaderBinaryFile()
+  */
+  virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; }

 
   virtual void JoinLoaderThreads();
 
 
   virtual void JoinLoaderThreads();
 


@@ -173,7 +173,7 @@ public: // TEST FUNCTIONS
   // Enumeration of Platform Abstraction methods
   typedef enum
   {
   // Enumeration of Platform Abstraction methods
   typedef enum
   {

-    GetTimeMicrosecondsFunc,
+    GetTimeNanosecondsFunc,

     SuspendFunc,
     ResumeFunc,
     LoadResourceFunc,
     SuspendFunc,
     ResumeFunc,
     LoadResourceFunc,


@@ -185,7 +185,7 @@ public: // TEST FUNCTIONS
     GetResourcesFunc,
     IsLoadingFunc,
     SetDpiFunc,
     GetResourcesFunc,
     IsLoadingFunc,
     SetDpiFunc,

-    JoinLoaderThreadsFunc
+    JoinLoaderThreadsFunc,

   } TestFuncEnum;
 
   /** Call this every test */
   } TestFuncEnum;
 
   /** Call this every test */


@@ -197,18 +197,14 @@ public: // TEST FUNCTIONS
 
   bool WasCalled(TestFuncEnum func);
 
 
   bool WasCalled(TestFuncEnum func);
 

-  void SetGetTimeMicrosecondsResult(size_t sec, size_t usec);
+  void SetGetTimeNanosecondsResult(size_t sec, size_t nsec);

 
   void IncrementGetTimeResult(size_t milliseconds);
 
   void SetIsLoadingResult(bool result);
 
 
   void IncrementGetTimeResult(size_t milliseconds);
 
   void SetIsLoadingResult(bool result);
 

-  void SetGetDefaultFontFamilyResult(std::string result);
-

   void SetGetDefaultFontSizeResult(float result);
 
   void SetGetDefaultFontSizeResult(float result);
 

-  void SetGetFontPathResult(std::string& result);
-

   void ClearReadyResources();
 
   void SetResourceLoaded(Integration::ResourceId  loadedId,
   void ClearReadyResources();
 
   void SetResourceLoaded(Integration::ResourceId  loadedId,


@@ -230,9 +226,10 @@ public: // TEST FUNCTIONS
 
 private:
   mutable TraceCallStack        mTrace;
 
 private:
   mutable TraceCallStack        mTrace;

-  size_t                        mSeconds;
-  size_t                        mMicroSeconds;
+  uint64_t                      mSeconds;
+  uint64_t                      mNanoSeconds;

   bool                          mIsLoadingResult;
   bool                          mIsLoadingResult;

+  int                           mGetDefaultFontSizeResult;

   Resources                     mResources;
   Integration::ResourceRequest* mRequest;
   Vector2                       mSize;
   Resources                     mResources;
   Integration::ResourceRequest* mRequest;
   Vector2                       mSize;