From: Andrew Cox Date: Mon, 13 Jul 2015 15:14:37 +0000 (+0100) Subject: Removed Resource Saving X-Git-Tag: dali_1.0.49~15 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f545f5694881e4ca9c10752535fddf2852cf3e5e Removed Resource Saving Change-Id: Ief30d87f9ebe3e038c2fbb8b6e0df1efe853bab4 Signed-off-by: Andrew Cox --- 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 6acbca7..38c14a9 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 @@ -110,20 +110,6 @@ Integration::ResourcePointer TestPlatformAbstraction::LoadResourceSynchronously( } /** - * @copydoc PlatformAbstraction::SaveResource() - */ -void TestPlatformAbstraction::SaveResource(const Integration::ResourceRequest& request) -{ - 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); -} - -/** * @copydoc PlatformAbstraction::CancelLoad() */ void TestPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId) @@ -146,14 +132,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 ); - } } /** @@ -258,7 +236,6 @@ 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 LoadShaderBinaryFileFunc: return mTrace.FindMethod("LoadShaderBinaryFile"); case SaveShaderBinaryFileFunc: return mTrace.FindMethod("SaveShaderBinaryFile"); @@ -315,22 +292,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; 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 c35b2c2..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 @@ -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); @@ -190,7 +177,6 @@ public: // TEST FUNCTIONS SuspendFunc, ResumeFunc, LoadResourceFunc, - SaveResourceFunc, SaveFileFunc, LoadFileFunc, LoadShaderBinaryFileFunc, @@ -232,12 +218,6 @@ 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();