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=d9d3247f85d3032764a7ae43e0ab44bbcd5458c0;hp=c3beebeb79861210f7d35d51fea96f22cfb02c0b;hb=6734ced9c8c84f8f0e637043087fedaa5f79dd9d;hpb=a6f34ab2df1f2418c037366030a4dcfbcda29847 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 c3beebe..d9d3247 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,14 @@ // EXTERNAL INCLUDES #include #include -#include +#include +#include // INTERNAL INCLUDES -#include #include #include "test-trace-call-stack.h" - namespace Dali { @@ -41,37 +40,7 @@ class DALI_IMPORT_API TestPlatformAbstraction : public Dali::Integration::Platfo public: - struct Resources - { - bool loaded; - Integration::ResourceId loadedId; - Integration::ResourceTypeId loadedType; - Integration::ResourcePointer loadedResource; - - 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 - { - inline LoadFileResult() - : loadResult(false) - { - - } - - bool loadResult; - std::vector< unsigned char> buffer; - }; + typedef Vector< Integration::ResourceRequest* > ResourceRequestContainer; /** * Constructor @@ -84,11 +53,6 @@ public: virtual ~TestPlatformAbstraction(); /** - * @copydoc PlatformAbstraction::GetTimeMicroseconds() - */ - virtual void GetTimeMicroseconds(unsigned int &seconds, unsigned int µSeconds); - - /** * @copydoc PlatformAbstraction::Suspend() */ virtual void Suspend(); @@ -103,7 +67,7 @@ public: */ virtual ImageDimensions GetClosestImageSize( const std::string& filename, ImageDimensions size, - FittingMode::Type scalingMode, + FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ); @@ -112,7 +76,7 @@ public: */ virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer, ImageDimensions size, - FittingMode::Type scalingMode, + FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection ); @@ -127,9 +91,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() @@ -147,11 +111,6 @@ public: virtual bool IsLoading(); /** - * @copydoc PlatformAbstraction::GetDefaultFontDescription() - */ - virtual void GetDefaultFontDescription( std::string& family, std::string& style ) const; - - /** * @copydoc PlatformAbstraction::GetDefaultFontSize() */ virtual int GetDefaultFontSize() const; @@ -160,44 +119,47 @@ 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; /** * @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(); + /** + * @copydoc PlatformAbstraction::SaveShaderBinaryFile() + */ + virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; } - virtual Integration::DynamicsFactory* GetDynamicsFactory(); + virtual void JoinLoaderThreads(); public: // TEST FUNCTIONS // Enumeration of Platform Abstraction methods typedef enum { - GetTimeMicrosecondsFunc, SuspendFunc, ResumeFunc, LoadResourceFunc, - SaveResourceFunc, + LoadResourceSynchronouslyFunc, SaveFileFunc, LoadFileFunc, - LoadShaderBinFileFunc, + LoadShaderBinaryFileFunc, + SaveShaderBinaryFileFunc, CancelLoadFunc, GetResourcesFunc, IsLoadingFunc, SetDpiFunc, JoinLoaderThreadsFunc, - GetDynamicsFactoryFunc, } TestFuncEnum; /** Call this every test */ @@ -207,57 +169,144 @@ public: // TEST FUNCTIONS inline void ResetTrace() { mTrace.Reset(); } inline TraceCallStack& GetTrace() { return mTrace; } + /** + * @brief Checks if a platform function was called + * @param[in] func The function to check + * @return true if the function was called + */ bool WasCalled(TestFuncEnum func); - void SetGetTimeMicrosecondsResult(size_t sec, size_t usec); - - void IncrementGetTimeResult(size_t milliseconds); - + /** + * @brief Sets the result to return when IsLoading is called by Core. + * @param[in] result The result to set. + */ void SetIsLoadingResult(bool result); - void SetGetDefaultFontFamilyResult(std::string result); - + /** + * @brief Sets the value returned by GetDefaultFontSize + * @param[in] result The value to return + */ void SetGetDefaultFontSizeResult(float result); - void SetGetFontPathResult(std::string& result); - + /** + * @brief Clears all resource queues + */ void ClearReadyResources(); + /** + * @brief Sets a particular resource request as loaded. + * @param[in] loadedId The ResourceID of the resource that has been loaded. + * @param[in] loadedType The type of resource that has been loaded. + * @param[in] loadedResource A pointer to the resource that has been loaded. + */ void SetResourceLoaded(Integration::ResourceId loadedId, Integration::ResourceTypeId loadedType, Integration::ResourcePointer loadedResource); + /** + * @brief Sets a particular resource request as load failure. + * @param[in] id The ID of the failed resource request. + * @param[in] failure The type of failure. + */ void SetResourceLoadFailed(Integration::ResourceId id, Integration::ResourceFailure failure); - void SetResourceSaved(Integration::ResourceId savedId, - Integration::ResourceTypeId savedType); + /** + * @brief Retrieves the latest resource request + * @return A pointer to the latest resource request. + */ + Integration::ResourceRequest* GetRequest(); + + /** + * @brief Retrieves a reference to a container of all the resource requests. + * @return A reference to a container of all the resource requests. + */ + const ResourceRequestContainer& GetAllRequests() const; - void SetResourceSaveFailed(Integration::ResourceId id, - Integration::ResourceFailure failure); + /** + * @brief Sets all resource requests as loaded. + */ + void SetAllResourceRequestsAsLoaded(); - Integration::ResourceRequest* GetRequest(); + /** + * @brief Sets all resource requests as loaded. + * @param[in] failure The failure type + */ + void SetAllResourceRequestsAsFailed( Integration::ResourceFailure failure ); + /** + * @brief Discards all current resource requests. + */ void DiscardRequest(); + /** + * @brief Sets the value returned by GetClosestImageSize. + * @param[in] size The size that should be returned. + */ void SetClosestImageSize(const Vector2& size); - void SetLoadFileResult( bool result, std::vector< unsigned char >& buffer ); + /** + * @brief Sets the result return by LoadFile. + * @param[in] result The value that LoadFile should return. + * @param[in] buffer The buffer of the loaded file. + */ + void SetLoadFileResult( bool result, Dali::Vector< unsigned char >& buffer ); + /** + * @brief Sets the SaveFile result + * @param[in] result The value that SaveFile should return + */ void SetSaveFileResult( bool result ); + /** + * @brief Sets the resource loaded by LoadResourceSynchronously + * @param[in] resource The loaded resource + */ + void SetSynchronouslyLoadedResource( Integration::ResourcePointer resource ); + private: + + struct LoadedResource + { + Integration::ResourceId id; + Integration::ResourceTypeId type; + Integration::ResourcePointer resource; + }; + + struct FailedLoad + { + Integration::ResourceId id; + Integration::ResourceFailure failure; + }; + + struct LoadFileResult + { + inline LoadFileResult() + : loadResult(false) + { + + } + + bool loadResult; + Dali::Vector< unsigned char> buffer; + }; + + typedef std::vector< LoadedResource > LoadedResourceContainer; + typedef std::vector< FailedLoad > FailedLoadContainer; + mutable TraceCallStack mTrace; - size_t mSeconds; - size_t mMicroSeconds; bool mIsLoadingResult; - Resources mResources; - Integration::ResourceRequest* mRequest; + int mGetDefaultFontSizeResult; + LoadedResourceContainer mLoadedResourcesQueue; + FailedLoadContainer mFailedLoadQueue; + ResourceRequestContainer mResourceRequests; Vector2 mSize; Vector2 mClosestSize; LoadFileResult mLoadFileResult; bool mSaveFileResult; + + Integration::ResourcePointer mSynchronouslyLoadedResource; }; } // Dali