X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-platform-abstraction.h;h=a728ac25caaf542db5bb3a13aade12e8e0766e97;hp=2d4c38c9d467769b4a146815d062f66e0986b280;hb=8e237937b6f2445f672d5d930c1111da25f82617;hpb=9a93f27dd71b25d8a3fab4eab73e2d6daa90b179 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 2d4c38c..a728ac2 100644 --- 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 #include +#include // INTERNAL INCLUDES -#include #include -#include #include "test-trace-call-stack.h" - namespace Dali { @@ -51,14 +49,6 @@ public: bool loadFailed; Integration::ResourceId loadFailedId; Integration::ResourceFailure loadFailure; - - bool saved; - Integration::ResourceId savedId; - Integration::ResourceTypeId savedType; - - bool saveFailed; - Integration::ResourceId saveFailedId; - Integration::ResourceFailure saveFailure; }; struct LoadFileResult @@ -70,7 +60,7 @@ public: } bool loadResult; - std::vector< unsigned char> buffer; + Dali::Vector< unsigned char> buffer; }; /** @@ -84,11 +74,6 @@ public: virtual ~TestPlatformAbstraction(); /** - * @copydoc PlatformAbstraction::GetTimeMicroseconds() - */ - virtual void GetTimeMicroseconds(unsigned int &seconds, unsigned int µSeconds); - - /** * @copydoc PlatformAbstraction::Suspend() */ virtual void Suspend(); @@ -98,13 +83,23 @@ public: */ virtual void Resume(); - virtual void GetClosestImageSize( const std::string& filename, - const ImageAttributes& attributes, - Vector2& closestSize); + /** + * @copydoc PlatformAbstraction::GetClosestImageSize() + */ + virtual ImageDimensions GetClosestImageSize( const std::string& filename, + ImageDimensions size, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection ); - virtual void GetClosestImageSize( Integration::ResourcePointer resourceBuffer, - const ImageAttributes& attributes, - Vector2& closestSize); + /** + * @copydoc PlatformAbstraction::GetClosestImageSize() + */ + virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer, + ImageDimensions size, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection ); /** * @copydoc PlatformAbstraction::LoadResource() @@ -117,9 +112,9 @@ public: virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath ); /** - * @copydoc PlatformAbstraction::SaveResource() + * @copydoc PlatformAbstraction::DecodeBuffer() */ - virtual void SaveResource(const Integration::ResourceRequest& request); + virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::ResourceType& resourceType, uint8_t * buffer, size_t size ); /** * @copydoc PlatformAbstraction::CancelLoad() @@ -137,45 +132,9 @@ public: virtual bool IsLoading(); /** - * @copydoc PlatformAbstraction::GetDefaultFontFamily() - */ - virtual const std::string& GetDefaultFontFamily() const; - - /** * @copydoc PlatformAbstraction::GetDefaultFontSize() */ - virtual float GetDefaultFontSize() const; - - /** - * @copydoc PlatformAbstraction::GetFontLineHeightFromCapsHeight() - */ - virtual Dali::PixelSize GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const; - - /** - * @copydoc PlatformAbstraction::GetGlyphData() - */ - virtual Integration::GlyphSet* GetGlyphData ( const Integration::TextResourceType& textRequest, - const std::string& fontFamily, - bool getBitmap) const; - - /** - * @copydoc PlatformAbstraction::GetCachedGlyphData() - */ - virtual Integration::GlyphSet* GetCachedGlyphData( const Integration::TextResourceType& textRequest, - const std::string& fontFamily ) const; - - - /** - * @copydoc PlatformAbstraction::GetGlobalMetrics() - */ - virtual void GetGlobalMetrics( const std::string& fontFamily, - const std::string& fontStyle, - Integration::GlobalMetrics& globalMetrics ) const; - - /** - * @copydoc PlatformAbstraction::GetFontPath() - */ - virtual std::string GetFontPath(const std::string& family, bool bold, bool italic) const; + virtual int GetDefaultFontSize() const; /** * @copydoc PlatformAbstraction::SetDpi() @@ -183,95 +142,44 @@ public: virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical); /** - * @copydoc PlatformAbstraction::GetFontFamilyForChars() - */ - virtual const std::string& GetFontFamilyForChars(const Integration::TextArray& charsRequested) const; - - /** - * @copydoc PlatformAbstraction::AllGlyphsSupported() - */ - virtual bool AllGlyphsSupported(const std::string& name, const std::string& fontStyle, const Integration::TextArray& text) const; - - /** - * @copydoc PlatformAbstraction::ValidateFontFamilyName() - */ - virtual bool ValidateFontFamilyName(const std::string& fontFamily, const std::string& fontStyle, bool& isDefaultSystemFont, std::string& closestMatch, std::string& closestStyleMatch) const; - - /** - * @copydoc PlatformAbstraction::GetFontList() + * @copydoc PlatformAbstraction::LoadFile() */ - virtual void GetFontList( PlatformAbstraction::FontListMode mode, std::vector& fontList ) const; + virtual bool LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; /** - * @copydoc PlatformAbstraction::LoadFile() + * @copydoc PlatformAbstraction::LoadShaderBinaryFile() */ - virtual bool LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const; + virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; /** * @copydoc PlatformAbstraction::SaveFile() */ - virtual bool SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const; - - virtual void JoinLoaderThreads(); - - virtual void UpdateDefaultsFromDevice(); - - virtual Integration::DynamicsFactory* GetDynamicsFactory(); - - virtual bool ReadGlobalMetricsFromCache( const std::string& fontFamily, - const std::string& fontStyle, - Integration::GlobalMetrics& globalMetrics ); + virtual bool SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const; - virtual void WriteGlobalMetricsToCache( const std::string& fontFamily, - const std::string& fontStyle, - const Integration::GlobalMetrics& globalMetrics ); + /** + * @copydoc PlatformAbstraction::SaveShaderBinaryFile() + */ + virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; } - virtual bool ReadMetricsFromCache( const std::string& fontFamily, - const std::string& fontStyle, - std::vector& glyphMetricsContainer ); - virtual void WriteMetricsToCache( const std::string& fontFamily, - const std::string& fontStyle, - const Integration::GlyphSet& glyphSet ); - - - virtual void GetFileNamesFromDirectory( const std::string& directoryName, - std::vector& fileNames ); - - virtual Integration::BitmapPtr GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, float fontSize, uint32_t character ) const; + virtual void JoinLoaderThreads(); public: // TEST FUNCTIONS // Enumeration of Platform Abstraction methods typedef enum { - GetTimeMicrosecondsFunc, SuspendFunc, ResumeFunc, LoadResourceFunc, - SaveResourceFunc, SaveFileFunc, LoadFileFunc, + LoadShaderBinaryFileFunc, + SaveShaderBinaryFileFunc, CancelLoadFunc, GetResourcesFunc, IsLoadingFunc, - GetDefaultFontFamilyFunc, - GetDefaultFontSizeFunc, - GetFontLineHeightFromCapsHeightFunc, - GetGlyphDataFunc, - GetCachedGlyphDataFunc, SetDpiFunc, - GetFontPathFunc, JoinLoaderThreadsFunc, - GetFontFamilyForCharsFunc, - AllGlyphsSupportedFunc, - ValidateFontFamilyNameFunc, - UpdateDefaultsFromDeviceFunc, - GetDynamicsFactoryFunc, - ValidateGetFontListFunc, - ReadGlobalMetricsFromCacheFileFunc, - WriteGlobalMetricsToCacheFileFunc, - ReadMetricsFromCacheFileFunc, - WriteMetricsToCacheFileFunc, } TestFuncEnum; /** Call this every test */ @@ -283,18 +191,10 @@ public: // TEST FUNCTIONS bool WasCalled(TestFuncEnum func); - void SetGetTimeMicrosecondsResult(size_t sec, size_t usec); - - void IncrementGetTimeResult(size_t milliseconds); - void SetIsLoadingResult(bool result); - void SetGetDefaultFontFamilyResult(std::string result); - void SetGetDefaultFontSizeResult(float result); - void SetGetFontPathResult(std::string& result); - void ClearReadyResources(); void SetResourceLoaded(Integration::ResourceId loadedId, @@ -304,49 +204,27 @@ public: // TEST FUNCTIONS void SetResourceLoadFailed(Integration::ResourceId id, Integration::ResourceFailure failure); - void SetResourceSaved(Integration::ResourceId savedId, - Integration::ResourceTypeId savedType); - - void SetResourceSaveFailed(Integration::ResourceId id, - Integration::ResourceFailure failure); - Integration::ResourceRequest* GetRequest(); void DiscardRequest(); void SetClosestImageSize(const Vector2& size); - void SetLoadFileResult( bool result, std::vector< unsigned char >& buffer ); + void SetLoadFileResult( bool result, Dali::Vector< unsigned char >& buffer ); void SetSaveFileResult( bool result ); - PlatformAbstraction::FontListMode GetLastFontListMode( ); - - void SetReadGlobalMetricsResult( bool success, Integration::GlobalMetrics& globalMetrics ); - - void SetReadMetricsResult( bool success, std::vector& glyphMetricsContainer ); - - private: mutable TraceCallStack mTrace; - size_t mSeconds; - size_t mMicroSeconds; bool mIsLoadingResult; - std::string mGetDefaultFontFamilyResult; - float mGetDefaultFontSizeResult; - std::string mGetFontPathResult; + int mGetDefaultFontSizeResult; Resources mResources; Integration::ResourceRequest* mRequest; Vector2 mSize; Vector2 mClosestSize; - bool mReadGlobalMetricsResult; - bool mReadMetricsResult; - Integration::GlobalMetrics mReadGlobalMetrics; - std::vector mReadMetrics; LoadFileResult mLoadFileResult; bool mSaveFileResult; - mutable FontListMode mFontListMode; }; } // Dali