(AutomatedTests) Merged managed & unmanaged tests

[platform/core/uifw/dali-core.git] / automated-tests / src / dali / dali-test-suite-utils / test-platform-abstraction.h

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
index 2d4c38c..3a94578 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
@@ -28,7 +28,7 @@
 
 #include <dali/integration-api/glyph-set.h>
 #include "test-trace-call-stack.h"
-
+#include "test-dynamics.h"
 
 namespace Dali
 {
@@ -111,9 +111,6 @@ public:
    */
   virtual void LoadResource(const Integration::ResourceRequest& request);
 
-  /**
-   * @copydoc PlatformAbstraction::LoadResourceSynchronously()
-   */
   virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath );
 
   /**
@@ -149,7 +146,7 @@ public:
   /**
    * @copydoc PlatformAbstraction::GetFontLineHeightFromCapsHeight()
    */
-  virtual Dali::PixelSize GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const;
+  virtual PixelSize GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const;
 
   /**
    * @copydoc PlatformAbstraction::GetGlyphData()
@@ -233,7 +230,6 @@ public:
                                     const std::string& fontStyle,
                                     const Integration::GlyphSet& glyphSet );
 
-
   virtual void GetFileNamesFromDirectory( const std::string& directoryName,
                                           std::vector<std::string>& fileNames );
 
@@ -326,7 +322,6 @@ public: // TEST FUNCTIONS
 
   void SetReadMetricsResult( bool success, std::vector<Integration::GlyphMetrics>& glyphMetricsContainer );
 
-
 private:
   mutable TraceCallStack        mTrace;
   size_t                        mSeconds;
@@ -347,6 +342,7 @@ private:
   LoadFileResult                mLoadFileResult;
   bool                          mSaveFileResult;
   mutable FontListMode          mFontListMode;
+  TestDynamicsFactory*          mDynamicsFactory;
 };
 
 } // Dali