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=dfa4d6c035ad77c9a01721906ed9682510b8b391;hp=42e2d9890614dcee0f4d3cad3489dac52f5f676c;hb=46378e74ac2f46a4ca7c6a038de9c42639d60faa;hpb=c57e053b5795783ad92b0fd7f8fbaba6b6d9322a 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 42e2d98..dfa4d6c 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) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -26,6 +26,7 @@ // INTERNAL INCLUDES #include +#include #include "test-trace-call-stack.h" @@ -35,13 +36,11 @@ namespace Dali /** * Concrete implementation of the platform abstraction class. */ -class DALI_IMPORT_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction +class DALI_CORE_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction { public: - typedef Vector< Integration::ResourceRequest* > ResourceRequestContainer; - /** * Constructor */ @@ -53,16 +52,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,49 +70,14 @@ 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 ); + virtual Integration::ResourcePointer LoadImageSynchronously( const Integration::BitmapResourceType& resourceType, const std::string& resourcePath ); /** * @copydoc PlatformAbstraction::DecodeBuffer() */ - 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; + virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::BitmapResourceType& resourceType, uint8_t * buffer, size_t size ); /** * @copydoc PlatformAbstraction::LoadShaderBinaryFile() @@ -131,35 +85,19 @@ public: 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,67 +121,15 @@ 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. */ - void SetClosestImageSize(const Vector2& size); + void SetClosestImageSize( const Vector2& size ); /** * @brief Sets the result return by LoadFile. @@ -277,19 +163,6 @@ private: private: - struct LoadedResource - { - Integration::ResourceId id; - Integration::ResourceTypeId type; - Integration::ResourcePointer resource; - }; - - struct FailedLoad - { - Integration::ResourceId id; - Integration::ResourceFailure failure; - }; - struct LoadFileResult { inline LoadFileResult() @@ -302,17 +175,9 @@ 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; + ImageDimensions mClosestSize; LoadFileResult mLoadFileResult; bool mSaveFileResult; @@ -323,4 +188,4 @@ private: } // Dali -#endif /* __DALI_TET_PLATFORM_ABSTRACTION_H__ */ +#endif /* __DALI_TEST_PLATFORM_ABSTRACTION_H__ */