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.cpp;h=a0a3589ea4647d27522a4e49a729889e7fc74c16;hp=7568a11b3b7c1b5e2d8eaea619b36aacd0297788;hb=b7f3e835df7cc4fe2ec9191cedb10d258238d3ab;hpb=10d2080e1d25b75347daa2f8c2dcee494fbcb175 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp index 7568a11..a0a3589 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp @@ -64,20 +64,26 @@ void TestPlatformAbstraction::Resume() mTrace.PushCall("Resume", ""); } -void TestPlatformAbstraction::GetClosestImageSize( const std::string& filename, - const ImageAttributes& attributes, - Vector2& closestSize) +ImageDimensions TestPlatformAbstraction::GetClosestImageSize( const std::string& filename, + ImageDimensions size, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection ) { - closestSize = mClosestSize; + ImageDimensions closestSize = ImageDimensions( mClosestSize.x, mClosestSize.y ); mTrace.PushCall("GetClosestImageSize", ""); + return closestSize; } -void TestPlatformAbstraction::GetClosestImageSize( Integration::ResourcePointer resourceBuffer, - const ImageAttributes& attributes, - Vector2& closestSize) +ImageDimensions TestPlatformAbstraction::GetClosestImageSize( Integration::ResourcePointer resourceBuffer, + ImageDimensions size, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection ) { - closestSize = mClosestSize; + ImageDimensions closestSize = ImageDimensions( mClosestSize.x, mClosestSize.y ); mTrace.PushCall("GetClosestImageSize", ""); + return closestSize; } /** @@ -86,7 +92,7 @@ void TestPlatformAbstraction::GetClosestImageSize( Integration::ResourcePointer void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request) { std::ostringstream out; - out << "Type:" << request.GetType()->id << ", Path: " << request.GetPath() << std::endl; + out << "Type:" << request.GetType()->id << ", Path: " << request.GetPath() << std::endl ; mTrace.PushCall("LoadResource", out.str()); if(mRequest != NULL) @@ -103,18 +109,10 @@ Integration::ResourcePointer TestPlatformAbstraction::LoadResourceSynchronously( return mResources.loadedResource; } -/** - * @copydoc PlatformAbstraction::SaveResource() - */ -void TestPlatformAbstraction::SaveResource(const Integration::ResourceRequest& request) +Integration::BitmapPtr TestPlatformAbstraction::DecodeBuffer( const Integration::ResourceType& resourceType, uint8_t * buffer, size_t size ) { - mTrace.PushCall("SaveResource", ""); - if(mRequest != NULL) - { - delete mRequest; - tet_infoline ("Warning: multiple resource requests not handled by Test Suite. You may see unexpected errors"); - } - mRequest = new Integration::ResourceRequest(request); + mTrace.PushCall("DecodeBuffer", ""); + return Integration::BitmapPtr(); } /** @@ -140,14 +138,6 @@ void TestPlatformAbstraction::GetResources(Integration::ResourceCache& cache) { cache.LoadFailed( mResources.loadFailedId, mResources.loadFailure ); } - if(mResources.saved) - { - cache.SaveComplete( mResources.savedId, mResources.savedType ); - } - if(mResources.saveFailed) - { - cache.SaveFailed( mResources.saveFailedId, mResources.saveFailure ); - } } /** @@ -160,6 +150,23 @@ bool TestPlatformAbstraction::IsLoading() } /** + * @copydoc PlatformAbstraction::GetDefaultFontDescription() + */ +void TestPlatformAbstraction::GetDefaultFontDescription( std::string& family, std::string& style ) const +{ + // TODO +} + +/** + * @copydoc PlatformAbstraction::GetDefaultFontSize() + */ +int TestPlatformAbstraction::GetDefaultFontSize() const +{ + // TODO + return int(); +} + +/** * @copydoc PlatformAbstraction::SetDpi() */ void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical) @@ -170,7 +177,7 @@ void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int d /** * @copydoc PlatformAbstraction::LoadFile() */ -bool TestPlatformAbstraction::LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const +bool TestPlatformAbstraction::LoadFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const { mTrace.PushCall("LoadFile", ""); if( mLoadFileResult.loadResult ) @@ -182,11 +189,11 @@ bool TestPlatformAbstraction::LoadFile( const std::string& filename, std::vector } /** - * @copydoc PlatformAbstraction::LoadShaderBinFile() + * @copydoc PlatformAbstraction::LoadShaderBinaryFile() */ -bool TestPlatformAbstraction::LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const +bool TestPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const { - mTrace.PushCall("LoadShaderBinFile", ""); + mTrace.PushCall("LoadShaderBinaryFile", ""); if( mLoadFileResult.loadResult ) { buffer = mLoadFileResult.buffer; @@ -198,7 +205,7 @@ bool TestPlatformAbstraction::LoadShaderBinFile( const std::string& filename, st /** * @copydoc PlatformAbstraction::SaveFile() */ -bool TestPlatformAbstraction::SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const +bool TestPlatformAbstraction::SaveFile(const std::string& filename, const unsigned char * buffer, unsigned int numBytes) const { mTrace.PushCall("SaveFile", ""); return false; @@ -209,12 +216,6 @@ void TestPlatformAbstraction::JoinLoaderThreads() mTrace.PushCall("JoinLoaderThreads", ""); } -Integration::DynamicsFactory* TestPlatformAbstraction::GetDynamicsFactory() -{ - mTrace.PushCall("GetDynamicsFactory", ""); - return NULL; -} - /** Call this every test */ void TestPlatformAbstraction::Initialize() { @@ -241,16 +242,15 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func) case SuspendFunc: return mTrace.FindMethod("Suspend"); case ResumeFunc: return mTrace.FindMethod("Resume"); case LoadResourceFunc: return mTrace.FindMethod("LoadResource"); - case SaveResourceFunc: return mTrace.FindMethod("SaveResource"); case LoadFileFunc: return mTrace.FindMethod("LoadFile"); - case LoadShaderBinFileFunc: return mTrace.FindMethod("LoadShaderBinFile"); + case LoadShaderBinaryFileFunc: return mTrace.FindMethod("LoadShaderBinaryFile"); + case SaveShaderBinaryFileFunc: return mTrace.FindMethod("SaveShaderBinaryFile"); case SaveFileFunc: return mTrace.FindMethod("SaveFile"); case CancelLoadFunc: return mTrace.FindMethod("CancelLoad"); case GetResourcesFunc: return mTrace.FindMethod("GetResources"); case IsLoadingFunc: return mTrace.FindMethod("IsLoading"); case SetDpiFunc: return mTrace.FindMethod("SetDpi"); case JoinLoaderThreadsFunc: return mTrace.FindMethod("JoinLoaderThreads"); - case GetDynamicsFactoryFunc: return mTrace.FindMethod("GetDynamicsFactory"); } return false; } @@ -298,22 +298,6 @@ void TestPlatformAbstraction::SetResourceLoadFailed(Integration::ResourceId id, mResources.loadFailure = failure; } -void TestPlatformAbstraction::SetResourceSaved(Integration::ResourceId savedId, - Integration::ResourceTypeId savedType) -{ - mResources.saved = true; - mResources.savedId = savedId; - mResources.savedType = savedType; -} - -void TestPlatformAbstraction::SetResourceSaveFailed(Integration::ResourceId id, - Integration::ResourceFailure failure) -{ - mResources.saveFailed = true; - mResources.saveFailedId = id; - mResources.saveFailure = failure; -} - Integration::ResourceRequest* TestPlatformAbstraction::GetRequest() { return mRequest; @@ -330,7 +314,7 @@ void TestPlatformAbstraction::SetClosestImageSize(const Vector2& size) mClosestSize = size; } -void TestPlatformAbstraction::SetLoadFileResult( bool result, std::vector< unsigned char >& buffer ) +void TestPlatformAbstraction::SetLoadFileResult( bool result, Dali::Vector< unsigned char >& buffer ) { mLoadFileResult.loadResult = result; if( result )