X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ImageView.cpp;h=6829d9820b80f474e90631e8c030f2c8967ed876;hb=5aaba5adcf1a717e1ece3ef9c55c8912420993b5;hp=0124b73d69b525381a9217c55c8c19e4e0d565bb;hpb=a5e299ffec7a2f1e4a7cc7456159fc92eebcc269;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 0124b73..6829d98 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -94,6 +94,8 @@ 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"; + void TestImage( ImageView imageView, BufferImage image ) { Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); @@ -354,7 +356,7 @@ int UtcDaliImageViewSetGetProperty03(void) Property::Value value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); bool enable; DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); + DALI_TEST_CHECK( !enable ); // pre-multiplied alpha blending imageView.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true ); @@ -644,8 +646,8 @@ int UtcDaliImageViewAsyncLoadingWithoutAltasing(void) // By default, Aysnc loading is used Stage::GetCurrent().Add( imageView ); - imageView.SetSize(100, 100); - imageView.SetParentOrigin( ParentOrigin::CENTER ); + 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 ); @@ -880,8 +882,8 @@ int UtcDaliImageViewSizeWithBackground(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetCurrentSize().width, (float)width, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetCurrentSize().height, (float)height, TEST_LOCATION ); + 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 ); END_TEST; } @@ -913,8 +915,8 @@ int UtcDaliImageViewSizeWithBackgroundAndImage(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetCurrentSize().width, (float)width, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetCurrentSize().height, (float)height, TEST_LOCATION ); + 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 ); END_TEST; } @@ -1873,8 +1875,8 @@ int UtcDaliImageViewPaddingProperty(void) imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128; imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + 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 ) ); Stage::GetCurrent().Add( imageView ); @@ -1885,7 +1887,7 @@ int UtcDaliImageViewPaddingProperty(void) ImageView childImage = ImageView::New(); childImage.SetBackgroundColor( Color::BLACK ); - childImage.SetSize( 10.f, 10.f ); + childImage.SetProperty( Actor::Property::SIZE, Vector2( 10.f, 10.f ) ); imageView.Add( childImage ); application.SendNotification(); @@ -1923,8 +1925,8 @@ int UtcDaliImageViewPaddingProperty02(void) 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.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + 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 ) ); Stage::GetCurrent().Add( imageView ); @@ -1964,8 +1966,8 @@ int UtcDaliImageViewPaddingProperty03(void) 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.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + 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 ) ); Stage::GetCurrent().Add( imageView ); @@ -2012,8 +2014,8 @@ int UtcDaliImageViewPaddingProperty04(void) imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FILL; imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + 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 ) ); Stage::GetCurrent().Add( imageView ); @@ -2065,8 +2067,8 @@ int UtcDaliImageViewTransformTest01(void) .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2( 8, 8 ) ) ); imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); Stage::GetCurrent().Add( imageView ); application.SendNotification(); @@ -2120,7 +2122,6 @@ int UtcDaliImageViewFillMode(void) ToolkitTestApplication application; tet_infoline( "Create an ImageVisual without padding and set the fill-mode to fill" ); - tet_infoline( " There should be no need to change the transform, our size-policy should be relative and size should be [1,1]"); ImageView imageView = ImageView::New(); Property::Map imageMap; @@ -2145,10 +2146,9 @@ int UtcDaliImageViewFillMode(void) Property::Map* map = value->GetMap(); 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::ONE, TEST_LOCATION ); // Relative size so will take up 100% + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); DALI_TEST_CHECK( value ); @@ -2157,210 +2157,911 @@ int UtcDaliImageViewFillMode(void) END_TEST; } -int UtcDaliImageViewCustomShader(void) +int UtcDaliImageViewFittingModeFitKeepAspectRatio(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"; - shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + 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"); - properties[Visual::Property::TYPE] = Visual::IMAGE; - properties[Visual::Property::SHADER] = shader; - properties[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + 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 ); - ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); - Stage::GetCurrent().Add( imageView ); + Stage::GetCurrent().Add( imageView ); - application.SendNotification(); - application.Render(); + // Trigger a potential relayout + application.SendNotification(); + application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); - 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* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + 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 ); + // 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 ); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), 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 ); - // 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"; - shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 50 ), TEST_LOCATION ); - properties[Visual::Property::SHADER] = shader; + END_TEST; +} - ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME ); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); +int UtcDaliImageViewFittingModesFill(void) +{ + ToolkitTestApplication application; - Stage::GetCurrent().Add( imageView ); + 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"); - application.SendNotification(); - application.Render(); + 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 ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); - 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 ); + Stage::GetCurrent().Add( imageView ); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + // Trigger a potential relayout + application.SendNotification(); + application.Render(); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); - } + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); - // 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"; - shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); - properties[Visual::Property::SHADER] = shader; + 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 - ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); - imageView.SetProperty( ImageView::Property::IMAGE, TEST_IMAGE_FILE_NAME ); + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE ); - Stage::GetCurrent().Add( imageView ); + 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 - application.SendNotification(); - application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + END_TEST; +} - 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 ); +int UtcDaliImageViewFittingModesOverfitKeepAspectRatio(void) +{ + ToolkitTestApplication application; - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), TEST_LOCATION ); + 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 "); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); - } + 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 ); - // 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"; - shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(600,500) ); - properties[Visual::Property::SHADER] = shader; + Stage::GetCurrent().Add( imageView ); - Property::Map properties1; - properties1[Visual::Property::TYPE] = Visual::IMAGE; - properties1[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + // Trigger a potential relayout + application.SendNotification(); + application.Render(); - ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, properties1 ); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); - Stage::GetCurrent().Add( imageView ); + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); - application.SendNotification(); - application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + // 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 - 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 ); + 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 ); - Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp - DALI_TEST_EQUALS( fragmentShader, fragment->Get< std::string >(), 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 - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); - } + END_TEST; +} - // 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"; - shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; - shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; +int UtcDaliImageViewFittingModesCenter01(void) +{ + ToolkitTestApplication application; - properties[Visual::Property::SHADER] = shader; + 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"); - Property::Map properties1; - properties1[Visual::Property::TYPE] = Visual::IMAGE; - properties1[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + 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); - ImageView imageView = ImageView::New(); - imageView.SetProperty( ImageView::Property::IMAGE, properties ); - imageView.SetProperty( ImageView::Property::IMAGE, properties1 ); + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) ); - Stage::GetCurrent().Add( imageView ); + Stage::GetCurrent().Add( imageView ); - application.SendNotification(); - application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + // Trigger a potential relayout + application.SendNotification(); + application.Render(); - 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 ); + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); - 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* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); - Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp - DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); - } + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 50 ), TEST_LOCATION ); END_TEST; } - -namespace +int UtcDaliImageViewFittingModesCenter02(void) { -static int gFailCounter = 0; -const int MAX_RETRIES(3); + ToolkitTestApplication application; -void ReloadImage(ImageView imageView) -{ - Property::Map imageImmediateLoadingMap; - imageImmediateLoadingMap[ ImageVisual::Property::URL ] = "Non-existant-image.jpg"; - imageImmediateLoadingMap[ ImageVisual::Property::LOAD_POLICY ] = ImageVisual::LoadPolicy::IMMEDIATE; + 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("Immediate load an image"); - imageView.SetProperty( ImageView::Property::IMAGE, imageImmediateLoadingMap ); -} + 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); -void ResourceFailedReload( Control control ) + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) ); + + Stage::GetCurrent().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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 50 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesFitHeight01(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitHeight ( image: [600,600], view: [600,700] )" ); + + 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); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); + + Stage::GetCurrent().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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + +int UtcDaliImageViewFittingModesFitHeight02(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitHeight ( image: [600,600], view: [700,600] )" ); + + 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); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(700,600) ); + + Stage::GetCurrent().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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesFitWidth01(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitWidth ( image: [600,600], view: [600,700] )" ); + + 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); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); + + Stage::GetCurrent().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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 50 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesFitWidth02(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitWidth ( image: [600,600], view:[700,600] )" ); + + 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); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(700,600) ); + + Stage::GetCurrent().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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + +int UtcDaliImageViewFittingModesChangeFittingMode01(void) +{ + ToolkitTestApplication application; + + 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; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + + Stage::GetCurrent().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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), 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; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + + Stage::GetCurrent().Add( imageView ); + + 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.CreatePropertyMap( returnedMap ); + + value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), 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; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + + Stage::GetCurrent().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 ); + + value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesChangeFittingMode02(void) +{ + ToolkitTestApplication application; + + 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; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + + Stage::GetCurrent().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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), 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; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + + Stage::GetCurrent().Add( imageView ); + + 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.CreatePropertyMap( returnedMap ); + + value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), 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; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); + + Stage::GetCurrent().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 ); + + value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + map = value->GetMap(); + 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_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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesWithAnimatedVectorImageVisual(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using ScaleToFill and animated vector image ( image: [600,600], view:[600,600] )" ); + + 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 + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(600,600) ); + + Stage::GetCurrent().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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + 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_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get< int >() == 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 + + 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"; + shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + + 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 ); + + Stage::GetCurrent().Add( imageView ); + + application.SendNotification(); + application.Render(); + + 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 ); + + 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* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), 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"; + shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; + 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 ); + + Stage::GetCurrent().Add( imageView ); + + application.SendNotification(); + application.Render(); + + 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 ); + + 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* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), 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"; + shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; + 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 ); + + Stage::GetCurrent().Add( imageView ); + + application.SendNotification(); + application.Render(); + 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 ); + + 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* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), 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"; + shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + + properties[Visual::Property::SHADER] = shader; + + Property::Map properties1; + 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 ); + + Stage::GetCurrent().Add( imageView ); + + application.SendNotification(); + application.Render(); + 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 ); + + 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* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), 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"; + shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader; + shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader; + + properties[Visual::Property::SHADER] = shader; + + Property::Map properties1; + 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 ); + + Stage::GetCurrent().Add( imageView ); + + application.SendNotification(); + application.Render(); + 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 ); + + 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* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp + DALI_TEST_EQUALS( vertexShader, vertex->Get< std::string >(), TEST_LOCATION ); + } + + END_TEST; +} + + +namespace +{ +static int gFailCounter = 0; +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; + + tet_infoline("Immediate load an image"); + imageView.SetProperty( ImageView::Property::IMAGE, imageImmediateLoadingMap ); +} + +void ResourceFailedReload( Control control ) { gFailCounter++; if( gFailCounter < MAX_RETRIES ) @@ -2403,16 +3104,18 @@ int UtcDaliImageViewReloadFailedOnResourceReadySignal(void) int UtcDaliImageViewLoadRemoteSVG(void) { - tet_infoline("Test reloading failed image from within signal handler."); + 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"); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetSize(300, 300); - imageView.SetPosition( Vector3( 150.0f , 150.0f , 0.0f ) ); + // 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 ) ); Stage::GetCurrent().Add( imageView ); @@ -2432,3 +3135,219 @@ int UtcDaliImageViewLoadRemoteSVG(void) END_TEST; } +int UtcDaliImageViewSyncSVGLoading(void) +{ + ToolkitTestApplication application; + + 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( ); + + // 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 ); + + Stage::GetCurrent().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 ); + + } + END_TEST; +} + +int UtcDaliImageViewAsyncSVGLoading(void) +{ + ToolkitTestApplication application; + + 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( ); + + // 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 ); + + Stage::GetCurrent().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 ); + } + END_TEST; +} + +int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void) +{ + ToolkitTestApplication application; + + 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( ); + + // 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" ); + + // 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 ); + + Stage::GetCurrent().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 ); + + 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< bool >(), TEST_LOCATION ); + + } + END_TEST; +} + +int UtcDaliImageViewSvgLoadingFailure(void) +{ + ToolkitTestApplication application; + + // Local svg file + { + 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); + + DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); + + Stage::GetCurrent().Add( imageView ); + + application.SendNotification(); + + // loading started, this waits for the loader thread + 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 ); + } + + // Remote svg file + { + gResourceReadySignalFired = false; + + ImageView imageView = ImageView::New( "https://bar.org/foobar.svg" ); + imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); + imageView.ResourceReadySignal().Connect( &ResourceReadySignal); + + DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); + + Stage::GetCurrent().Add( imageView ); + + application.SendNotification(); + + // loading started, this waits for the loader thread + 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 ); + } + + END_TEST; +} + +namespace +{ + +static int gResourceReadySignalCounter = 0; + +void OnResourceReadySignal( Control control ) +{ + gResourceReadySignalCounter++; + + if( gResourceReadySignalCounter == 1 ) + { + // Set image twice + ImageView::DownCast( control ).SetImage( gImage_34_RGBA ); + ImageView::DownCast( control ).SetImage( gImage_34_RGBA ); + } +} + +} + +int UtcDaliImageViewSetImageOnResourceReadySignal(void) +{ + tet_infoline("Test setting image from within signal handler."); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + ImageView imageView = ImageView::New( gImage_34_RGBA ); + imageView.ResourceReadySignal().Connect( &OnResourceReadySignal ); + + Stage::GetCurrent().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 ); + + END_TEST; +}