X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-TextureManager.cpp;h=af5f1a6186d539bed20ec57ba0e75b5b9a56f025;hb=86f3463f1c7e1f222b4e805f91c234d326134025;hp=c2161d13eb215cf266ec6c05a362ea08b351a05d;hpb=b4a0045d33c1b697383b414ab3391e505f348534;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp old mode 100644 new mode 100755 index c2161d1..af5f1a6 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp @@ -34,7 +34,8 @@ public: { } - void UploadComplete( bool loadSuccess, int32_t textureId, TextureSet textureSet, bool useAtlasing, const Vector4& atlasRect ) + virtual void UploadComplete( bool loadSuccess, int32_t textureId, TextureSet textureSet, + bool useAtlasing, const Vector4& atlasRect, bool preMultiplied ) override { mLoaded = loadSuccess; mObserverCalled = true; @@ -53,7 +54,7 @@ int UtcTextureManagerRequestLoad(void) TestObserver observer; std::string filename("image.png"); - + auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; TextureManager::TextureId textureId = textureManager.RequestLoad( filename, ImageDimensions(), @@ -61,9 +62,11 @@ int UtcTextureManagerRequestLoad(void) SamplingMode::BOX_THEN_LINEAR, TextureManager::NO_ATLAS, &observer, - true ); + true, + TextureManager::ReloadPolicy::CACHED, + preMultiply); - const VisualUrl& url = textureManager.GetVisualUrl( textureId ); + VisualUrl url = textureManager.GetVisualUrl( textureId ); DALI_TEST_EQUALS( url.GetUrl().compare( filename ), 0, TEST_LOCATION );