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=230ed0227bbbb7a74d7416a6bd6e8206e6ac591d;hp=d9d3247f85d3032764a7ae43e0ab44bbcd5458c0;hb=2294909357b4357b6e1d93c49b012e982b6ef850;hpb=a9099abc3959c56e55c5890b6edc8e076f186df0 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 d9d3247..230ed02 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 @@ -2,7 +2,7 @@ #define __DALI_TEST_PLATFORM_ABSTRACTION_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +40,6 @@ class DALI_IMPORT_API TestPlatformAbstraction : public Dali::Integration::Platfo public: - typedef Vector< Integration::ResourceRequest* > ResourceRequestContainer; - /** * Constructor */ @@ -53,16 +51,6 @@ public: virtual ~TestPlatformAbstraction(); /** - * @copydoc PlatformAbstraction::Suspend() - */ - virtual void Suspend(); - - /** - * @copydoc PlatformAbstraction::Resume() - */ - virtual void Resume(); - - /** * @copydoc PlatformAbstraction::GetClosestImageSize() */ virtual ImageDimensions GetClosestImageSize( const std::string& filename, @@ -81,11 +69,6 @@ public: bool orientationCorrection ); /** - * @copydoc PlatformAbstraction::LoadResource() - */ - virtual void LoadResource(const Integration::ResourceRequest& request); - - /** * @copydoc PlatformAbstraction::LoadResourceSynchronously() */ virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath ); @@ -96,70 +79,24 @@ public: virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::ResourceType& resourceType, uint8_t * buffer, size_t size ); /** - * @copydoc PlatformAbstraction::CancelLoad() - */ - virtual void CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId); - - /** - * @copydoc PlatformAbstraction::GetResources() - */ - virtual void GetResources(Integration::ResourceCache& cache); - - /** - * @copydoc PlatformAbstraction::IsLoading() - */ - virtual bool IsLoading(); - - /** - * @copydoc PlatformAbstraction::GetDefaultFontSize() - */ - virtual int GetDefaultFontSize() const; - - /** - * @copydoc PlatformAbstraction::SetDpi() - */ - virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical); - - /** - * @copydoc PlatformAbstraction::LoadFile() - */ - virtual bool LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; - - /** * @copydoc PlatformAbstraction::LoadShaderBinaryFile() */ virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; /** - * @copydoc PlatformAbstraction::SaveFile() + * @copydoc PlatformAbstraction::SaveShaderBinaryFile() */ - virtual bool SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const; - - /** - * @copydoc PlatformAbstraction::SaveShaderBinaryFile() - */ virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; } - virtual void JoinLoaderThreads(); public: // TEST FUNCTIONS // Enumeration of Platform Abstraction methods typedef enum { - SuspendFunc, - ResumeFunc, - LoadResourceFunc, LoadResourceSynchronouslyFunc, - SaveFileFunc, - LoadFileFunc, LoadShaderBinaryFileFunc, - SaveShaderBinaryFileFunc, - CancelLoadFunc, - GetResourcesFunc, - IsLoadingFunc, - SetDpiFunc, - JoinLoaderThreadsFunc, + SaveShaderBinaryFileFunc } TestFuncEnum; /** Call this every test */ @@ -183,63 +120,11 @@ public: // TEST FUNCTIONS void SetIsLoadingResult(bool result); /** - * @brief Sets the value returned by GetDefaultFontSize - * @param[in] result The value to return - */ - void SetGetDefaultFontSizeResult(float 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); - - /** - * @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; - - /** - * @brief Sets all resource requests as loaded. - */ - void SetAllResourceRequestsAsLoaded(); - - /** - * @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. */ @@ -264,20 +149,18 @@ public: // TEST FUNCTIONS */ void SetSynchronouslyLoadedResource( Integration::ResourcePointer resource ); + /** + * @brief Sets the bitmap returned by DecodeBuffer() + * @param[in] bitmap The decoded bitmap + */ + void SetDecodedBitmap( Integration::BitmapPtr bitmap ); + private: - struct LoadedResource - { - Integration::ResourceId id; - Integration::ResourceTypeId type; - Integration::ResourcePointer resource; - }; + TestPlatformAbstraction( const TestPlatformAbstraction& ); ///< Undefined + TestPlatformAbstraction& operator=( const TestPlatformAbstraction& ); ///< Undefined - struct FailedLoad - { - Integration::ResourceId id; - Integration::ResourceFailure failure; - }; +private: struct LoadFileResult { @@ -291,15 +174,8 @@ private: Dali::Vector< unsigned char> buffer; }; - typedef std::vector< LoadedResource > LoadedResourceContainer; - typedef std::vector< FailedLoad > FailedLoadContainer; - mutable TraceCallStack mTrace; bool mIsLoadingResult; - int mGetDefaultFontSizeResult; - LoadedResourceContainer mLoadedResourcesQueue; - FailedLoadContainer mFailedLoadQueue; - ResourceRequestContainer mResourceRequests; Vector2 mSize; Vector2 mClosestSize; @@ -307,6 +183,7 @@ private: bool mSaveFileResult; Integration::ResourcePointer mSynchronouslyLoadedResource; + Integration::BitmapPtr mDecodedBitmap; }; } // Dali