X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ImageView.cpp;h=7a7bf26d23ca1e6cff369120c54c0d115ff2e892;hp=204cf235f7e2d60f5717289bd85e2be9c62892bd;hb=23446c257d6ae1977bb69e53353fb1ccd5409432;hpb=c01b6a044893962dbc4ec47aeca60bf3b5d09766 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 204cf23..7a7bf26 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -15,26 +15,32 @@ * */ +#include +#include + // Need to override adaptor classes for toolkit test harness, so include // test harness headers before dali headers. + #include #include +#include +#include "dummy-control.h" + +#include +#include #include -#include #include #include +#include #include -#include +#include #include +#include #include - -#include -#include -#include - - -#include "dummy-control.h" +#include +#include +#include using namespace Dali; using namespace Toolkit; @@ -51,13 +57,20 @@ void utc_dali_toolkit_image_view_cleanup(void) namespace { +const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg"; +const char* TEST_IMAGE_FILE_NAME2 = "gallery_image_02.jpg"; -const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg"; -const char* TEST_IMAGE_FILE_NAME2 = "gallery_image_02.jpg"; - +// resolution: 1024*1024 const char* TEST_IMAGE_1 = TEST_RESOURCE_DIR "/TB-gloss.png"; const char* TEST_IMAGE_2 = TEST_RESOURCE_DIR "/tb-norm.png"; +const char* TEST_BROKEN_IMAGE_DEFAULT = TEST_RESOURCE_DIR "/broken.png"; +const char* TEST_BROKEN_IMAGE_S = TEST_RESOURCE_DIR "/broken_s.9.png"; +const char* TEST_BROKEN_IMAGE_M = TEST_RESOURCE_DIR "/broken_m.9.png"; +const char* TEST_BROKEN_IMAGE_L = TEST_RESOURCE_DIR "/broken_l.9.png"; +const char* TEST_BROKEN_IMAGE_01 = TEST_RESOURCE_DIR "/button-up.9.png"; +const char* TEST_BROKEN_IMAGE_02 = TEST_RESOURCE_DIR "/heartsframe.9.png"; + // resolution: 34*34, pixel format: RGBA8888 static const char* gImage_34_RGBA = TEST_RESOURCE_DIR "/icon-edit.png"; // resolution: 600*600, pixel format: RGB888 @@ -66,15 +79,16 @@ static const char* gImage_600_RGB = TEST_RESOURCE_DIR "/test-image-600.jpg"; // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif"; -const char* TEST_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json"; +const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg"; +const char* TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json"; -void TestUrl( ImageView imageView, const std::string url ) +void TestUrl(ImageView imageView, const std::string url) { - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); + Property::Value value = imageView.GetProperty(imageView.GetPropertyIndex("image")); std::string urlActual; - DALI_TEST_CHECK( value.Get( urlActual ) ); - DALI_TEST_EQUALS( urlActual, url, TEST_LOCATION ); + DALI_TEST_CHECK(value.Get(urlActual)); + DALI_TEST_EQUALS(urlActual, url, TEST_LOCATION); } } // namespace @@ -85,7 +99,7 @@ int UtcDaliImageViewNewP(void) ImageView imageView = ImageView::New(); - DALI_TEST_CHECK( imageView ); + DALI_TEST_CHECK(imageView); END_TEST; } @@ -94,10 +108,10 @@ int UtcDaliImageViewNewUrlP(void) { ToolkitTestApplication application; - ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME ); - DALI_TEST_CHECK( imageView ); + ImageView imageView = ImageView::New(TEST_IMAGE_FILE_NAME); + DALI_TEST_CHECK(imageView); - TestUrl( imageView, TEST_IMAGE_FILE_NAME ); + TestUrl(imageView, TEST_IMAGE_FILE_NAME); END_TEST; } @@ -108,7 +122,7 @@ int UtcDaliImageViewConstructorP(void) ImageView imageView; - DALI_TEST_CHECK( !imageView ); + DALI_TEST_CHECK(!imageView); END_TEST; } @@ -120,8 +134,26 @@ int UtcDaliImageViewCopyConstructorP(void) // Initialize an object, ref count == 1 ImageView imageView = ImageView::New(); - ImageView copy( imageView ); - DALI_TEST_CHECK( copy ); + ImageView copy(imageView); + DALI_TEST_CHECK(copy); + + END_TEST; +} + +int UtcDaliImageViewMoveConstructor(void) +{ + ToolkitTestApplication application; + + ImageView imageView = ImageView::New(); + DALI_TEST_EQUALS(1, imageView.GetBaseObject().ReferenceCount(), TEST_LOCATION); + imageView.SetProperty(Actor::Property::SENSITIVE, false); + DALI_TEST_CHECK(false == imageView.GetProperty(Actor::Property::SENSITIVE)); + + ImageView moved = std::move(imageView); + DALI_TEST_CHECK(moved); + DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION); + DALI_TEST_CHECK(false == moved.GetProperty(Actor::Property::SENSITIVE)); + DALI_TEST_CHECK(!imageView); END_TEST; } @@ -132,9 +164,28 @@ int UtcDaliImageViewAssignmentOperatorP(void) ImageView imageView = ImageView::New(); - ImageView copy( imageView ); - DALI_TEST_CHECK( copy ); - DALI_TEST_EQUALS( imageView, copy, TEST_LOCATION ); + ImageView copy(imageView); + DALI_TEST_CHECK(copy); + DALI_TEST_EQUALS(imageView, copy, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewMoveAssignment(void) +{ + ToolkitTestApplication application; + + ImageView imageView = ImageView::New(); + DALI_TEST_EQUALS(1, imageView.GetBaseObject().ReferenceCount(), TEST_LOCATION); + imageView.SetProperty(Actor::Property::SENSITIVE, false); + DALI_TEST_CHECK(false == imageView.GetProperty(Actor::Property::SENSITIVE)); + + ImageView moved; + moved = std::move(imageView); + DALI_TEST_CHECK(moved); + DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION); + DALI_TEST_CHECK(false == moved.GetProperty(Actor::Property::SENSITIVE)); + DALI_TEST_CHECK(!imageView); END_TEST; } @@ -147,10 +198,10 @@ int UtcDaliImageViewDownCastP(void) BaseHandle object(imageView); - ImageView imageView2 = ImageView::DownCast( object ); + ImageView imageView2 = ImageView::DownCast(object); DALI_TEST_CHECK(imageView2); - ImageView imageView3 = DownCast< ImageView >( object ); + ImageView imageView3 = DownCast(object); DALI_TEST_CHECK(imageView3); END_TEST; @@ -162,11 +213,11 @@ int UtcDaliImageViewDownCastN(void) BaseHandle unInitializedObject; - ImageView imageView1 = ImageView::DownCast( unInitializedObject ); - DALI_TEST_CHECK( !imageView1 ); + ImageView imageView1 = ImageView::DownCast(unInitializedObject); + DALI_TEST_CHECK(!imageView1); - ImageView imageView2 = DownCast< ImageView >( unInitializedObject ); - DALI_TEST_CHECK( !imageView2 ); + ImageView imageView2 = DownCast(unInitializedObject); + DALI_TEST_CHECK(!imageView2); END_TEST; } @@ -176,16 +227,16 @@ int UtcDaliImageViewTypeRegistry(void) ToolkitTestApplication application; TypeRegistry typeRegistry = TypeRegistry::Get(); - DALI_TEST_CHECK( typeRegistry ); + DALI_TEST_CHECK(typeRegistry); - TypeInfo typeInfo = typeRegistry.GetTypeInfo( "ImageView" ); - DALI_TEST_CHECK( typeInfo ); + TypeInfo typeInfo = typeRegistry.GetTypeInfo("ImageView"); + DALI_TEST_CHECK(typeInfo); BaseHandle handle = typeInfo.CreateInstance(); - DALI_TEST_CHECK( handle ); + DALI_TEST_CHECK(handle); - ImageView imageView = ImageView::DownCast( handle ); - DALI_TEST_CHECK( imageView ); + ImageView imageView = ImageView::DownCast(handle); + DALI_TEST_CHECK(imageView); END_TEST; } @@ -196,11 +247,11 @@ int UtcDaliImageViewSetGetProperty01(void) ImageView imageView = ImageView::New(); - Property::Index idx = imageView.GetPropertyIndex( "image" ); - DALI_TEST_EQUALS( idx, (Property::Index)ImageView::Property::IMAGE, TEST_LOCATION ); + Property::Index idx = imageView.GetPropertyIndex("image"); + DALI_TEST_EQUALS(idx, (Property::Index)ImageView::Property::IMAGE, TEST_LOCATION); - imageView.SetProperty( idx, TEST_IMAGE_FILE_NAME ); - TestUrl( imageView, TEST_IMAGE_FILE_NAME ); + imageView.SetProperty(idx, TEST_IMAGE_FILE_NAME); + TestUrl(imageView, TEST_IMAGE_FILE_NAME); END_TEST; } @@ -210,110 +261,110 @@ int UtcDaliImageViewPreMultipliedAlphaPng(void) ToolkitTestApplication application; // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); - textureTrace.Enable( true ); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); Property::Map imageMap; - imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - imageMap[ ImageVisual::Property::RELEASE_POLICY] = ImageVisual::ReleasePolicy::NEVER; // To keep the texture cache + imageMap[ImageVisual::Property::URL] = gImage_34_RGBA; + imageMap[ImageVisual::Property::RELEASE_POLICY] = ImageVisual::ReleasePolicy::NEVER; // To keep the texture cache ImageView imageView1 = ImageView::New(); - imageView1.SetProperty( ImageView::Property::IMAGE, imageMap ); + imageView1.SetProperty(ImageView::Property::IMAGE, imageMap); - application.GetScene().Add( imageView1 ); + application.GetScene().Add(imageView1); - Property::Value value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA ); - bool enable; - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); // Default value is true + Property::Value value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA); + bool enable; + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(enable); // Default value is true // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); // Keep true + value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(enable); // Keep true // conventional alpha blending - Renderer renderer1 = imageView1.GetRendererAt( 0 ); - value = renderer1.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); - - int srcFactorRgb = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB ); - int destFactorRgb = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); - int srcFactorAlpha = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); - int destFactorAlpha = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA ); - DALI_TEST_CHECK( srcFactorRgb == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA ); - DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA ); - - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); // A new texture should be generated. + Renderer renderer1 = imageView1.GetRendererAt(0); + value = renderer1.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(enable); + + int srcFactorRgb = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_RGB); + int destFactorRgb = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_RGB); + int srcFactorAlpha = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_ALPHA); + int destFactorAlpha = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_ALPHA); + DALI_TEST_CHECK(srcFactorRgb == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA); + DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA); + + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // A new texture should be generated. textureTrace.Reset(); // Disable pre-multiplied alpha blending - imageView1.SetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA, false ); + imageView1.SetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA, false); // Reload the image Property::Map attributes; - DevelControl::DoAction( imageView1, ImageView::Property::IMAGE, DevelImageVisual::Action::RELOAD, attributes ); + DevelControl::DoAction(imageView1, ImageView::Property::IMAGE, DevelImageVisual::Action::RELOAD, attributes); // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( !enable ); + value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(!enable); // conventional alpha blending - value = renderer1.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( !enable ); - - srcFactorRgb = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB ); - destFactorRgb = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); - srcFactorAlpha = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); - destFactorAlpha = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA ); - DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA ); - DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA ); - DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA ); - - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); // A new texture should be generated. + value = renderer1.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(!enable); + + srcFactorRgb = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_RGB); + destFactorRgb = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_RGB); + srcFactorAlpha = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_ALPHA); + destFactorAlpha = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_ALPHA); + DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA); + DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA); + DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA); + + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // A new texture should be generated. textureTrace.Reset(); // Make a new ImageView using the same image ImageView imageView2 = ImageView::New(); - imageView2.SetProperty( ImageView::Property::IMAGE, imageMap ); + imageView2.SetProperty(ImageView::Property::IMAGE, imageMap); - application.GetScene().Add( imageView2 ); + application.GetScene().Add(imageView2); application.SendNotification(); application.Render(); - Renderer renderer2 = imageView2.GetRendererAt( 0 ); - value = renderer2.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); + Renderer renderer2 = imageView2.GetRendererAt(0); + value = renderer2.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(enable); - srcFactorRgb = renderer2.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB ); - destFactorRgb = renderer2.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); - srcFactorAlpha = renderer2.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); - destFactorAlpha = renderer2.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA ); - DALI_TEST_CHECK( srcFactorRgb == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA ); - DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA ); + srcFactorRgb = renderer2.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_RGB); + destFactorRgb = renderer2.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_RGB); + srcFactorAlpha = renderer2.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_ALPHA); + destFactorAlpha = renderer2.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_ALPHA); + DALI_TEST_CHECK(srcFactorRgb == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA); + DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA); - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); // The cached texture should be used. + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); // The cached texture should be used. END_TEST; } @@ -323,83 +374,83 @@ int UtcDaliImageViewPreMultipliedAlphaJpg(void) ToolkitTestApplication application; // Set up trace debug - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); - textureTrace.Enable( true ); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); Property::Map imageMap; - imageMap[ ImageVisual::Property::URL ] = gImage_600_RGB; - imageMap[ ImageVisual::Property::RELEASE_POLICY] = ImageVisual::ReleasePolicy::NEVER; // To keep the texture cache + imageMap[ImageVisual::Property::URL] = gImage_600_RGB; + imageMap[ImageVisual::Property::RELEASE_POLICY] = ImageVisual::ReleasePolicy::NEVER; // To keep the texture cache ImageView imageView1 = ImageView::New(); - imageView1.SetProperty( ImageView::Property::IMAGE, imageMap ); + imageView1.SetProperty(ImageView::Property::IMAGE, imageMap); - application.GetScene().Add( imageView1 ); + application.GetScene().Add(imageView1); - Property::Value value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA ); - bool enable; - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); // Default value is true + Property::Value value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA); + bool enable; + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(enable); // Default value is true // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); - value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( !enable ); // Should be false after loading + value = imageView1.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(!enable); // Should be false after loading // conventional alpha blending - Renderer renderer1 = imageView1.GetRendererAt( 0 ); - value = renderer1.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( !enable ); - - int srcFactorRgb = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB ); - int destFactorRgb = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); - int srcFactorAlpha = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); - int destFactorAlpha = renderer1.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA ); - DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA ); - DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA ); - DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA ); - - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION ); // A new texture should be generated. + Renderer renderer1 = imageView1.GetRendererAt(0); + value = renderer1.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(!enable); + + int srcFactorRgb = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_RGB); + int destFactorRgb = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_RGB); + int srcFactorAlpha = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_ALPHA); + int destFactorAlpha = renderer1.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_ALPHA); + DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA); + DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA); + DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA); + + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION); // A new texture should be generated. textureTrace.Reset(); ImageView imageView2 = ImageView::New(); - imageView2.SetProperty( ImageView::Property::IMAGE, imageMap ); + imageView2.SetProperty(ImageView::Property::IMAGE, imageMap); // Disable pre-multiplied alpha blending - imageView2.SetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA, false ); + imageView2.SetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA, false); - application.GetScene().Add( imageView2 ); + application.GetScene().Add(imageView2); application.SendNotification(); application.Render(); - value = imageView2.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( !enable ); + value = imageView2.GetProperty(ImageView::Property::PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(!enable); // conventional alpha blending - Renderer renderer2 = imageView2.GetRendererAt( 0 ); - value = renderer2.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( !enable ); - - srcFactorRgb = renderer2.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB ); - destFactorRgb = renderer2.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); - srcFactorAlpha = renderer2.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); - destFactorAlpha = renderer2.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA ); - DALI_TEST_CHECK( srcFactorRgb == BlendFactor::SRC_ALPHA ); - DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA ); - DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE ); - DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA ); - - DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION ); // The cached texture should be used. + Renderer renderer2 = imageView2.GetRendererAt(0); + value = renderer2.GetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA); + DALI_TEST_CHECK(value.Get(enable)); + DALI_TEST_CHECK(!enable); + + srcFactorRgb = renderer2.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_RGB); + destFactorRgb = renderer2.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_RGB); + srcFactorAlpha = renderer2.GetProperty(Renderer::Property::BLEND_FACTOR_SRC_ALPHA); + destFactorAlpha = renderer2.GetProperty(Renderer::Property::BLEND_FACTOR_DEST_ALPHA); + DALI_TEST_CHECK(srcFactorRgb == BlendFactor::SRC_ALPHA); + DALI_TEST_CHECK(destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA); + DALI_TEST_CHECK(srcFactorAlpha == BlendFactor::ONE); + DALI_TEST_CHECK(destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA); + + DALI_TEST_EQUALS(textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION); // The cached texture should be used. END_TEST; } @@ -409,87 +460,91 @@ int UtcDaliImageViewPixelArea(void) // Test pixel area property ToolkitTestApplication application; + static std::vector customUniforms = + { + UniformData("pixelArea", Property::Type::VECTOR4), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); + // Gif image, use AnimatedImageVisual internally // Atlasing is applied to pack multiple frames, use custom wrap mode - ImageView gifView = ImageView::New(); - const Vector4 pixelAreaVisual( 0.f, 0.f, 2.f, 2.f ); - gifView.SetProperty( ImageView::Property::IMAGE, - Property::Map().Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME ) - .Add( ImageVisual::Property::PIXEL_AREA, pixelAreaVisual ) ); + ImageView gifView = ImageView::New(); + const Vector4 pixelAreaVisual(0.f, 0.f, 2.f, 2.f); + gifView.SetProperty(ImageView::Property::IMAGE, + Property::Map().Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME).Add(ImageVisual::Property::PIXEL_AREA, pixelAreaVisual)); // Add to stage Integration::Scene stage = application.GetScene(); - stage.Add( gifView ); + stage.Add(gifView); // loading started application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_CHECK( gifView.GetRendererCount() == 1u ); + DALI_TEST_CHECK(gifView.GetRendererCount() == 1u); - const Vector4 fullTextureRect( 0.f, 0.f, 1.f, 1.f ); + const Vector4 fullTextureRect(0.f, 0.f, 1.f, 1.f); // test that the pixel area value defined in the visual property map is registered on renderer - Renderer renderer = gifView.GetRendererAt(0); - Property::Value pixelAreaValue = renderer.GetProperty( renderer.GetPropertyIndex( "pixelArea" ) ); - DALI_TEST_EQUALS( pixelAreaValue.Get(), pixelAreaVisual, TEST_LOCATION ); + Renderer renderer = gifView.GetRendererAt(0); + Property::Value pixelAreaValue = renderer.GetProperty(renderer.GetPropertyIndex("pixelArea")); + DALI_TEST_EQUALS(pixelAreaValue.Get(), pixelAreaVisual, TEST_LOCATION); // test that the shader has the default pixel area value registered. - Shader shader = renderer.GetShader(); - pixelAreaValue = shader.GetProperty( shader.GetPropertyIndex( "pixelArea" ) ); - DALI_TEST_EQUALS( pixelAreaValue.Get(), fullTextureRect, TEST_LOCATION ); + Shader shader = renderer.GetShader(); + pixelAreaValue = shader.GetProperty(shader.GetPropertyIndex("pixelArea")); + DALI_TEST_EQUALS(pixelAreaValue.Get(), fullTextureRect, TEST_LOCATION); // test that the uniform uses the pixelArea property on the renderer. TestGlAbstraction& gl = application.GetGlAbstraction(); - Vector4 pixelAreaUniform; - DALI_TEST_CHECK( gl.GetUniformValue( "pixelArea", pixelAreaUniform ) ); - DALI_TEST_EQUALS( pixelAreaVisual, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + Vector4 pixelAreaUniform; + DALI_TEST_CHECK(gl.GetUniformValue("pixelArea", pixelAreaUniform)); + DALI_TEST_EQUALS(pixelAreaVisual, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION); // set the pixelArea property on the control - const Vector4 pixelAreaControl( -1.f, -1.f, 3.f, 3.f ); - gifView.SetProperty( ImageView::Property::PIXEL_AREA, pixelAreaControl ); + const Vector4 pixelAreaControl(-1.f, -1.f, 3.f, 3.f); + gifView.SetProperty(ImageView::Property::PIXEL_AREA, pixelAreaControl); application.SendNotification(); application.Render(16); // check the pixelArea property on the control - pixelAreaValue = gifView.GetProperty( gifView.GetPropertyIndex( "pixelArea" ) ); - DALI_TEST_EQUALS( pixelAreaValue.Get(), pixelAreaControl, TEST_LOCATION ); + pixelAreaValue = gifView.GetProperty(gifView.GetPropertyIndex("pixelArea")); + DALI_TEST_EQUALS(pixelAreaValue.Get(), pixelAreaControl, TEST_LOCATION); // test that the uniform uses the pixelArea property on the control. - DALI_TEST_CHECK( gl.GetUniformValue( "pixelArea", pixelAreaUniform ) ); - DALI_TEST_EQUALS( pixelAreaControl, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION ); - + DALI_TEST_CHECK(gl.GetUniformValue("pixelArea", pixelAreaUniform)); + DALI_TEST_EQUALS(pixelAreaControl, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION); END_TEST; } int UtcDaliImageViewAsyncLoadingWithoutAltasing(void) { - ToolkitTestApplication application; - TestGlAbstraction& gl = application.GetGlAbstraction(); - const std::vector& textures = gl.GetBoundTextures(); - size_t numTextures = textures.size(); + ToolkitTestApplication application; + TestGlAbstraction& gl = application.GetGlAbstraction(); + const std::vector& textures = gl.GetBoundTextures(); + size_t numTextures = textures.size(); // Async loading, no atlasing for big size image - ImageView imageView = ImageView::New( gImage_600_RGB ); + ImageView imageView = ImageView::New(gImage_600_RGB); // By default, Aysnc loading is used - application.GetScene().Add( imageView ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(100, 100) ); - imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + application.GetScene().Add(imageView); + imageView.SetProperty(Actor::Property::SIZE, Vector2(100, 100)); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); application.SendNotification(); const std::vector& textures2 = gl.GetBoundTextures(); - DALI_TEST_GREATER( textures2.size(), numTextures, TEST_LOCATION ); - - + DALI_TEST_GREATER(textures2.size(), numTextures, TEST_LOCATION); END_TEST; } @@ -505,32 +560,32 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing(void) Property::Map imageMap; - imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - imageMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34; - imageMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34; - imageMap[ ImageVisual::Property::ATLASING] = true; + imageMap[ImageVisual::Property::URL] = gImage_34_RGBA; + imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 34; + imageMap[ImageVisual::Property::DESIRED_WIDTH] = 34; + imageMap[ImageVisual::Property::ATLASING] = true; ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Toolkit::Control::Property::PADDING, Extents( 10u, 10u, 10u, 10u ) ); + imageView.SetProperty(ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u)); // By default, Aysnc loading is used - // loading is not started if the actor is offStage + // loading is not started if the actor is offScene - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(16); application.Render(16); application.SendNotification(); - imageView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT ); + imageView.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT); application.SendNotification(); application.Render(16); application.Render(16); application.SendNotification(); // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); @@ -538,9 +593,9 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing(void) callStack.Enable(false); TraceCallStack::NamedParams params; - params["width"] = ToString(34); - params["height"] = ToString(34); - DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION ); + params["width"] << 34; + params["height"] << 34; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), true, TEST_LOCATION); END_TEST; } @@ -555,23 +610,23 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing02(void) callStack.Enable(true); Property::Map asyncLoadingMap; - asyncLoadingMap[ "url" ] = gImage_34_RGBA; - asyncLoadingMap[ "desiredHeight" ] = 34; - asyncLoadingMap[ "desiredWidth" ] = 34; - asyncLoadingMap[ "synchronousLoading" ] = false; - asyncLoadingMap[ "atlasing" ] = true; + asyncLoadingMap["url"] = gImage_34_RGBA; + asyncLoadingMap["desiredHeight"] = 34; + asyncLoadingMap["desiredWidth"] = 34; + asyncLoadingMap["synchronousLoading"] = false; + asyncLoadingMap["atlasing"] = true; ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, asyncLoadingMap ); + imageView.SetProperty(ImageView::Property::IMAGE, asyncLoadingMap); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(16); application.Render(16); application.SendNotification(); // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); @@ -579,9 +634,9 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing02(void) callStack.Enable(false); TraceCallStack::NamedParams params; - params["width"] = ToString(34); - params["height"] = ToString(34); - DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION ); + params["width"] << 34; + params["height"] << 34; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), true, TEST_LOCATION); END_TEST; } @@ -593,16 +648,16 @@ int UtcDaliImageViewSyncLoading(void) tet_infoline("ImageView Testing sync loading and size using index key property map"); Property::Map syncLoadingMap; - syncLoadingMap[ ImageVisual::Property::SYNCHRONOUS_LOADING ] = true; - syncLoadingMap[ ImageVisual::Property::ATLASING ] = true; + syncLoadingMap[ImageVisual::Property::SYNCHRONOUS_LOADING] = true; + syncLoadingMap[ImageVisual::Property::ATLASING] = true; // Sync loading, no atlasing for big size image { ImageView imageView = ImageView::New(); // Sync loading is used - syncLoadingMap[ ImageVisual::Property::URL ] = gImage_600_RGB; - imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); + syncLoadingMap[ImageVisual::Property::URL] = gImage_600_RGB; + imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap); } // Sync loading, automatic atlasing for small size image @@ -611,23 +666,24 @@ int UtcDaliImageViewSyncLoading(void) callStack.Reset(); callStack.Enable(true); - ImageView imageView = ImageView::New( ); + ImageView imageView = ImageView::New(); // Sync loading is used - syncLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - syncLoadingMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34; - syncLoadingMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34; - imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); + syncLoadingMap[ImageVisual::Property::URL] = gImage_34_RGBA; + syncLoadingMap[ImageVisual::Property::DESIRED_HEIGHT] = 34; + syncLoadingMap[ImageVisual::Property::DESIRED_WIDTH] = 34; + imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(16); TraceCallStack::NamedParams params; - params["width"] = ToString(34); - params["height"] = ToString(34); - DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), - true, TEST_LOCATION ); + params["width"] << 34; + params["height"] << 34; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), + true, + TEST_LOCATION); } END_TEST; } @@ -644,27 +700,195 @@ int UtcDaliImageViewSyncLoading02(void) callStack.Reset(); callStack.Enable(true); - ImageView imageView = ImageView::New( ); + ImageView imageView = ImageView::New(); + + // Sync loading is used + Property::Map syncLoadingMap; + syncLoadingMap["url"] = gImage_34_RGBA; + syncLoadingMap["desiredHeight"] = 34; + syncLoadingMap["desiredWidth"] = 34; + syncLoadingMap["synchronousLoading"] = true; + syncLoadingMap["atlasing"] = true; + imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap); + + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(16); + + TraceCallStack::NamedParams params; + params["width"] << 34; + params["height"] << 34; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), + true, + TEST_LOCATION); + } + END_TEST; +} + +int UtcDaliImageViewAsyncLoadingEncodedBuffer(void) +{ + ToolkitTestApplication application; + TestGlAbstraction& gl = application.GetGlAbstraction(); + const std::vector& textures = gl.GetBoundTextures(); + size_t numTextures = textures.size(); + + // Get encoded raw-buffer image and generate url + EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(gImage_600_RGB); + ImageUrl url = Toolkit::Image::GenerateUrl(buffer); + + // Async loading, no atlasing for big size image + ImageView imageView = ImageView::New(url.GetUrl()); + + // By default, Aysnc loading is used + application.GetScene().Add(imageView); + imageView.SetProperty(Actor::Property::SIZE, Vector2(100, 100)); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + application.SendNotification(); + + const std::vector& textures2 = gl.GetBoundTextures(); + DALI_TEST_GREATER(textures2.size(), numTextures, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewAsyncLoadingEncodedBufferWithAtlasing(void) +{ + ToolkitTestApplication application; + + // Get encoded raw-buffer image and generate url + EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(gImage_600_RGB); + ImageUrl url = Toolkit::Image::GenerateUrl(buffer); + ImageUrl url2 = Toolkit::Image::GenerateUrl(buffer); + + // Generate url is not equal to url2 + // NOTE : This behavior may changed when ImageUrl compare operator changed. + DALI_TEST_CHECK(url != url2); + // Generate url's string is equal to url2's string + DALI_TEST_CHECK(url.GetUrl() == url2.GetUrl()); + + EncodedImageBuffer buffer2 = ConvertFileToEncodedImageBuffer(gImage_600_RGB); + url2 = Toolkit::Image::GenerateUrl(buffer2); + + // Check whethere two url are not equal + DALI_TEST_CHECK(url.GetUrl() != url2.GetUrl()); + + // Async loading, automatic atlasing for small size image + TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); + callStack.Reset(); + callStack.Enable(true); + + Property::Map imageMap; + + imageMap[ImageVisual::Property::URL] = url.GetUrl(); + imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 600; + imageMap[ImageVisual::Property::DESIRED_WIDTH] = 600; + imageMap[ImageVisual::Property::ATLASING] = true; + + // No atlasing with big image + ImageView imageView_bigdesired = ImageView::New(); + imageView_bigdesired.SetProperty(ImageView::Property::IMAGE, imageMap); + imageView_bigdesired.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u)); + + imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 0; + imageMap[ImageVisual::Property::DESIRED_WIDTH] = 0; + + // No atlasing with zero desired size + ImageView imageView_nodesired = ImageView::New(); + imageView_nodesired.SetProperty(ImageView::Property::IMAGE, imageMap); + imageView_nodesired.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u)); + + imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 34; + imageMap[ImageVisual::Property::DESIRED_WIDTH] = 34; + + ImageView imageView = ImageView::New(); + imageView.SetProperty(ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u)); + + // By default, Aysnc loading is used + // loading is not started if the actor is offScene + application.GetScene().Add(imageView); + application.GetScene().Add(imageView_bigdesired); + application.GetScene().Add(imageView_nodesired); + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread for max 30 seconds + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.Render(16); + application.SendNotification(); + + // Change url to url2 + imageMap[ImageVisual::Property::URL] = url2.GetUrl(); + imageView.SetProperty(ImageView::Property::IMAGE, imageMap); + + imageView.SetProperty(Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT); + application.SendNotification(); + application.Render(16); + application.Render(16); + application.SendNotification(); + + // loading started, this waits for the loader thread for max 30 seconds + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + callStack.Enable(false); + + TraceCallStack::NamedParams params; + params["width"] << 34; + params["height"] << 34; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), true, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewSyncLoadingEncodedBuffer(void) +{ + ToolkitTestApplication application; + + tet_infoline("ImageView Testing sync loading from EncodedImageBuffer"); + + // Get encoded raw-buffer image and generate url + EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(gImage_34_RGBA); + ImageUrl url = Toolkit::Image::GenerateUrl(buffer); + + // Sync loading, automatic atlasing for small size image + { + TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); + callStack.Reset(); + callStack.Enable(true); + + ImageView imageView = ImageView::New(); // Sync loading is used Property::Map syncLoadingMap; - syncLoadingMap[ "url" ] = gImage_34_RGBA; - syncLoadingMap[ "desiredHeight" ] = 34; - syncLoadingMap[ "desiredWidth" ] = 34; - syncLoadingMap[ "synchronousLoading" ] = true; - syncLoadingMap[ "atlasing" ] = true; - imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - - application.GetScene().Add( imageView ); + syncLoadingMap["url"] = url.GetUrl(); + syncLoadingMap["alphaMaskUrl"] = gImage_34_RGBA; + syncLoadingMap["desiredHeight"] = 34; + syncLoadingMap["desiredWidth"] = 34; + syncLoadingMap["synchronousLoading"] = true; + syncLoadingMap["atlasing"] = true; + imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap); + + application.GetScene().Add(imageView); application.SendNotification(); application.Render(16); TraceCallStack::NamedParams params; - params["width"] = ToString(34); - params["height"] = ToString(34); - DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), - true, TEST_LOCATION ); + params["width"] << 34; + params["height"] << 34; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params), + true, + TEST_LOCATION); } + END_TEST; } @@ -685,7 +909,7 @@ int UtcDaliImageViewAddedTexture(void) propertyMap[ImageVisual::Property::URL] = url; imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); @@ -696,25 +920,24 @@ int UtcDaliImageViewSizeWithBackground(void) { ToolkitTestApplication application; - int width = 100; - int height = 200; + int width = 100; + int height = 200; ImageView imageView = ImageView::New(); - imageView.SetProperty( Control::Property::BACKGROUND, - { - { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE }, - { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" }, - { ImageVisual::Property::DESIRED_WIDTH, width }, - { ImageVisual::Property::DESIRED_HEIGHT, height }, - } - ); + imageView.SetProperty(Control::Property::BACKGROUND, + { + {Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, + {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"}, + {ImageVisual::Property::DESIRED_WIDTH, width}, + {ImageVisual::Property::DESIRED_HEIGHT, height}, + }); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, (float)width, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height, (float)height, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetCurrentProperty(Actor::Property::SIZE).width, (float)width, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetCurrentProperty(Actor::Property::SIZE).height, (float)height, TEST_LOCATION); END_TEST; } @@ -723,30 +946,29 @@ int UtcDaliImageViewSizeWithBackgroundAndImage(void) { ToolkitTestApplication application; - int widthBackground = 100; + int widthBackground = 100; int heightBackground = 200; - int width = 600; - int height = 600; + int width = 600; + int height = 600; ImageView imageView = ImageView::New(); - imageView.SetProperty( Control::Property::BACKGROUND, - { - { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE }, - { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" }, - { ImageVisual::Property::DESIRED_WIDTH, widthBackground }, - { ImageVisual::Property::DESIRED_HEIGHT, heightBackground }, - } - ); + imageView.SetProperty(Control::Property::BACKGROUND, + { + {Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, + {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"}, + {ImageVisual::Property::DESIRED_WIDTH, widthBackground}, + {ImageVisual::Property::DESIRED_HEIGHT, heightBackground}, + }); - imageView.SetImage( gImage_600_RGB ); // 1 to 1 ratio, 600x600 pixels + imageView.SetImage(gImage_600_RGB); // 1 to 1 ratio, 600x600 pixels - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, (float)width, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height, (float)height, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetCurrentProperty(Actor::Property::SIZE).width, (float)width, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetCurrentProperty(Actor::Property::SIZE).height, (float)height, TEST_LOCATION); END_TEST; } @@ -755,28 +977,25 @@ int UtcDaliImageViewHeightForWidthBackground(void) { ToolkitTestApplication application; - int widthBackground = 100; + int widthBackground = 100; int heightBackground = 200; ImageView imageView = ImageView::New(); - imageView.SetProperty( Control::Property::BACKGROUND, - { - { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE }, - { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" }, - { ImageVisual::Property::DESIRED_WIDTH, widthBackground }, - { ImageVisual::Property::DESIRED_HEIGHT, heightBackground } - } - ); + imageView.SetProperty(Control::Property::BACKGROUND, + {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, + {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"}, + {ImageVisual::Property::DESIRED_WIDTH, widthBackground}, + {ImageVisual::Property::DESIRED_HEIGHT, heightBackground}}); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - Control control = Control::DownCast( imageView ); - DALI_TEST_CHECK( control ); - DALI_TEST_EQUALS( imageView.GetHeightForWidth( 123.f ), control.GetHeightForWidth( 123.f ), TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetWidthForHeight( 321.f ), control.GetWidthForHeight( 321.f ), TEST_LOCATION ); + Control control = Control::DownCast(imageView); + DALI_TEST_CHECK(control); + DALI_TEST_EQUALS(imageView.GetHeightForWidth(123.f), control.GetHeightForWidth(123.f), TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetWidthForHeight(321.f), control.GetWidthForHeight(321.f), TEST_LOCATION); END_TEST; } @@ -785,30 +1004,27 @@ int UtcDaliImageViewHeightForWidthBackgroundAndImage(void) { ToolkitTestApplication application; - int widthBackground = 100; + int widthBackground = 100; int heightBackground = 200; - int width = 300; - int height = 300; + int width = 300; + int height = 300; ImageView imageView = ImageView::New(); - imageView.SetProperty( Control::Property::BACKGROUND, - { - { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE }, - { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" }, - { ImageVisual::Property::DESIRED_WIDTH, widthBackground }, - { ImageVisual::Property::DESIRED_HEIGHT, heightBackground } - } - ); // 1 to 2 ratio + imageView.SetProperty(Control::Property::BACKGROUND, + {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, + {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"}, + {ImageVisual::Property::DESIRED_WIDTH, widthBackground}, + {ImageVisual::Property::DESIRED_HEIGHT, heightBackground}}); // 1 to 2 ratio - imageView.SetImage( gImage_600_RGB ); // 1 to 1 ratio + imageView.SetImage(gImage_600_RGB); // 1 to 1 ratio - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetHeightForWidth( width ), (float)height, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetWidthForHeight( height ), (float)width, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetHeightForWidth(width), (float)height, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetWidthForHeight(height), (float)width, TEST_LOCATION); END_TEST; } @@ -818,20 +1034,19 @@ int UtcDaliImageViewSetImageUrl(void) ToolkitTestApplication application; ImageView imageView = ImageView::New(); - imageView.SetImage( TEST_IMAGE_FILE_NAME ); - TestUrl( imageView, TEST_IMAGE_FILE_NAME ); - + imageView.SetImage(TEST_IMAGE_FILE_NAME); + TestUrl(imageView, TEST_IMAGE_FILE_NAME); - imageView.SetImage( TEST_IMAGE_FILE_NAME2 ); - TestUrl( imageView, TEST_IMAGE_FILE_NAME2 ); + imageView.SetImage(TEST_IMAGE_FILE_NAME2); + TestUrl(imageView, TEST_IMAGE_FILE_NAME2); END_TEST; } -bool gResourceReadySignalFired = false; +bool gResourceReadySignalFired = false; Vector3 gNaturalSize; -void ResourceReadySignal( Control control ) +void ResourceReadySignal(Control control) { gResourceReadySignalFired = true; } @@ -843,37 +1058,34 @@ int UtcDaliImageViewCheckResourceReady(void) gResourceReadySignalFired = false; // Check ImageView with background and main image, to ensure both visuals are marked as loaded - ImageView imageView = ImageView::New( TEST_GIF_FILE_NAME ); + ImageView imageView = ImageView::New(TEST_GIF_FILE_NAME); - imageView.SetProperty( Control::Property::BACKGROUND, - { - { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE }, - { Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg" }, - { ImageVisual::Property::DESIRED_WIDTH, 100 }, - { ImageVisual::Property::DESIRED_HEIGHT, 200 } - } - ); + imageView.SetProperty(Control::Property::BACKGROUND, + {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, + {Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/gallery-small-1.jpg"}, + {ImageVisual::Property::DESIRED_WIDTH, 100}, + {ImageVisual::Property::DESIRED_HEIGHT, 200}}); - DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION); - imageView.ResourceReadySignal().Connect( &ResourceReadySignal); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); END_TEST; } @@ -882,95 +1094,124 @@ int UtcDaliImageViewSetImageTypeChangesP(void) { ToolkitTestApplication application; - ImageView imageView = ImageView::New(); - Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView ); + ImageView imageView = ImageView::New(); + Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); - std::string url; - Property::Map map; + std::string url; + Property::Map map; Toolkit::Visual::Base visual; - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); + Property::Value value = imageView.GetProperty(imageView.GetPropertyIndex("image")); + visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); application.SendNotification(); - application.Render( 16 ); + application.Render(16); - DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty - value.Get( map ); - DALI_TEST_CHECK( map.Empty() ); // Value should be empty - DALI_TEST_CHECK( ! visual ); // Visual should be invalid + DALI_TEST_CHECK(!value.Get(url)); // Value should be empty + value.Get(map); + DALI_TEST_CHECK(map.Empty()); // Value should be empty + DALI_TEST_CHECK(!visual); // Visual should be invalid // Set a URL - imageView.SetImage( "TEST_URL" ); + imageView.SetImage("TEST_URL"); application.SendNotification(); - application.Render( 16 ); + application.Render(16); - value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); + value = imageView.GetProperty(imageView.GetPropertyIndex("image")); + visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); - DALI_TEST_CHECK( value.Get( url ) ); // Value should NOT be empty - DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty - DALI_TEST_CHECK( visual ); // Visual should be valid + DALI_TEST_CHECK(value.Get(url)); // Value should NOT be empty + DALI_TEST_CHECK(!value.Get(map)); // Value should be empty + DALI_TEST_CHECK(visual); // Visual should be valid // Set an empty URL - imageView.SetImage( "" ); + imageView.SetImage(""); application.SendNotification(); - application.Render( 16 ); + application.Render(16); - value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); + value = imageView.GetProperty(imageView.GetPropertyIndex("image")); + visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); - DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty - value.Get( map ); - DALI_TEST_CHECK( map.Empty() ); // Value should be empty - DALI_TEST_CHECK( ! visual ); // Visual should be invalid + DALI_TEST_CHECK(!value.Get(url)); // Value should be empty + value.Get(map); + DALI_TEST_CHECK(map.Empty()); // Value should be empty + DALI_TEST_CHECK(!visual); // Visual should be invalid // Set a URL in property map Property::Map propertyMap; propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; - imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); application.SendNotification(); - application.Render( 16 ); + application.Render(16); - value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); + value = imageView.GetProperty(imageView.GetPropertyIndex("image")); + visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); - DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty - DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty - DALI_TEST_CHECK( visual ); // Visual should be valid + DALI_TEST_CHECK(!value.Get(url)); // Value should be empty + DALI_TEST_CHECK(value.Get(map)); // Value should NOT be empty + DALI_TEST_CHECK(visual); // Visual should be valid // Set a URL in property map again propertyMap[ImageVisual::Property::URL] = gImage_34_RGBA; - imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); application.SendNotification(); - application.Render( 16 ); + application.Render(16); - value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); + value = imageView.GetProperty(imageView.GetPropertyIndex("image")); + visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); - DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty - DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty - DALI_TEST_CHECK( visual ); // Visual should be valid + DALI_TEST_CHECK(!value.Get(url)); // Value should be empty + DALI_TEST_CHECK(value.Get(map)); // Value should NOT be empty + DALI_TEST_CHECK(visual); // Visual should be valid // Set an empty URL in property map propertyMap[ImageVisual::Property::URL] = std::string(); - imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); + + application.SendNotification(); + application.Render(16); + + value = imageView.GetProperty(imageView.GetPropertyIndex("image")); + visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); + + DALI_TEST_CHECK(!value.Get(url)); // Value should be empty + DALI_TEST_CHECK(value.Get(map)); // Value should NOT be empty + DALI_TEST_CHECK(!visual); // Visual should be invalid + + // Set a URL in property map again + propertyMap[ImageVisual::Property::URL] = gImage_34_RGBA; + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); + + application.SendNotification(); + application.Render(16); + + value = imageView.GetProperty(imageView.GetPropertyIndex("image")); + visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); + + DALI_TEST_CHECK(!value.Get(url)); // Value should be empty + DALI_TEST_CHECK(value.Get(map)); // Value should NOT be empty + DALI_TEST_CHECK(visual); // Visual should be valid + + // Set an empty property map + propertyMap.Clear(); + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); application.SendNotification(); - application.Render( 16 ); + application.Render(16); - value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); + value = imageView.GetProperty(imageView.GetPropertyIndex("image")); + visual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); - DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty - DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty - DALI_TEST_CHECK( ! visual ); // Visual should be invalid + DALI_TEST_CHECK(!value.Get(url)); // Value should be empty + DALI_TEST_CHECK(value.Get(map)); // Value should NOT be empty + DALI_TEST_CHECK(map.Empty()); // But PropertyMap should be empty + DALI_TEST_CHECK(!visual); // Visual should be invalid END_TEST; } @@ -980,10 +1221,10 @@ int UtcDaliImageViewResourceUrlP(void) ToolkitTestApplication application; ImageView imageView = ImageView::New(); - DALI_TEST_CHECK( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >().empty() ); + DALI_TEST_CHECK(imageView.GetProperty(ImageView::Property::IMAGE).Get().empty()); - imageView.SetProperty( ImageView::Property::IMAGE, "TestString" ); - DALI_TEST_EQUALS( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >(), "TestString", TEST_LOCATION ); + imageView.SetProperty(ImageView::Property::IMAGE, "TestString"); + DALI_TEST_EQUALS(imageView.GetProperty(ImageView::Property::IMAGE).Get(), "TestString", TEST_LOCATION); END_TEST; } @@ -995,23 +1236,23 @@ int UtcDaliImageViewReplaceImage(void) gResourceReadySignalFired = false; // Check ImageView with background and main image, to ensure both visuals are marked as loaded - ImageView imageView = ImageView::New( TEST_IMAGE_1 ); + ImageView imageView = ImageView::New(TEST_IMAGE_1); - DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION); - imageView.ResourceReadySignal().Connect( &ResourceReadySignal); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(16); // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); gResourceReadySignalFired = false; @@ -1021,18 +1262,18 @@ int UtcDaliImageViewReplaceImage(void) application.Render(16); // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); - DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); END_TEST; } -void OnRelayoutOverride( Size size ) +void OnRelayoutOverride(Size size) { gNaturalSize = size; // Size Relayout is using } @@ -1042,25 +1283,25 @@ int UtcDaliImageViewReplaceImageAndGetNaturalSize(void) ToolkitTestApplication application; // Check ImageView with background and main image, to ensure both visuals are marked as loaded - ImageView imageView = ImageView::New( TEST_IMAGE_1 ); - imageView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); + ImageView imageView = ImageView::New(TEST_IMAGE_1); + imageView.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS); - DummyControl dummyControl = DummyControl::New( true ); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); - dummyControl.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + dummyControl.SetResizePolicy(ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS); - dummyControl.Add( imageView ); - dummyImpl.SetRelayoutCallback( &OnRelayoutOverride ); - application.GetScene().Add( dummyControl ); + dummyControl.Add(imageView); + dummyImpl.SetRelayoutCallback(&OnRelayoutOverride); + application.GetScene().Add(dummyControl); application.SendNotification(); application.Render(); // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - DALI_TEST_EQUALS( gNaturalSize.width, 1024.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( gNaturalSize.height, 1024.0f, TEST_LOCATION ); + DALI_TEST_EQUALS(gNaturalSize.width, 1024.0f, TEST_LOCATION); + DALI_TEST_EQUALS(gNaturalSize.height, 1024.0f, TEST_LOCATION); gNaturalSize = Vector3::ZERO; @@ -1069,14 +1310,14 @@ int UtcDaliImageViewReplaceImageAndGetNaturalSize(void) // Waiting for resourceReady so SendNotifcation not called here. // loading started, this waits for the loader thread for max 30 seconds - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); // Trigger a potential relayout application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( gNaturalSize.width, 600.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( gNaturalSize.height, 600.0f, TEST_LOCATION ); + DALI_TEST_EQUALS(gNaturalSize.width, 600.0f, TEST_LOCATION); + DALI_TEST_EQUALS(gNaturalSize.height, 600.0f, TEST_LOCATION); END_TEST; } @@ -1091,23 +1332,23 @@ int UtcDaliImageViewResourceReadySignalWithImmediateLoad(void) Property::Map imageMap; - imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - imageMap[ ImageVisual::Property::LOAD_POLICY ] = ImageVisual::LoadPolicy::IMMEDIATE; + imageMap[ImageVisual::Property::URL] = gImage_34_RGBA; + imageMap[ImageVisual::Property::LOAD_POLICY] = ImageVisual::LoadPolicy::IMMEDIATE; tet_infoline("Creating ImageView without URL so image does not start loading"); ImageView imageView = ImageView::New(); tet_infoline("Connect to image loaded signal before setting image"); - imageView.ResourceReadySignal().Connect( &ResourceReadySignal); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); tet_infoline("Setting Image with IMMEDIATE load, signal already connected so will be triggered."); - imageView.SetProperty( ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty(ImageView::Property::IMAGE, imageMap); // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); END_TEST; } @@ -1122,27 +1363,27 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage(void) Property::Map imageMap; - imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - imageMap[ ImageVisual::Property::LOAD_POLICY ] = ImageVisual::LoadPolicy::IMMEDIATE; + imageMap[ImageVisual::Property::URL] = gImage_34_RGBA; + imageMap[ImageVisual::Property::LOAD_POLICY] = ImageVisual::LoadPolicy::IMMEDIATE; ImageView imageView = ImageView::New(); - imageView.ResourceReadySignal().Connect( &ResourceReadySignal); - imageView.SetProperty( ImageView::Property::IMAGE, imageMap ); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); + imageView.SetProperty(ImageView::Property::IMAGE, imageMap); // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); gResourceReadySignalFired = false; ImageView imageViewWithExistingImage = ImageView::New(); - imageViewWithExistingImage.ResourceReadySignal().Connect( &ResourceReadySignal); - imageViewWithExistingImage.SetProperty( ImageView::Property::IMAGE, imageMap ); + imageViewWithExistingImage.ResourceReadySignal().Connect(&ResourceReadySignal); + imageViewWithExistingImage.SetProperty(ImageView::Property::IMAGE, imageMap); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); END_TEST; } @@ -1156,32 +1397,32 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage02(void) gResourceReadySignalFired = false; Property::Map imageImmediateLoadingMap; - imageImmediateLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; - imageImmediateLoadingMap[ ImageVisual::Property::LOAD_POLICY ] = ImageVisual::LoadPolicy::IMMEDIATE; + imageImmediateLoadingMap[ImageVisual::Property::URL] = gImage_34_RGBA; + imageImmediateLoadingMap[ImageVisual::Property::LOAD_POLICY] = ImageVisual::LoadPolicy::IMMEDIATE; tet_infoline("Immediate load an image"); ImageView imageView = ImageView::New(); - imageView.ResourceReadySignal().Connect( &ResourceReadySignal); - imageView.SetProperty( ImageView::Property::IMAGE, imageImmediateLoadingMap ); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); + imageView.SetProperty(ImageView::Property::IMAGE, imageImmediateLoadingMap); // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); tet_infoline("Check image loaded"); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); gResourceReadySignalFired = false; tet_infoline("Create another ImageView with the same URL"); - ImageView imageViewWithExistingImage = ImageView::New( gImage_34_RGBA ); + ImageView imageViewWithExistingImage = ImageView::New(gImage_34_RGBA); tet_infoline("Connect to ResourceReady signal for second ImageView, it should still fire as resource is ready"); - imageViewWithExistingImage.ResourceReadySignal().Connect( &ResourceReadySignal); + imageViewWithExistingImage.ResourceReadySignal().Connect(&ResourceReadySignal); - application.GetScene().Add( imageViewWithExistingImage ); + application.GetScene().Add(imageViewWithExistingImage); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); END_TEST; } @@ -1190,47 +1431,47 @@ int UtcDaliImageViewPaddingProperty(void) { ToolkitTestApplication application; - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imagePropertyMap; - imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/gallery-small-1.jpg" ; - imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128; - imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) ); - application.GetScene().Add( imageView ); + imagePropertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imagePropertyMap[Toolkit::ImageVisual::Property::URL] = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; + imagePropertyMap[ImageVisual::Property::DESIRED_WIDTH] = 128; + imagePropertyMap[ImageVisual::Property::DESIRED_HEIGHT] = 128; + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap); + imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + imageView.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10)); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetProperty( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetProperty(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION); ImageView childImage = ImageView::New(); - childImage.SetBackgroundColor( Color::BLACK ); - childImage.SetProperty( Actor::Property::SIZE, Vector2( 10.f, 10.f ) ); - imageView.Add( childImage ); + childImage.SetBackgroundColor(Color::BLACK); + childImage.SetProperty(Actor::Property::SIZE, Vector2(10.f, 10.f)); + imageView.Add(childImage); application.SendNotification(); application.Render(); // Child ImageView should be positioned dependinig on Parent ImageView's Padding value - DALI_TEST_EQUALS( childImage.GetProperty( Dali::Actor::Property::POSITION ), Vector3( 15, 5, 0 ), TEST_LOCATION ); + DALI_TEST_EQUALS(childImage.GetProperty(Dali::Actor::Property::POSITION), Vector3(15, 5, 0), TEST_LOCATION); // Check whether Image Visual transforms on ImageVieiw::OnRelayout() - Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView ); - Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView); + Toolkit::Visual::Base imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); + Property::Map resultMap; + imageVisual.CreatePropertyMap(resultMap); - Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( transformValue ); + Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM); + DALI_TEST_CHECK(transformValue); Property::Map* retMap = transformValue->GetMap(); - DALI_TEST_CHECK( retMap ); + DALI_TEST_CHECK(retMap); // Image Visual should be positioned depending on ImageView's padding - DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 15, 5 ), TEST_LOCATION ); + DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get(), Vector2(15, 5), TEST_LOCATION); END_TEST; } @@ -1239,37 +1480,37 @@ int UtcDaliImageViewPaddingProperty02(void) { ToolkitTestApplication application; - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imagePropertyMap; - imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/Kid1.svg" ; - imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128; - imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; - imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) ); - application.GetScene().Add( imageView ); + imagePropertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imagePropertyMap[Toolkit::ImageVisual::Property::URL] = TEST_RESOURCE_DIR "/Kid1.svg"; + imagePropertyMap[ImageVisual::Property::DESIRED_WIDTH] = 128; + imagePropertyMap[ImageVisual::Property::DESIRED_HEIGHT] = 128; + imagePropertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap); + imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + imageView.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10)); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetProperty( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetProperty(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION); // Check whether Image Visual transforms on ImageVieiw::OnRelayout() - Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView ); - Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView); + Toolkit::Visual::Base imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); + Property::Map resultMap; + imageVisual.CreatePropertyMap(resultMap); - Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( transformValue ); + Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM); + DALI_TEST_CHECK(transformValue); Property::Map* retMap = transformValue->GetMap(); - DALI_TEST_CHECK( retMap ); + DALI_TEST_CHECK(retMap); // Image Visual should be positioned depending on ImageView's padding - DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 15, 5 ), TEST_LOCATION ); + DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get(), Vector2(15, 5), TEST_LOCATION); END_TEST; } @@ -1280,44 +1521,44 @@ int UtcDaliImageViewPaddingProperty03(void) ToolkitTestApplication application; - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imagePropertyMap; - imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/Kid1.svg" ; - imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128; - imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; - imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) ); - application.GetScene().Add( imageView ); + imagePropertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imagePropertyMap[Toolkit::ImageVisual::Property::URL] = TEST_RESOURCE_DIR "/Kid1.svg"; + imagePropertyMap[ImageVisual::Property::DESIRED_WIDTH] = 128; + imagePropertyMap[ImageVisual::Property::DESIRED_HEIGHT] = 128; + imagePropertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap); + imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + imageView.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10)); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetProperty( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetProperty(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION); tet_infoline("Remove Padding and test Visual is position correctly"); - imageView.SetProperty( Control::Property::PADDING, Extents( 0, 0, 0, 0 ) ); + imageView.SetProperty(Control::Property::PADDING, Extents(0, 0, 0, 0)); application.SendNotification(); application.Render(); // Check whether Image Visual transforms on ImageVieiw::OnRelayout() - Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView ); - Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView); + Toolkit::Visual::Base imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); + Property::Map resultMap; + imageVisual.CreatePropertyMap(resultMap); - Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( transformValue ); + Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM); + DALI_TEST_CHECK(transformValue); Property::Map* retMap = transformValue->GetMap(); - DALI_TEST_CHECK( retMap ); + DALI_TEST_CHECK(retMap); // Image Visual should be positioned depending on ImageView's padding - DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); + DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get(), Vector2(0, 0), TEST_LOCATION); END_TEST; } @@ -1328,44 +1569,44 @@ int UtcDaliImageViewPaddingProperty04(void) ToolkitTestApplication application; - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imagePropertyMap; - imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = TEST_RESOURCE_DIR "/Kid1.svg" ; - imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128; - imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; - imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FILL; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) ); - application.GetScene().Add( imageView ); + imagePropertyMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imagePropertyMap[Toolkit::ImageVisual::Property::URL] = TEST_RESOURCE_DIR "/Kid1.svg"; + imagePropertyMap[ImageVisual::Property::DESIRED_WIDTH] = 128; + imagePropertyMap[ImageVisual::Property::DESIRED_HEIGHT] = 128; + imagePropertyMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FILL; + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap); + imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + imageView.SetProperty(Control::Property::PADDING, Extents(15, 10, 5, 10)); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetProperty( Control::Property::PADDING ), Extents( 15, 10, 5, 10 ), TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetProperty(Control::Property::PADDING), Extents(15, 10, 5, 10), TEST_LOCATION); tet_infoline("Remove Padding and test Visual is position correctly"); - imageView.SetProperty( Control::Property::PADDING, Extents( 0, 0, 0, 0 ) ); + imageView.SetProperty(Control::Property::PADDING, Extents(0, 0, 0, 0)); application.SendNotification(); application.Render(); // Check whether Image Visual transforms on ImageVieiw::OnRelayout() - Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView ); - Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView); + Toolkit::Visual::Base imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); + Property::Map resultMap; + imageVisual.CreatePropertyMap(resultMap); - Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( transformValue ); + Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM); + DALI_TEST_CHECK(transformValue); Property::Map* retMap = transformValue->GetMap(); - DALI_TEST_CHECK( retMap ); + DALI_TEST_CHECK(retMap); // Image Visual should be positioned depending on ImageView's padding - DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); + DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get(), Vector2(0, 0), TEST_LOCATION); END_TEST; } @@ -1376,40 +1617,40 @@ int UtcDaliImageViewTransformTest01(void) ToolkitTestApplication application; - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imagePropertyMap; - imagePropertyMap.Add( Toolkit::Visual::Property::TYPE,Toolkit::Visual::IMAGE ) - .Add( Toolkit::ImageVisual::Property::URL,TEST_RESOURCE_DIR "/Kid1.svg" ) - .Add( ImageVisual::Property::DESIRED_WIDTH,120 ) - .Add( ImageVisual::Property::DESIRED_HEIGHT,120 ) - .Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FILL ) - .Add( Visual::Property::TRANSFORM, - Property::Map().Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, - Vector2( Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE ) ) - .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2( 8, 8 ) ) ); - - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - application.GetScene().Add( imageView ); + imagePropertyMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE) + .Add(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/Kid1.svg") + .Add(ImageVisual::Property::DESIRED_WIDTH, 120) + .Add(ImageVisual::Property::DESIRED_HEIGHT, 120) + .Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FILL) + .Add(Visual::Property::TRANSFORM, + Property::Map().Add(Toolkit::Visual::Transform::Property::OFFSET_POLICY, + Vector2(Visual::Transform::Policy::ABSOLUTE, Visual::Transform::Policy::ABSOLUTE)) + .Add(Toolkit::Visual::Transform::Property::OFFSET, Vector2(8, 8))); + + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imagePropertyMap); + imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); // Check whether Image Visual transforms on ImageVieiw::OnRelayout() - Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView ); - Toolkit::Visual::Base imageVisual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - Property::Map resultMap; - imageVisual.CreatePropertyMap( resultMap ); + Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation(imageView); + Toolkit::Visual::Base imageVisual = DevelControl::GetVisual(controlImpl, ImageView::Property::IMAGE); + Property::Map resultMap; + imageVisual.CreatePropertyMap(resultMap); - Property::Value* transformValue = resultMap.Find( Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( transformValue ); + Property::Value* transformValue = resultMap.Find(Visual::Property::TRANSFORM); + DALI_TEST_CHECK(transformValue); Property::Map* retMap = transformValue->GetMap(); - DALI_TEST_CHECK( retMap ); + DALI_TEST_CHECK(retMap); // Image Visual should be positioned depending on ImageView's padding - DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET )->Get< Vector2 >(), Vector2( 8, 8 ), TEST_LOCATION ); - DALI_TEST_EQUALS( retMap->Find( Visual::Transform::Property::OFFSET_POLICY )->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET)->Get(), Vector2(8, 8), TEST_LOCATION); + DALI_TEST_EQUALS(retMap->Find(Visual::Transform::Property::OFFSET_POLICY)->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); END_TEST; } @@ -1419,13 +1660,13 @@ int UtcDaliImageViewUsingAtlasAndGetNaturalSize(void) ToolkitTestApplication application; // Check ImageView with background and main image, to ensure both visuals are marked as loaded - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_34_RGBA; - imageMap[ Toolkit::ImageVisual::Property::ATLASING ] = true; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - application.GetScene().Add( imageView ); + imageMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imageMap[Toolkit::ImageVisual::Property::URL] = gImage_34_RGBA; + imageMap[Toolkit::ImageVisual::Property::ATLASING] = true; + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); @@ -1433,8 +1674,8 @@ int UtcDaliImageViewUsingAtlasAndGetNaturalSize(void) Vector3 naturalSize = imageView.GetNaturalSize(); - DALI_TEST_EQUALS( naturalSize.width, 34.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( naturalSize.height, 34.0f, TEST_LOCATION ); + DALI_TEST_EQUALS(naturalSize.width, 34.0f, TEST_LOCATION); + DALI_TEST_EQUALS(naturalSize.height, 34.0f, TEST_LOCATION); END_TEST; } @@ -1443,38 +1684,38 @@ int UtcDaliImageViewFillMode(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual without padding and set the fill-mode to fill" ); + tet_infoline("Create an ImageVisual without padding and set the fill-mode to fill"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, DevelVisual::FittingMode::FILL ); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, DevelVisual::FittingMode::FILL); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2::ONE, TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Toolkit::Visual::Transform::Policy::RELATIVE); END_TEST; } @@ -1483,45 +1724,45 @@ int UtcDaliImageViewFittingModeFitKeepAspectRatio(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using FitKeepAspectRatio ( image: [600,600], view: [600,700] )" ); - tet_infoline( " There should be need to change the transform, offset is adjusted to fit inside"); + tet_infoline("Create an ImageVisual using FitKeepAspectRatio ( image: [600,600], view: [600,700] )"); + tet_infoline(" There should be need to change the transform, offset is adjusted to fit inside"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO ); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); // If there's - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 600), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 50 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 50), TEST_LOCATION); END_TEST; } @@ -1530,44 +1771,44 @@ int UtcDaliImageViewFittingModesFill(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using Fill ( image: [600,600], view: [600,700] )" ); - tet_infoline( " There should be no need to change the transform, only size is changed to fit view"); + tet_infoline("Create an ImageVisual using Fill ( image: [600,600], view: [600,700] )"); + tet_infoline(" There should be no need to change the transform, only size is changed to fit view"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::FILL ); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FILL); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2::ONE, TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Toolkit::Visual::Transform::Policy::RELATIVE); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero END_TEST; } @@ -1576,45 +1817,45 @@ int UtcDaliImageViewFittingModesOverfitKeepAspectRatio(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using OverFitKeepAspectRatio ( image: [600,600], view: [600,500] )" ); - tet_infoline( " offset or size is the same as view, but adjust internally using pixelArea "); + tet_infoline("Create an ImageVisual using OverFitKeepAspectRatio ( image: [600,600], view: [600,500] )"); + tet_infoline(" offset or size is the same as view, but adjust internally using pixelArea "); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO ); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(600,500) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 500)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); // If there's - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 500 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 500), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero END_TEST; } @@ -1623,44 +1864,44 @@ int UtcDaliImageViewFittingModesCenter01(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using Center ( image: [600,600], view: [700,700] )" ); - tet_infoline( " There should be need to change the transform, offset is adjusted to fit inside"); + tet_infoline("Create an ImageVisual using Center ( image: [600,600], view: [700,700] )"); + tet_infoline(" There should be need to change the transform, offset is adjusted to fit inside"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(700, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 50 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(50, 50), TEST_LOCATION); END_TEST; } @@ -1669,44 +1910,44 @@ int UtcDaliImageViewFittingModesCenter02(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using Center ( image: [600,600], view: [500,500] )" ); - tet_infoline( " There should be need to change the transform, offset is adjusted to fit inside"); + tet_infoline("Create an ImageVisual using Center ( image: [600,600], view: [500,500] )"); + tet_infoline(" There should be need to change the transform, offset is adjusted to fit inside"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(700, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 50 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(50, 50), TEST_LOCATION); END_TEST; } @@ -1715,43 +1956,43 @@ int UtcDaliImageViewFittingModesFitHeight01(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using FitHeight ( image: [600,600], view: [600,700] )" ); + tet_infoline("Create an ImageVisual using FitHeight ( image: [600,600], view: [600,700] )"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 700), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero END_TEST; } @@ -1760,43 +2001,43 @@ int UtcDaliImageViewFittingModesFitHeight02(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using FitHeight ( image: [600,600], view: [700,600] )" ); + tet_infoline("Create an ImageVisual using FitHeight ( image: [600,600], view: [700,600] )"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 249x169 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 249x169 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(700,600) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(700, 600)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(50, 0), TEST_LOCATION); END_TEST; } @@ -1805,43 +2046,43 @@ int UtcDaliImageViewFittingModesFitWidth01(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using FitWidth ( image: [600,600], view: [600,700] )" ); + tet_infoline("Create an ImageVisual using FitWidth ( image: [600,600], view: [600,700] )"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 600x600 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 50 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 50), TEST_LOCATION); END_TEST; } @@ -1850,43 +2091,43 @@ int UtcDaliImageViewFittingModesFitWidth02(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using FitWidth ( image: [600,600], view:[700,600] )" ); + tet_infoline("Create an ImageVisual using FitWidth ( image: [600,600], view:[700,600] )"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 249x169 image - imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH); + imageMap.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, gImage_600_RGB); // 249x169 image + imageMap.Add(DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH); - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(700,600) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(700, 600)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(700, 600), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero END_TEST; } @@ -1895,120 +2136,120 @@ int UtcDaliImageViewFittingModesChangeFittingMode01(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]" ); + tet_infoline("UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]"); ImageView imageView = ImageView::New(); // 1. Render using FittingMode::SHRINK_TO_FIT Property::Map imageMap; - imageMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; - imageMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; + imageMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imageMap[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB; + imageMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(700, 700), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(50, 0), TEST_LOCATION); // 2. Render again using DevelVisaul::CENTER Property::Map imageMap2; - imageMap2[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imageMap2[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; - imageMap2[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::CENTER; + imageMap2[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imageMap2[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB; + imageMap2[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::CENTER; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap2); + imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); // Trigger a potential relayout application.SendNotification(); application.Render(); returnedMap.Clear(); - visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); - visual.CreatePropertyMap( returnedMap ); + visual.CreatePropertyMap(returnedMap); - value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 100, 50 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(100, 50), TEST_LOCATION); // 3. Render again using before fittingMode Property::Map imageMap3; - imageMap3[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imageMap3[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; - imageMap3[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; + imageMap3[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imageMap3[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB; + imageMap3[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap3); + imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); returnedMap.Clear(); - visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - visual.CreatePropertyMap( returnedMap ); + visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + visual.CreatePropertyMap(returnedMap); - value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(700, 700), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(50, 0), TEST_LOCATION); END_TEST; } @@ -2017,120 +2258,120 @@ int UtcDaliImageViewFittingModesChangeFittingMode02(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]" ); + tet_infoline("UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]"); ImageView imageView = ImageView::New(); // 1. Render using FittingMode::OVER_FIT_KEEP_ASPECT_RATIO Property::Map imageMap; - imageMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; - imageMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO; + imageMap[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imageMap[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB; + imageMap[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 800, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(800, 700), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 0), TEST_LOCATION); // 2. Render again using DevelVisaul::CENTER Property::Map imageMap2; - imageMap2[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imageMap2[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; - imageMap2[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::CENTER; + imageMap2[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imageMap2[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB; + imageMap2[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::CENTER; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap2); + imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); // Trigger a potential relayout application.SendNotification(); application.Render(); returnedMap.Clear(); - visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); - visual.CreatePropertyMap( returnedMap ); + visual.CreatePropertyMap(returnedMap); - value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(600, 600), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 100, 50 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(100, 50), TEST_LOCATION); // 3. Render again using before fittingMode Property::Map imageMap3; - imageMap3[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; - imageMap3[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; - imageMap3[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO; + imageMap3[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + imageMap3[Toolkit::ImageVisual::Property::URL] = gImage_600_RGB; + imageMap3[DevelVisual::Property::VISUAL_FITTING_MODE] = Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO; - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap3); + imageView.SetProperty(Actor::Property::SIZE, Vector2(800, 700)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); returnedMap.Clear(); - visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - visual.CreatePropertyMap( returnedMap ); + visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + visual.CreatePropertyMap(returnedMap); - value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 800, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(800, 700), TEST_LOCATION); // Change the internal size according to the image view size - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE), TEST_LOCATION); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 0), TEST_LOCATION); END_TEST; } @@ -2139,259 +2380,257 @@ int UtcDaliImageViewFittingModesWithAnimatedVectorImageVisual(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using ScaleToFill and animated vector image ( image: [600,600], view:[600,600] )" ); + tet_infoline("Create an ImageVisual using SCALE_TO_FILL and animated vector image ( image: [600,600], view:[600,600] )"); - ImageView imageView = ImageView::New(); + ImageView imageView = ImageView::New(); Property::Map imageMap; - imageMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE ); - imageMap.Add( Toolkit::ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME ); // 249x169 image + imageMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE); + imageMap.Add(Toolkit::ImageVisual::Property::URL, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME); // 249x169 image - imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(600,600) ); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, imageMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(600, 600)); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); // Trigger a potential relayout application.SendNotification(); application.Render(); - Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); - Property::Map returnedMap; - visual.CreatePropertyMap( returnedMap ); + Toolkit::Visual::Base visual = DevelControl::GetVisual(Toolkit::Internal::GetImplementation(imageView), Toolkit::ImageView::Property::IMAGE); + Property::Map returnedMap; + visual.CreatePropertyMap(returnedMap); - Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); - DALI_TEST_CHECK( value ); + Property::Value* value = returnedMap.Find(Toolkit::Visual::Property::TRANSFORM); + DALI_TEST_CHECK(value); Property::Map* map = value->GetMap(); - DALI_TEST_CHECK( map ); + DALI_TEST_CHECK(map); - value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); // Relative size so will take up 100% + value = map->Find(Toolkit::Visual::Transform::Property::SIZE); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2::ONE, TEST_LOCATION); // Relative size so will take up 100% - value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); - DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE ); + value = map->Find(Toolkit::Visual::Transform::Property::SIZE_POLICY); + DALI_TEST_CHECK(value); + DALI_TEST_CHECK(value->Get() == Toolkit::Visual::Transform::Policy::RELATIVE); - value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); - DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + value = map->Find(Toolkit::Visual::Transform::Property::OFFSET); + DALI_TEST_CHECK(value); + DALI_TEST_EQUALS(value->Get(), Vector2(0, 0), TEST_LOCATION); // OFFSET is zero END_TEST; } - int UtcDaliImageViewCustomShader(void) { ToolkitTestApplication application; // Set a custom shader with an image url { - Property::Map properties; - Property::Map shader; - const std::string vertexShader = "Foobar"; - const std::string fragmentShader = "Foobar"; + Property::Map properties; + Property::Map shader; + const std::string vertexShader = "Foobar"; + const std::string fragmentShader = "Foobar"; shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; - properties[Visual::Property::TYPE] = Visual::IMAGE; - properties[Visual::Property::SHADER] = shader; + properties[Visual::Property::TYPE] = Visual::IMAGE; + properties[Visual::Property::SHADER] = shader; properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); + imageView.SetProperty(ImageView::Property::IMAGE, properties); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - Renderer renderer = imageView.GetRendererAt( 0 ); - Shader shader2 = renderer.GetShader(); - Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Renderer renderer = imageView.GetRendererAt(0); + Shader shader2 = renderer.GetShader(); + Property::Value value = shader2.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_EQUALS(fragmentShader, fragment->Get(), TEST_LOCATION); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS(vertexShader, vertex->Get(), TEST_LOCATION); } // Set a custom shader after setting an image url { - Property::Map properties; - Property::Map shader; - const std::string vertexShader = "Foobar"; - const std::string fragmentShader = "Foobar"; + Property::Map properties; + Property::Map shader; + const std::string vertexShader = "Foobar"; + const std::string fragmentShader = "Foobar"; shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; properties[Visual::Property::SHADER] = shader; - ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME ); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); + ImageView imageView = ImageView::New(TEST_IMAGE_FILE_NAME); + imageView.SetProperty(ImageView::Property::IMAGE, properties); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - Renderer renderer = imageView.GetRendererAt( 0 ); - Shader shader2 = renderer.GetShader(); - Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Renderer renderer = imageView.GetRendererAt(0); + Shader shader2 = renderer.GetShader(); + Property::Value value = shader2.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_EQUALS(fragmentShader, fragment->Get(), TEST_LOCATION); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS(vertexShader, vertex->Get(), TEST_LOCATION); } // Set a custom shader before setting an image url { - Property::Map properties; - Property::Map shader; - const std::string vertexShader = "Foobar"; - const std::string fragmentShader = "Foobar"; + Property::Map properties; + Property::Map shader; + const std::string vertexShader = "Foobar"; + const std::string fragmentShader = "Foobar"; shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; properties[Visual::Property::SHADER] = shader; ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); - imageView.SetProperty( ImageView::Property::IMAGE, TEST_IMAGE_FILE_NAME ); + imageView.SetProperty(ImageView::Property::IMAGE, properties); + imageView.SetProperty(ImageView::Property::IMAGE, TEST_IMAGE_FILE_NAME); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - Renderer renderer = imageView.GetRendererAt( 0 ); - Shader shader2 = renderer.GetShader(); - Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Renderer renderer = imageView.GetRendererAt(0); + Shader shader2 = renderer.GetShader(); + Property::Value value = shader2.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_EQUALS(fragmentShader, fragment->Get(), TEST_LOCATION); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS(vertexShader, vertex->Get(), TEST_LOCATION); } // Set a custom shader after setting a property map { - Property::Map properties; - Property::Map shader; - const std::string vertexShader = "Foobar"; - const std::string fragmentShader = "Foobar"; + Property::Map properties; + Property::Map shader; + const std::string vertexShader = "Foobar"; + const std::string fragmentShader = "Foobar"; shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; properties[Visual::Property::SHADER] = shader; Property::Map properties1; - properties1[Visual::Property::TYPE] = Visual::IMAGE; + properties1[Visual::Property::TYPE] = Visual::IMAGE; properties1[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, properties1 ); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); + imageView.SetProperty(ImageView::Property::IMAGE, properties1); + imageView.SetProperty(ImageView::Property::IMAGE, properties); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - Renderer renderer = imageView.GetRendererAt( 0 ); - Shader shader2 = renderer.GetShader(); - Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Renderer renderer = imageView.GetRendererAt(0); + Shader shader2 = renderer.GetShader(); + Property::Value value = shader2.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_EQUALS(fragmentShader, fragment->Get(), TEST_LOCATION); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS(vertexShader, vertex->Get(), TEST_LOCATION); } // Set a custom shader before setting a property map { - Property::Map properties; - Property::Map shader; - const std::string vertexShader = "Foobar"; - const std::string fragmentShader = "Foobar"; + Property::Map properties; + Property::Map shader; + const std::string vertexShader = "Foobar"; + const std::string fragmentShader = "Foobar"; shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; properties[Visual::Property::SHADER] = shader; Property::Map properties1; - properties1[Visual::Property::TYPE] = Visual::IMAGE; + properties1[Visual::Property::TYPE] = Visual::IMAGE; properties1[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); - imageView.SetProperty( ImageView::Property::IMAGE, properties1 ); + imageView.SetProperty(ImageView::Property::IMAGE, properties); + imageView.SetProperty(ImageView::Property::IMAGE, properties1); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - Renderer renderer = imageView.GetRendererAt( 0 ); - Shader shader2 = renderer.GetShader(); - Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Renderer renderer = imageView.GetRendererAt(0); + Shader shader2 = renderer.GetShader(); + Property::Value value = shader2.GetProperty(Shader::Property::PROGRAM); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp + DALI_TEST_EQUALS(fragmentShader, fragment->Get(), TEST_LOCATION); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); + Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS(vertexShader, vertex->Get(), TEST_LOCATION); } END_TEST; } - namespace { static int gFailCounter = 0; -const int MAX_RETRIES(3); +const int MAX_RETRIES(3); void ReloadImage(ImageView imageView) { Property::Map imageImmediateLoadingMap; - imageImmediateLoadingMap[ ImageVisual::Property::URL ] = "Non-existant-image.jpg"; - imageImmediateLoadingMap[ ImageVisual::Property::LOAD_POLICY ] = ImageVisual::LoadPolicy::IMMEDIATE; + imageImmediateLoadingMap[ImageVisual::Property::URL] = "Non-existant-image.jpg"; + imageImmediateLoadingMap[ImageVisual::Property::LOAD_POLICY] = ImageVisual::LoadPolicy::IMMEDIATE; tet_infoline("Immediate load an image"); - imageView.SetProperty( ImageView::Property::IMAGE, imageImmediateLoadingMap ); + imageView.SetProperty(ImageView::Property::IMAGE, imageImmediateLoadingMap); } -void ResourceFailedReload( Control control ) +void ResourceFailedReload(Control control) { gFailCounter++; - if( gFailCounter < MAX_RETRIES ) + if(gFailCounter < MAX_RETRIES) { ReloadImage(ImageView::DownCast(control)); } } -} +} // namespace int UtcDaliImageViewReloadFailedOnResourceReadySignal(void) { @@ -2402,24 +2641,24 @@ int UtcDaliImageViewReloadFailedOnResourceReadySignal(void) gFailCounter = 0; ImageView imageView = ImageView::New(); - imageView.ResourceReadySignal().Connect( &ResourceFailedReload ); - DALI_TEST_EQUALS( gFailCounter, 0, TEST_LOCATION ); + imageView.ResourceReadySignal().Connect(&ResourceFailedReload); + DALI_TEST_EQUALS(gFailCounter, 0, TEST_LOCATION); ReloadImage(imageView); // loading started, this waits for the loader thread to complete - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); - DALI_TEST_EQUALS( gFailCounter, 1, TEST_LOCATION ); + DALI_TEST_EQUALS(gFailCounter, 1, TEST_LOCATION); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); - DALI_TEST_EQUALS( gFailCounter, 2, TEST_LOCATION ); + DALI_TEST_EQUALS(gFailCounter, 2, TEST_LOCATION); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); - DALI_TEST_EQUALS( gFailCounter, 3, TEST_LOCATION ); + DALI_TEST_EQUALS(gFailCounter, 3, TEST_LOCATION); END_TEST; } @@ -2429,30 +2668,58 @@ int UtcDaliImageViewLoadRemoteSVG(void) tet_infoline("Test load from a remote server."); ToolkitTestApplication application; - Toolkit::ImageView imageView; - imageView = Toolkit::ImageView::New( ); - imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg"); - // Victor. Temporary (or permanent?) update as the url above seems not to work from time to time ... - imageView.SetImage("https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/SVG_logo.svg/64px-SVG_logo.svg.png"); - imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - imageView.SetProperty( Actor::Property::SIZE, Vector2(300, 300) ); - imageView.SetProperty( Actor::Property::POSITION, Vector3( 150.0f , 150.0f , 0.0f ) ); - application.GetScene().Add( imageView ); + { + Toolkit::ImageView imageView; + imageView = Toolkit::ImageView::New(); + imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg"); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imageView.SetProperty(Actor::Property::SIZE, Vector2(300, 300)); + imageView.SetProperty(Actor::Property::POSITION, Vector3(150.0f, 150.0f, 0.0f)); - DALI_TEST_CHECK( imageView ); + application.GetScene().Add(imageView); - DALI_TEST_EQUALS( imageView.GetRendererCount(), 0u, TEST_LOCATION ); + DALI_TEST_CHECK(imageView); - application.SendNotification(); + DALI_TEST_EQUALS(imageView.GetRendererCount(), 0u, TEST_LOCATION); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + application.SendNotification(); - application.SendNotification(); - application.Render(); + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + } + + // Without size set + { + Toolkit::ImageView imageView; + imageView = Toolkit::ImageView::New(); + imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg"); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imageView.SetProperty(Actor::Property::POSITION, Vector3(150.0f, 150.0f, 0.0f)); + + application.GetScene().Add(imageView); + + DALI_TEST_CHECK(imageView); + + DALI_TEST_EQUALS(imageView.GetRendererCount(), 0u, TEST_LOCATION); + + application.SendNotification(); + + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); - DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + } END_TEST; } @@ -2463,31 +2730,24 @@ int UtcDaliImageViewSyncSVGLoading(void) tet_infoline("ImageView Testing SVG image sync loading"); - // Sync loading, automatic atlasing for small size image { - TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); - callStack.Reset(); - callStack.Enable(true); - - ImageView imageView = ImageView::New( ); + ImageView imageView = ImageView::New(); // Sync loading is used Property::Map syncLoadingMap; - syncLoadingMap.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - syncLoadingMap.Insert( Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg" ); - syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, true); - imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); + syncLoadingMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + syncLoadingMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg"); + syncLoadingMap.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, true); + imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap); - application.GetScene().Add( imageView ); - DALI_TEST_CHECK( imageView ); + application.GetScene().Add(imageView); + DALI_TEST_CHECK(imageView); application.SendNotification(); - application.Render(16); Vector3 naturalSize = imageView.GetNaturalSize(); - DALI_TEST_EQUALS( naturalSize.width, 100.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( naturalSize.height, 100.0f, TEST_LOCATION ); - + DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION); + DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION); } END_TEST; } @@ -2498,30 +2758,29 @@ int UtcDaliImageViewAsyncSVGLoading(void) tet_infoline("ImageView Testing SVG image async loading"); - // Sync loading, automatic atlasing for small size image { - TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); - callStack.Reset(); - callStack.Enable(true); + ImageView imageView = ImageView::New(); - ImageView imageView = ImageView::New( ); + // Async loading is used - default value of SYNCHRONOUS_LOADING is false. + Property::Map propertyMap; + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + propertyMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg"); + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); - // Sync loading is used - Property::Map syncLoadingMap; - syncLoadingMap.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - syncLoadingMap.Insert( Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg" ); - syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, false); - imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); + application.GetScene().Add(imageView); + DALI_TEST_CHECK(imageView); + + application.SendNotification(); - application.GetScene().Add( imageView ); - DALI_TEST_CHECK( imageView ); + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); - Vector3 naturalSize = imageView.GetNaturalSize(); - DALI_TEST_EQUALS( naturalSize.width, 100.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( naturalSize.height, 100.0f, TEST_LOCATION ); + Vector3 naturalSize = imageView.GetNaturalSize(); + DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION); + DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION); } END_TEST; } @@ -2532,124 +2791,757 @@ int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void) tet_infoline("ImageView Testing SVG image async loading"); - // Sync loading, automatic atlasing for small size image + // Sync loading { - TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); - callStack.Reset(); - callStack.Enable(true); - - ImageView imageView = ImageView::New( ); + ImageView imageView = ImageView::New(); // Sync loading is used Property::Map syncLoadingMap; - syncLoadingMap.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - syncLoadingMap.Insert( Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg" ); + syncLoadingMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + syncLoadingMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg"); // Check to set invalid value // The SYNCHRONOUS_LOADING property must be set to the bool value. // Check if error log is outputted when setting other value like string. // Even if the wrong value is set, the image will be shown normally, and the synchronous value should be the default value(false). - syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, std::to_string(5) ); - imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); + syncLoadingMap.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, std::to_string(5)); + imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap); + + application.GetScene().Add(imageView); + DALI_TEST_CHECK(imageView); - application.GetScene().Add( imageView ); - DALI_TEST_CHECK( imageView ); + application.SendNotification(); + + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); - Vector3 naturalSize = imageView.GetNaturalSize(); - DALI_TEST_EQUALS( naturalSize.width, 100.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( naturalSize.height, 100.0f, TEST_LOCATION ); - Property::Value value = imageView.GetProperty( ImageView::Property::IMAGE ); - Property::Map* map = value.GetMap(); - DALI_TEST_CHECK( map ); + Vector3 naturalSize = imageView.GetNaturalSize(); + DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION); + DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION); - Property::Value* sync = map->Find( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING ); - DALI_TEST_CHECK( sync ); - DALI_TEST_EQUALS( false, sync->Get< bool >(), TEST_LOCATION ); + Property::Value value = imageView.GetProperty(ImageView::Property::IMAGE); + Property::Map* map = value.GetMap(); + DALI_TEST_CHECK(map); + Property::Value* sync = map->Find(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING); + DALI_TEST_CHECK(sync); + DALI_TEST_EQUALS(false, sync->Get(), TEST_LOCATION); } END_TEST; } -int UtcDaliImageViewSvgLoadingFailure(void) +int UtcDaliImageViewSvgLoadingFailureLocalFile(void) { - ToolkitTestApplication application; - - // Local svg file + // Local svg file - invalid file path { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + gResourceReadySignalFired = false; - ImageView imageView = ImageView::New( TEST_RESOURCE_DIR "/Kid1.svg" ); - imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - imageView.ResourceReadySignal().Connect( &ResourceReadySignal); + ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/foo.svg"); + imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); - DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); - // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + // loading started, this waits for the loader thread - load + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::FAILED, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); } - // Remote svg file + // Local svg file - invalid file path without size set { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + gResourceReadySignalFired = false; + textureTrace.Reset(); - ImageView imageView = ImageView::New( "https://bar.org/foobar.svg" ); - imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); - imageView.ResourceReadySignal().Connect( &ResourceReadySignal); + ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/foo.svg"); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); - DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); + DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION); - application.GetScene().Add( imageView ); + application.GetScene().Add(imageView); application.SendNotification(); - // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + // loading started, this waits for the loader thread - load & rasterize + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetVisualResourceStatus( ImageView::Property::IMAGE ), Visual::ResourceStatus::FAILED, TEST_LOCATION ); + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); } - END_TEST; -} + // Local svg file - invalid file + { + ToolkitTestApplication application; -namespace -{ + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); -static int gResourceReadySignalCounter = 0; + gResourceReadySignalFired = false; + textureTrace.Reset(); -void OnResourceReadySignal( Control control ) + ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/invalid.svg"); + imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); + + DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION); + + application.GetScene().Add(imageView); + + application.SendNotification(); + + // loading started, this waits for the loader thread - load & rasterize + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + } + + END_TEST; +} + +int UtcDaliImageViewSvgLoadingFailureRemoteFile01(void) +{ + // Remote svg file + { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + gResourceReadySignalFired = false; + + ImageView imageView = ImageView::New("https://127.0.0.1/foobar.svg"); + imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); + + DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION); + + application.GetScene().Add(imageView); + + application.SendNotification(); + + // loading started, this waits for the loader thread - load & rasterize + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + } + + END_TEST; +} + +int UtcDaliImageViewSvgLoadingFailureRemoteFile02(void) +{ + // Remote svg file without size set + { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + gResourceReadySignalFired = false; + + ImageView imageView = ImageView::New("https://127.0.0.1/foobar.svg"); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); + + DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION); + + application.GetScene().Add(imageView); + + application.SendNotification(); + + // loading started, this waits for the loader thread - load & rasterize + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + } + + END_TEST; +} + +int UtcDaliImageViewSvgRasterizationFailure(void) +{ + ToolkitTestApplication application; + + gResourceReadySignalFired = false; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/invalid1.svg"); + imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + imageView.ResourceReadySignal().Connect(&ResourceReadySignal); + + DALI_TEST_EQUALS(imageView.IsResourceReady(), false, TEST_LOCATION); + + application.GetScene().Add(imageView); + + application.SendNotification(); + + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewSvgChageSize(void) +{ + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + ImageView imageView = ImageView::New(TEST_SVG_FILE_NAME); + application.GetScene().Add(imageView); + + application.SendNotification(); + + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + DALI_TEST_EQUALS(Test::VectorImageRenderer::GetLoadCount(), 1, TEST_LOCATION); + + // Change actor size, then rasterization should be done again + imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + + application.SendNotification(); + + // Wait for rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + // We should not load the file again. + DALI_TEST_EQUALS(Test::VectorImageRenderer::GetLoadCount(), 1, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewSvgAtlasing(void) +{ + ToolkitTestApplication application; + + TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); + callStack.Reset(); + callStack.Enable(true); + + Property::Map propertyMap; + propertyMap["url"] = TEST_SVG_FILE_NAME; + propertyMap["atlasing"] = true; + + ImageView imageView = ImageView::New(); + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f)); + application.GetScene().Add(imageView); + + application.SendNotification(); + + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + // use atlas + TraceCallStack::NamedParams params1; + params1["width"] << 100; + params1["height"] << 100; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params1), true, TEST_LOCATION); + + imageView.SetProperty(Actor::Property::SIZE, Vector2(600.f, 600.f)); + + application.SendNotification(); + + // Wait for rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + callStack.Reset(); + + application.SendNotification(); + application.Render(16); + + // not use atlas + TraceCallStack::NamedParams params2; + params2["width"] << 600; + params2["height"] << 600; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexImage2D", params2), true, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewTVGLoading(void) +{ + ToolkitTestApplication application; + + tet_infoline("ImageView Testing TVG image loading"); + + { + ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/test.tvg"); + application.GetScene().Add(imageView); + DALI_TEST_CHECK(imageView); + + application.SendNotification(); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + Vector3 naturalSize = imageView.GetNaturalSize(); + + DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION); + DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION); + } + END_TEST; +} + +int UtcDaliImageViewImageLoadFailure01(void) +{ + ToolkitTestApplication application; + + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_S); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_M); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L); + + std::string brokenUrl; + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_S, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_M, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_L, brokenUrl, TEST_LOCATION); + + ImageView imageView = ImageView::New("invalidUrl.png"); + imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewImageLoadFailure02(void) +{ + ToolkitTestApplication application; + + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_DEFAULT); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_M); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L); + + std::string brokenUrl; + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_DEFAULT, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_M, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_L, brokenUrl, TEST_LOCATION); + + ImageView imageView = ImageView::New("invalidUrl.png"); + imageView.SetProperty(Actor::Property::SIZE, Vector2(30.f, 30.f)); + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewImageLoadFailure03(void) +{ + ToolkitTestApplication application; + + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_01); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_02); + + std::string brokenUrl; + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_01, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_02, brokenUrl, TEST_LOCATION); + + ImageView imageView = ImageView::New("invalidUrl.png"); + imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f)); + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewImageLoadFailure04(void) +{ + ToolkitTestApplication application; + + ImageView imageView = ImageView::New("invalidUrl.png"); + imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f)); + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_S); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, "invalidBroken.png"); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L); + + ImageView imageView2 = ImageView::New("invalidUrl.png"); + imageView2.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f)); + application.GetScene().Add(imageView2); + + std::string brokenUrl; + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_S, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE); + DALI_TEST_EQUALS(TEST_BROKEN_IMAGE_L, brokenUrl, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, "invalidBroken.9.png"); + + ImageView imageView3 = ImageView::New("invalidUrl.png"); + imageView3.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f)); + application.GetScene().Add(imageView3); + + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + END_TEST; +} + +namespace +{ +static int gResourceReadySignalCounter = 0; + +void OnResourceReadySignal01(Control control) +{ + gResourceReadySignalCounter++; + + if(control.GetVisualResourceStatus(ImageView::Property::IMAGE) == Visual::ResourceStatus::READY) + { + if(gResourceReadySignalCounter == 1) + { + // Set image twice + // It makes the first new visual be deleted immediately + ImageView::DownCast(control).SetImage(gImage_34_RGBA); + ImageView::DownCast(control).SetImage(gImage_34_RGBA); + } + } + else if(control.GetVisualResourceStatus(ImageView::Property::IMAGE) == Visual::ResourceStatus::FAILED) + { + // Make the resource ready immediately + control[ImageView::Property::IMAGE] = gImage_600_RGB; + } +} + +void OnResourceReadySignal02(Control control) +{ + if(++gResourceReadySignalCounter == 1) + { + // It makes the first new visual be deleted immediately + // The first image will not be loaded. + control[ImageView::Property::IMAGE] = Property::Map().Add(ImageVisual::Property::URL, gImage_600_RGB).Add(ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER); + control[ImageView::Property::IMAGE] = TEST_IMAGE_1; + } +} + +ImageView gImageView1; +ImageView gImageView2; +ImageView gImageView3; +ImageView gImageView4; + +void OnResourceReadySignal03(Control control) +{ + if(gResourceReadySignalCounter == 0) + { + // Queue loading + // 1. Use cached image, then LoadComplete will be called right after OnResourceReadySignal03. + gImageView2[ImageView::Property::IMAGE] = gImage_34_RGBA; + + // 2. Load a new image + gImageView3[ImageView::Property::IMAGE] = TEST_IMAGE_1; + + // 3. Use the new image again + gImageView1[ImageView::Property::IMAGE] = TEST_IMAGE_1; + gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal03); + } + else if(gResourceReadySignalCounter == 1) + { + // This is called from TextureManager::ProcessQueuedTextures(). + gImageView1.Unparent(); + gImageView1.Reset(); + } + gResourceReadySignalCounter++; +} + +void OnSimpleResourceReadySignal(Control control) +{ + // simply increate counter + gResourceReadySignalCounter++; +} + +int gResourceReadySignal04ComesOrder = 0; + +void OnResourceReadySignal04(Control control) +{ + gResourceReadySignalCounter++; + tet_printf("rc %d\n", gResourceReadySignalCounter); + if(gResourceReadySignalCounter == 1) + { + auto scene = gImageView1.GetParent(); + + // Request load something + // We hope this request result is return later than gImageView2. + gImageView3 = ImageView::New(TEST_IMAGE_1); + gImageView3.ResourceReadySignal().Connect(&OnResourceReadySignal04); + scene.Add(gImageView3); + gImageView4 = ImageView::New(TEST_IMAGE_2); + gImageView4.ResourceReadySignal().Connect(&OnResourceReadySignal04); + scene.Add(gImageView4); + + if(control == gImageView1) + { + gResourceReadySignal04ComesOrder = 1; + } + else + { + gResourceReadySignal04ComesOrder = 2; + } + } + if(gResourceReadySignalCounter == 2) + { + if(gResourceReadySignal04ComesOrder == 1 && control == gImageView2) + { + // Scene off first one. + gImageView1.Unparent(); + + // Scene off second one. + gImageView2.Unparent(); + } + else if(gResourceReadySignal04ComesOrder == 2 && control == gImageView1) + { + // Scene off first one. + gImageView2.Unparent(); + + // Scene off second one. + gImageView1.Unparent(); + } + else + { + // We can't check that this utc fail case. just pass always when we come here. + gResourceReadySignal04ComesOrder = -1; + } + + // If we don't seperate index of FreeList area + // and if we don't queue remove during obversing, + // cache index become something invalid data. + // In this case, some strange observer can be called. + // For example, gImageView4.LoadComplete will be called. + } +} + +void OnResourceReadySignal05(Control control) { gResourceReadySignalCounter++; - if( gResourceReadySignalCounter == 1 ) + // Request load with same image + // NOTE : The url must not be same as gImageView1 + const int viewCount = 4; + for(int i = 0; i < viewCount; ++i) { - // Set image twice - ImageView::DownCast( control ).SetImage( gImage_34_RGBA ); - ImageView::DownCast( control ).SetImage( gImage_34_RGBA ); + gImageView1.Add(ImageView::New("invalid2.jpg")); } } +} // namespace + +int UtcDaliImageViewSetImageOnResourceReadySignal01(void) +{ + tet_infoline("Test setting image from within signal handler."); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + ImageView imageView = ImageView::New(gImage_34_RGBA); + imageView.ResourceReadySignal().Connect(&OnResourceReadySignal01); + + application.GetScene().Add(imageView); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION); + + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + + // Create a new ImageView to cache the image + ImageView imageView1 = ImageView::New(gImage_600_RGB); + application.GetScene().Add(imageView1); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + // Reset count + gResourceReadySignalCounter = 0; + + imageView[ImageView::Property::IMAGE] = "invalid.jpg"; + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + // Run idle callback + application.RunIdles(); + + DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION); + + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewSetImageOnResourceReadySignal02(void) +{ + tet_infoline("Test setting image from within signal handler."); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + ImageView imageView = ImageView::New(gImage_34_RGBA); + imageView.ResourceReadySignal().Connect(&OnResourceReadySignal02); + + application.GetScene().Add(imageView); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + // Wait for loading an image + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION); + + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + + END_TEST; } -int UtcDaliImageViewSetImageOnResourceReadySignal(void) +int UtcDaliImageViewSetImageOnResourceReadySignal03(void) { tet_infoline("Test setting image from within signal handler."); @@ -2657,19 +3549,341 @@ int UtcDaliImageViewSetImageOnResourceReadySignal(void) gResourceReadySignalCounter = 0; - ImageView imageView = ImageView::New( gImage_34_RGBA ); - imageView.ResourceReadySignal().Connect( &OnResourceReadySignal ); + gImageView1 = ImageView::New(gImage_34_RGBA); + application.GetScene().Add(gImageView1); + + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - application.GetScene().Add( imageView ); + gImageView2 = ImageView::New(gImage_600_RGB); + gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal03); + application.GetScene().Add(gImageView2); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + gImageView3 = ImageView::New(); + application.GetScene().Add(gImageView3); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION ); + END_TEST; +} + +int UtcDaliImageViewOnResourceReadySignalWithBrokenAlphaMask01(void) +{ + tet_infoline("Test signal handler when image / mask image is broken."); + + ToolkitTestApplication application; + + auto TestResourceReadyUrl = [&application](int eventTriggerCount, bool isSynchronous, const std::string& url, const std::string& mask, const char* location) { + gResourceReadySignalCounter = 0; + + Property::Map map; + map[Toolkit::ImageVisual::Property::URL] = url; + if(!mask.empty()) + { + map[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = mask; + } + map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = isSynchronous; + + ImageView imageView = ImageView::New(); + imageView[Toolkit::ImageView::Property::IMAGE] = map; + imageView[Actor::Property::SIZE] = Vector2(100.0f, 200.0f); + imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal); + + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(); + + if(!isSynchronous) + { + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(eventTriggerCount), true, location); + } + tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location); + + imageView.Unparent(); + }; + + for(int synchronous = 0; synchronous <= 1; synchronous++) + { + tet_printf("Test normal case (sync:%d)\n", synchronous); + TestResourceReadyUrl(1, synchronous, gImage_600_RGB, "", TEST_LOCATION); + TestResourceReadyUrl(3, synchronous, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); // 3 event trigger required : 2 image load + 1 apply mask + + tet_printf("Test broken image case (sync:%d)\n", synchronous); + TestResourceReadyUrl(1, synchronous, "invalid.jpg", "", TEST_LOCATION); + TestResourceReadyUrl(2, synchronous, "invalid.jpg", gImage_34_RGBA, TEST_LOCATION); + + tet_printf("Test broken mask image case (sync:%d)\n", synchronous); + TestResourceReadyUrl(2, synchronous, gImage_600_RGB, "invalid.png", TEST_LOCATION); + + tet_printf("Test broken both image, mask image case (sync:%d)\n", synchronous); + TestResourceReadyUrl(2, synchronous, "invalid.jpg", "invalid.png", TEST_LOCATION); + } + + END_TEST; +} + +int UtcDaliImageViewOnResourceReadySignalWithBrokenAlphaMask02(void) +{ + tet_infoline("Test signal handler when image try to use cached-and-broken mask image."); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + auto TestBrokenMaskResourceReadyUrl = [&application](const std::string& url, const char* location) { + Property::Map map; + map[Toolkit::ImageVisual::Property::URL] = url; + // Use invalid mask url + map[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = "invalid.png"; + + ImageView imageView = ImageView::New(); + imageView[Toolkit::ImageView::Property::IMAGE] = map; + imageView[Actor::Property::SIZE] = Vector2(100.0f, 200.0f); + imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal); + + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(); + + // Don't unparent imageView, for keep the cache. + }; + + // Use more than 4 images (The number of LocalImageLoadThread) + const std::vector testUrlList = {gImage_34_RGBA, gImage_600_RGB, "invalid.jpg" /* invalid url */, TEST_IMAGE_1, TEST_IMAGE_2, TEST_BROKEN_IMAGE_DEFAULT}; + + int expectResourceReadySignalCounter = 0; + + for(auto& url : testUrlList) + { + TestBrokenMaskResourceReadyUrl(url, TEST_LOCATION); + expectResourceReadySignalCounter++; + } + + // Remain 1 signal due to we use #URL + 1 mask image. + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(expectResourceReadySignalCounter + 1), true, TEST_LOCATION); + + DALI_TEST_EQUALS(gResourceReadySignalCounter, expectResourceReadySignalCounter, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) +{ + tet_infoline("Test signal handler various case."); + + auto TestResourceReadyUrl = [](int eventTriggerCount, bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& mask, const char* location) { + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + Property::Map map; + map[Toolkit::ImageVisual::Property::URL] = url; + if(!mask.empty()) + { + map[Toolkit::ImageVisual::Property::ALPHA_MASK_URL] = mask; + } + map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = isSynchronous; + + ImageView imageView = ImageView::New(); + imageView[Toolkit::ImageView::Property::IMAGE] = map; + imageView[Actor::Property::SIZE] = Vector2(100.0f, 200.0f); + imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal); + + application.GetScene().Add(imageView); + application.SendNotification(); + application.Render(); + + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(eventTriggerCount), true, location); + + tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE), loadSuccess ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED, location); + + imageView.Unparent(); + }; + + auto TestAuxiliaryResourceReadyUrl = [](bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& auxiliaryUrl, const char* location) { + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + Property::Map map; + map[Toolkit::ImageVisual::Property::URL] = url; + map[Toolkit::DevelImageVisual::Property::AUXILIARY_IMAGE] = auxiliaryUrl; + map[Toolkit::DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA] = 0.5f; + map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = isSynchronous; + + ImageView imageView = ImageView::New(); + imageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map); + imageView.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 200.0f)); + imageView.ResourceReadySignal().Connect(&OnSimpleResourceReadySignal); + application.GetScene().Add(imageView); + + application.SendNotification(); + application.Render(); + + if(!isSynchronous) + { + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, location); + } + + tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE), loadSuccess ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION); + + imageView.Unparent(); + }; + + // Case 1 : asynchronous loading + tet_printf("Test invalid single simple image Asynchronous\n"); + + // Test normal case + TestResourceReadyUrl(1, 0, 1, gImage_600_RGB, "", TEST_LOCATION); + TestResourceReadyUrl(2, 0, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // load & rasterize + TestResourceReadyUrl(1, 0, 1, TEST_BROKEN_IMAGE_L, "", TEST_LOCATION); + + TestResourceReadyUrl(2, 0, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION); // 2 image loading - batch size + TestResourceReadyUrl(2, 0, 1, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME, "", TEST_LOCATION); // load & rasterize + + TestResourceReadyUrl(3, 0, 1, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); // 2 image loading + 1 applymask + + TestAuxiliaryResourceReadyUrl(0, 1, TEST_BROKEN_IMAGE_L, gImage_34_RGBA, TEST_LOCATION); + + // Test broken case + TestResourceReadyUrl(1, 0, 0, "invalid.jpg", "", TEST_LOCATION); + TestResourceReadyUrl(1, 0, 0, "invalid.svg", "", TEST_LOCATION); + TestResourceReadyUrl(1, 0, 0, "invalid.9.png", "", TEST_LOCATION); + TestResourceReadyUrl(1, 0, 0, "invalid.gif", "", TEST_LOCATION); // 1 image loading + TestResourceReadyUrl(1, 0, 0, "invalid.json", "", TEST_LOCATION); // 0 rasterize + + TestResourceReadyUrl(2, 0, 0, "invalid.jpg", "invalid.png", TEST_LOCATION); // 2 image loading + TestResourceReadyUrl(2, 0, 1, gImage_600_RGB, "invalid.png", TEST_LOCATION); // 2 image loading + TestResourceReadyUrl(2, 0, 0, "invalid.jpg", gImage_34_RGBA, TEST_LOCATION); // 2 image loading + + TestAuxiliaryResourceReadyUrl(0, 0, "invalid.9.png", "invalid.png", TEST_LOCATION); + TestAuxiliaryResourceReadyUrl(0, 1, TEST_BROKEN_IMAGE_L, "invalid.png", TEST_LOCATION); + TestAuxiliaryResourceReadyUrl(0, 0, "invalid.9.png", gImage_34_RGBA, TEST_LOCATION); + + // Case 2 : Synchronous loading + tet_printf("Test invalid single simple image Synchronous\n"); + + // Test normal case + TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, "", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // synchronous rasterize + TestResourceReadyUrl(0, 1, 1, TEST_BROKEN_IMAGE_L, "", TEST_LOCATION); + + TestResourceReadyUrl(1, 1, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION); // first frame image loading sync + second frame image loading async + + TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); + + TestAuxiliaryResourceReadyUrl(1, 1, TEST_BROKEN_IMAGE_L, gImage_34_RGBA, TEST_LOCATION); + + // Test broken case + TestResourceReadyUrl(0, 1, 0, "invalid.jpg", "", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 0, "invalid.svg", "", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 0, "invalid.9.png", "", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 0, "invalid.gif", "", TEST_LOCATION); + + TestResourceReadyUrl(0, 1, 0, "invalid.jpg", "invalid.png", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, "invalid.png", TEST_LOCATION); + TestResourceReadyUrl(0, 1, 0, "invalid.jpg", gImage_34_RGBA, TEST_LOCATION); + + TestAuxiliaryResourceReadyUrl(1, 0, "invalid.9.png", "invalid.png", TEST_LOCATION); + TestAuxiliaryResourceReadyUrl(1, 1, TEST_BROKEN_IMAGE_L, "invalid.png", TEST_LOCATION); + TestAuxiliaryResourceReadyUrl(1, 0, "invalid.9.png", gImage_34_RGBA, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewSetImageOnResourceReadySignal04(void) +{ + tet_infoline("Test texturemanager's remove queue works well within signal handler."); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + gResourceReadySignal04ComesOrder = 0; + + gImageView1 = ImageView::New("invalid.jpg"); // request invalid image, to make loading failed fast. + gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal04); + application.GetScene().Add(gImageView1); + + gImageView2 = ImageView::New("invalid.png"); // request invalid image, to make loading failed fast. + gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal04); + application.GetScene().Add(gImageView2); + + application.SendNotification(); + application.Render(); + + tet_infoline("Try to load 2 invalid image"); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 2, TEST_LOCATION); + + tet_infoline("load done"); + + // We can test this UTC only if gImageView1 and gImageView2 loaded done. + if(gResourceReadySignal04ComesOrder == -1) + { + tet_infoline("Bad news.. gImageView3 or gImageView4 loaded faster than others. just skip this UTC"); + } + else + { + // gImageView3 and gImageView4 load must not be successed yet. + DALI_TEST_EQUALS(gImageView3.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_EQUALS(gImageView4.GetRendererCount(), 0u, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + tet_infoline("Try to load 2 valid image"); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 4, TEST_LOCATION); + + tet_infoline("load done"); + + // gImageView3 and gImageView4 load must be successed now. + DALI_TEST_EQUALS(gImageView3.GetRendererAt(0).GetTextures().GetTextureCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(gImageView4.GetRendererAt(0).GetTextures().GetTextureCount(), 1u, TEST_LOCATION); + } + + END_TEST; +} +int UtcDaliImageViewSetImageOnResourceReadySignal05(void) +{ + tet_infoline("Test multiple views with same image during ResourceReady load the image only 1 times"); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + gImageView1 = ImageView::New("invalid.jpg"); // request invalid image, to make loading failed fast. + gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal05); + application.GetScene().Add(gImageView1); + + application.SendNotification(); + application.Render(); + + tet_infoline("Try to load 1 invalid.jpg image"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, TEST_LOCATION); + + tet_infoline("Try to load 1 invalid2.jpg image"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + tet_infoline("Now we don't have any image to be loaded. Check event thread trigger failed."); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 1), false, TEST_LOCATION); - DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); + gImageView1.Unparent(); + gImageView1.Reset(); END_TEST; }