X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-TextureManager.cpp;h=af5f1a6186d539bed20ec57ba0e75b5b9a56f025;hb=59314022f6789147a47a8b098433e211b6185625;hp=c38a70cecb51fb967d7c41a33771aca54b010c70;hpb=67ea1e508cc155651fcb79825ed02f3cad7a6c0e;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 index c38a70c..af5f1a6 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include using namespace Dali::Toolkit::Internal; @@ -34,7 +34,8 @@ public: { } - void UploadComplete( bool loadSuccess, 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,16 +54,19 @@ int UtcTextureManagerRequestLoad(void) TestObserver observer; std::string filename("image.png"); - + auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; TextureManager::TextureId textureId = textureManager.RequestLoad( filename, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, TextureManager::NO_ATLAS, - &observer ); + &observer, + 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 );