X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-platform-abstraction.h;h=cd6bf85140ed2e5c97de55ab1c9e6243ac030f00;hb=8269fc656ce5c08314e340932c2af762e7234628;hp=c083fef831953f50ed6a1185473baca05758c665;hpb=511ab5d892c68a8bbbc3846e85fc5ec8f7323470;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 c083fef..cd6bf85 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 @@ -51,14 +51,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 +62,7 @@ public: } bool loadResult; - std::vector< unsigned char> buffer; + Dali::Vector< unsigned char> buffer; }; /** @@ -103,7 +95,7 @@ public: */ virtual ImageDimensions GetClosestImageSize( const std::string& filename, ImageDimensions size, - FittingMode::Type scalingMode, + FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ); @@ -112,7 +104,7 @@ public: */ virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer, ImageDimensions size, - FittingMode::Type scalingMode, + FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ); @@ -127,11 +119,6 @@ public: virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath ); /** - * @copydoc PlatformAbstraction::SaveResource() - */ - virtual void SaveResource(const Integration::ResourceRequest& request); - - /** * @copydoc PlatformAbstraction::CancelLoad() */ virtual void CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId); @@ -160,25 +147,27 @@ public: * @copydoc PlatformAbstraction::SetDpi() */ virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical); + /** * @copydoc PlatformAbstraction::LoadFile() */ - virtual bool LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const; + virtual bool LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; /** - * @copydoc PlatformAbstraction::LoadShaderBinFile() + * @copydoc PlatformAbstraction::LoadShaderBinaryFile() */ - virtual bool LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const; + 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; } /** * @copydoc PlatformAbstraction::SaveFile() */ - virtual bool SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const; + virtual bool SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes) const; virtual void JoinLoaderThreads(); - virtual Integration::DynamicsFactory* GetDynamicsFactory(); - public: // TEST FUNCTIONS // Enumeration of Platform Abstraction methods @@ -188,16 +177,15 @@ public: // TEST FUNCTIONS SuspendFunc, ResumeFunc, LoadResourceFunc, - SaveResourceFunc, SaveFileFunc, LoadFileFunc, - LoadShaderBinFileFunc, + LoadShaderBinaryFileFunc, + SaveShaderBinaryFileFunc, CancelLoadFunc, GetResourcesFunc, IsLoadingFunc, SetDpiFunc, - JoinLoaderThreadsFunc, - GetDynamicsFactoryFunc, + JoinLoaderThreadsFunc } TestFuncEnum; /** Call this every test */ @@ -230,19 +218,13 @@ 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 );