Changed 'virtual' function override declarations to 'override' in automated-tests.

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-vector-animation-renderer.cpp

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
index 558cdec..b0075d2 100755 (executable)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
@@ -18,6 +18,9 @@
 #include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
 #include <dali/public-api/object/base-object.h>
 #include <toolkit-application.h>
+#include <toolkit-vector-animation-renderer.h>
+#include <toolkit-event-thread-callback.h>
+#include <memory>
 
 namespace Dali
 {
@@ -37,8 +40,21 @@ public:
     mRenderer(),
     mWidth( 0 ),
     mHeight( 0 ),
-    mPreviousFrame( 0 )
+    mPreviousFrame( 0 ),
+    mFrameRate( 60.0f ),
+    mEventThreadCallback( new EventThreadCallback( MakeCallback( this, &VectorAnimationRenderer::OnTriggered ) ) )
   {
+    mCount++;
+
+    if( mCount == 2 )
+    {
+      mFrameRate = 0.1f;
+    }
+  }
+
+  ~VectorAnimationRenderer()
+  {
+    mCount--;
   }
 
   void SetRenderer( Dali::Renderer renderer )
@@ -70,6 +86,12 @@ public:
 
   bool Render( uint32_t frameNumber )
   {
+    if( mNeedTrigger )
+    {
+      mEventThreadCallback->Trigger();
+      mNeedTrigger = false;
+    }
+
     if( frameNumber == 1 && mPreviousFrame != frameNumber )
     {
       mPreviousFrame = frameNumber;
@@ -82,12 +104,12 @@ public:
 
   uint32_t GetTotalFrameNumber() const
   {
-    return 5;
+    return VECTOR_ANIMATION_TOTAL_FRAME_NUMBER;
   }
 
   float GetFrameRate() const
   {
-    return 60.0f;
+    return mFrameRate;
   }
 
   void GetDefaultSize( uint32_t& width, uint32_t& height ) const
@@ -96,21 +118,52 @@ public:
     height = 100;
   }
 
+  bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+  {
+    if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_1 ) == 0 )
+    {
+      startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_1;
+      endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_1;
+    }
+    else if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_2 ) == 0 )
+    {
+      startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_2;
+      endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_2;
+    }
+    else
+    {
+      return false;
+    }
+    return true;
+  }
+
   Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal()
   {
     return mUploadCompletedSignal;
   }
 
+  void OnTriggered()
+  {
+  }
+
 public:
 
+  static uint32_t mCount;
+  static bool mNeedTrigger;
+
   std::string mUrl;
   Dali::Renderer mRenderer;
   uint32_t mWidth;
   uint32_t mHeight;
   uint32_t mPreviousFrame;
+  float mFrameRate;
   Dali::VectorAnimationRenderer::UploadCompletedSignalType mUploadCompletedSignal;
+  std::unique_ptr< EventThreadCallback > mEventThreadCallback;
 };
 
+uint32_t VectorAnimationRenderer::mCount = 0;
+bool VectorAnimationRenderer::mNeedTrigger = true;
+
 inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer )
 {
   DALI_ASSERT_ALWAYS( renderer && "VectorAnimationRenderer handle is empty." );
@@ -165,6 +218,10 @@ VectorAnimationRenderer& VectorAnimationRenderer::operator=( const VectorAnimati
   return *this;
 }
 
+void VectorAnimationRenderer::Finalize()
+{
+}
+
 void VectorAnimationRenderer::SetRenderer( Renderer renderer )
 {
   Internal::Adaptor::GetImplementation( *this ).SetRenderer( renderer );
@@ -195,10 +252,32 @@ void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height
   Internal::Adaptor::GetImplementation( *this ).GetDefaultSize( width, height );
 }
 
+void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const
+{
+}
+
+bool VectorAnimationRenderer::GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+{
+  return Internal::Adaptor::GetImplementation( *this ).GetMarkerInfo( marker, startFrame, endFrame );
+}
+
 VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal()
 {
   return Internal::Adaptor::GetImplementation( *this ).UploadCompletedSignal();
 }
 
-} // namespace Dali;
+} // namespace Dali
+
+namespace Test
+{
+namespace VectorAnimationRenderer
+{
+
+void RequestTrigger()
+{
+  Dali::Internal::Adaptor::VectorAnimationRenderer::mNeedTrigger = true;
+}
+
+} // VectorAnimationRenderer
+} // Test