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=f31da7c8d8765ed78272e14d719fcf0a4ee3ce2f;hp=bdf031d3a74b155cd41998344e74b0b829460c40;hb=ee7b436210b09635d032b50eefecb7369be136e7;hpb=8e97be241012322eff10c2511e0eb6f80d75dcbb diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index bdf031d..f31da7c 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) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -52,34 +52,6 @@ void utc_dali_toolkit_image_view_cleanup(void) namespace { -const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( - attribute mediump vec2 aPosition;\n - varying mediump vec2 vTexCoord;\n - uniform mediump mat4 uMvpMatrix;\n - uniform mediump vec3 uSize;\n - \n - void main()\n - {\n - mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n - vertexPosition.xyz *= uSize;\n - vertexPosition = uMvpMatrix * vertexPosition;\n - \n - vTexCoord = aPosition + vec2(0.5);\n - gl_Position = vertexPosition;\n - }\n -); - -const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( - varying mediump vec2 vTexCoord;\n - uniform sampler2D sTexture;\n - uniform lowp vec4 uColor;\n - \n - void main()\n - {\n - gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n - }\n -); - const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg"; const char* TEST_IMAGE_FILE_NAME2 = "gallery_image_02.jpg"; @@ -94,61 +66,7 @@ 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"; -void TestImage( ImageView imageView, BufferImage image ) -{ - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - - Property::Map map; - DALI_TEST_CHECK( value.Get( map ) ); - - DALI_TEST_CHECK( map.Find( "width" ) ); - DALI_TEST_CHECK( map.Find( "height" ) ); - DALI_TEST_CHECK( map.Find( "type" ) ); - - int width = 0; - DALI_TEST_CHECK( map[ "width" ].Get( width ) ); - DALI_TEST_EQUALS( (unsigned int)width, image.GetWidth(), TEST_LOCATION ); - - int height = 0; - DALI_TEST_CHECK( map[ "height" ].Get( height ) ); - DALI_TEST_EQUALS( (unsigned int)height, image.GetHeight(), TEST_LOCATION ); - - std::string type; - DALI_TEST_CHECK( map[ "type" ].Get( type ) ); - DALI_TEST_EQUALS( type, "BufferImage", TEST_LOCATION ); -} - -void TestImage( ImageView imageView, ResourceImage image ) -{ - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - - Property::Map map; - DALI_TEST_CHECK( value.Get( map ) ); - - if( map.Find( "width" ) ) - { - int width = 0; - DALI_TEST_CHECK( map[ "width" ].Get( width ) ); - DALI_TEST_EQUALS( (unsigned int)width, image.GetWidth(), TEST_LOCATION ); - } - - if( map.Find( "height" ) ) - { - int height = 0; - DALI_TEST_CHECK( map[ "height" ].Get( height ) ); - DALI_TEST_EQUALS( (unsigned int)height, image.GetHeight(), TEST_LOCATION ); - } - - DALI_TEST_CHECK( map.Find( "type" ) ); - - std::string type; - DALI_TEST_CHECK( map[ "type" ].Get( type ) ); - DALI_TEST_EQUALS( type, "ResourceImage", TEST_LOCATION ); - - std::string filename; - DALI_TEST_CHECK( map[ "filename" ].Get( filename ) ); - DALI_TEST_EQUALS( filename, image.GetUrl(), TEST_LOCATION ); -} +const char* TEST_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json"; void TestUrl( ImageView imageView, const std::string url ) { @@ -172,19 +90,6 @@ int UtcDaliImageViewNewP(void) END_TEST; } -int UtcDaliImageViewNewImageP(void) -{ - ToolkitTestApplication application; - - BufferImage image = CreateBufferImage( 100, 200, Vector4( 1.f, 1.f, 1.f, 1.f ) ); - ImageView imageView = ImageView::New( image ); - - DALI_TEST_CHECK( imageView ); - TestImage( imageView, image ); - - END_TEST; -} - int UtcDaliImageViewNewUrlP(void) { ToolkitTestApplication application; @@ -221,6 +126,24 @@ int UtcDaliImageViewCopyConstructorP(void) 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< bool >( 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< bool >( Actor::Property::SENSITIVE ) ); + DALI_TEST_CHECK( !imageView ); + + END_TEST; +} + int UtcDaliImageViewAssignmentOperatorP(void) { ToolkitTestApplication application; @@ -234,6 +157,25 @@ int UtcDaliImageViewAssignmentOperatorP(void) 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< bool >( 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< bool >( Actor::Property::SENSITIVE ) ); + DALI_TEST_CHECK( !imageView ); + + END_TEST; +} + int UtcDaliImageViewDownCastP(void) { ToolkitTestApplication application; @@ -300,83 +242,6 @@ int UtcDaliImageViewSetGetProperty01(void) END_TEST; } -int UtcDaliImageViewSetGetProperty02(void) -{ - ToolkitTestApplication application; - - Image image = CreateBufferImage( 10, 10, Color::WHITE ); - ImageView imageView = ImageView::New(image); - Vector4 fullImageRect( 0.f, 0.f, 1.f, 1.f ); - - Stage::GetCurrent().Add( imageView ); - - application.SendNotification(); - application.Render(); - TestGlAbstraction& gl = application.GetGlAbstraction(); - - Vector4 pixelAreaUniform; - DALI_TEST_CHECK( gl.GetUniformValue( "pixelArea", pixelAreaUniform ) ); - DALI_TEST_EQUALS( pixelAreaUniform, fullImageRect, TEST_LOCATION ); - - Property::Value value = imageView.GetProperty( ImageView::Property::PIXEL_AREA ); - Vector4 pixelAreaValue; - DALI_TEST_CHECK( value.Get(pixelAreaValue) ); - DALI_TEST_EQUALS( pixelAreaValue, fullImageRect, TEST_LOCATION ); - - Vector4 pixelAreaSet( 0.2f, 0.2f, 0.3f, 0.3f ); - imageView.SetProperty( ImageView::Property::PIXEL_AREA, pixelAreaSet); - - application.SendNotification(); - application.Render(); - - value = imageView.GetProperty( ImageView::Property::PIXEL_AREA ); - value.Get(pixelAreaValue); - DALI_TEST_EQUALS( pixelAreaValue, pixelAreaSet, TEST_LOCATION ); - - DALI_TEST_CHECK( gl.GetUniformValue( "pixelArea", pixelAreaUniform ) ); - DALI_TEST_EQUALS( pixelAreaUniform, pixelAreaSet, TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliImageViewSetGetProperty03(void) -{ - ToolkitTestApplication application; - - Image image = CreateBufferImage( 10, 10, Color::WHITE ); - ImageView imageView = ImageView::New(image); - Stage::GetCurrent().Add( imageView ); - application.SendNotification(); - application.Render(); - - // conventional alpha blending - Renderer renderer = imageView.GetRendererAt( 0 ); - Property::Value value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); - bool enable; - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); - - // pre-multiplied alpha blending - imageView.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true ); - application.SendNotification(); - application.Render(); - - int srcFactorRgb = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB ); - int destFactorRgb = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB ); - int srcFactorAlpha = renderer.GetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA ); - int destFactorAlpha = renderer.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 ); - - value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA ); - DALI_TEST_CHECK( value.Get( enable ) ); - DALI_TEST_CHECK( enable ); - - END_TEST; -} - int UtcDaliImageViewPreMultipliedAlphaPng(void) { ToolkitTestApplication application; @@ -393,7 +258,7 @@ int UtcDaliImageViewPreMultipliedAlphaPng(void) ImageView imageView1 = ImageView::New(); imageView1.SetProperty( ImageView::Property::IMAGE, imageMap ); - Stage::GetCurrent().Add( imageView1 ); + application.GetScene().Add( imageView1 ); Property::Value value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA ); bool enable; @@ -466,7 +331,7 @@ int UtcDaliImageViewPreMultipliedAlphaPng(void) ImageView imageView2 = ImageView::New(); imageView2.SetProperty( ImageView::Property::IMAGE, imageMap ); - Stage::GetCurrent().Add( imageView2 ); + application.GetScene().Add( imageView2 ); application.SendNotification(); application.Render(); @@ -506,7 +371,7 @@ int UtcDaliImageViewPreMultipliedAlphaJpg(void) ImageView imageView1 = ImageView::New(); imageView1.SetProperty( ImageView::Property::IMAGE, imageMap ); - Stage::GetCurrent().Add( imageView1 ); + application.GetScene().Add( imageView1 ); Property::Value value = imageView1.GetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA ); bool enable; @@ -547,7 +412,7 @@ int UtcDaliImageViewPreMultipliedAlphaJpg(void) // Disable pre-multiplied alpha blending imageView2.SetProperty( ImageView::Property::PRE_MULTIPLIED_ALPHA, false ); - Stage::GetCurrent().Add( imageView2 ); + application.GetScene().Add( imageView2 ); application.SendNotification(); application.Render(); @@ -590,12 +455,17 @@ int UtcDaliImageViewPixelArea(void) .Add( ImageVisual::Property::PIXEL_AREA, pixelAreaVisual ) ); // Add to stage - Stage stage = Stage::GetCurrent(); + Integration::Scene stage = application.GetScene(); stage.Add( gifView ); // loading started application.SendNotification(); application.Render(16); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); DALI_TEST_CHECK( gifView.GetRendererCount() == 1u ); const Vector4 fullTextureRect( 0.f, 0.f, 1.f, 1.f ); @@ -643,9 +513,9 @@ int UtcDaliImageViewAsyncLoadingWithoutAltasing(void) ImageView imageView = ImageView::New( gImage_600_RGB ); // By default, Aysnc loading is used - Stage::GetCurrent().Add( imageView ); - imageView.SetSize(100, 100); - imageView.SetParentOrigin( 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 ); @@ -682,9 +552,9 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing(void) 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 - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(16); application.Render(16); @@ -731,7 +601,7 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing02(void) ImageView imageView = ImageView::New(); imageView.SetProperty( ImageView::Property::IMAGE, asyncLoadingMap ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(16); application.Render(16); @@ -786,7 +656,7 @@ int UtcDaliImageViewSyncLoading(void) syncLoadingMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34; imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(16); @@ -822,7 +692,7 @@ int UtcDaliImageViewSyncLoading02(void) syncLoadingMap[ "atlasing" ] = true; imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(16); @@ -852,7 +722,7 @@ int UtcDaliImageViewAddedTexture(void) propertyMap[ImageVisual::Property::URL] = url; imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -876,12 +746,12 @@ int UtcDaliImageViewSizeWithBackground(void) } ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); 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; } @@ -892,9 +762,8 @@ int UtcDaliImageViewSizeWithBackgroundAndImage(void) int widthBackground = 100; int heightBackground = 200; - int width = 300; - int height = 400; - Image image = CreateBufferImage( width, height, Vector4(1.f, 1.f, 1.f, 1.f) ); + int width = 600; + int height = 600; ImageView imageView = ImageView::New(); @@ -907,14 +776,14 @@ int UtcDaliImageViewSizeWithBackgroundAndImage(void) } ); - imageView.SetImage( image ); + imageView.SetImage( gImage_600_RGB ); // 1 to 1 ratio, 600x600 pixels - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); 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; } @@ -937,7 +806,7 @@ int UtcDaliImageViewHeightForWidthBackground(void) } ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -956,9 +825,7 @@ int UtcDaliImageViewHeightForWidthBackgroundAndImage(void) int widthBackground = 100; int heightBackground = 200; int width = 300; - int height = 400; - - Image image = CreateBufferImage( width, height, Vector4(1.f, 1.f, 1.f, 1.f) ); + int height = 300; ImageView imageView = ImageView::New(); @@ -969,11 +836,11 @@ int UtcDaliImageViewHeightForWidthBackgroundAndImage(void) { ImageVisual::Property::DESIRED_WIDTH, widthBackground }, { ImageVisual::Property::DESIRED_HEIGHT, heightBackground } } - ); + ); // 1 to 2 ratio - imageView.SetImage( image ); + imageView.SetImage( gImage_600_RGB ); // 1 to 1 ratio - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -983,28 +850,6 @@ int UtcDaliImageViewHeightForWidthBackgroundAndImage(void) END_TEST; } -int UtcDaliImageViewSetBufferImage(void) -{ - ToolkitTestApplication application; - - int width1 = 300; - int height1 = 400; - BufferImage image1 = CreateBufferImage( width1, height1, Vector4( 1.f, 1.f, 1.f, 1.f ) ); - ImageView imageView = ImageView::New(); - imageView.SetImage( image1 ); - - TestImage( imageView, image1 ); - - int width2 = 600; - int height2 = 500; - BufferImage image2 = CreateBufferImage( width2, height2, Vector4( 1.f, 1.f, 1.f, 1.f ) ); - imageView.SetImage( image2 ); - - TestImage( imageView, image2 ); - - END_TEST; -} - int UtcDaliImageViewSetImageUrl(void) { ToolkitTestApplication application; @@ -1020,83 +865,6 @@ int UtcDaliImageViewSetImageUrl(void) END_TEST; } -int UtcDaliImageViewSetImageOnstageP(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New(); - - Stage::GetCurrent().Add( imageView ); - application.SendNotification(); - application.Render(); - - ResourceImage image1 = ResourceImage::New( TEST_IMAGE_FILE_NAME ); - imageView.SetImage( image1 ); - TestImage( imageView, image1 ); - - int width = 300; - int height = 400; - BufferImage image2 = CreateBufferImage( width, height, Vector4( 1.f, 1.f, 1.f, 1.f ) ); - imageView.SetImage( image2 ); - TestImage( imageView, image2 ); - - END_TEST; -} - -int UtcDaliImageViewSetImageOnstageN(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New(); - - Stage::GetCurrent().Add( imageView ); - application.SendNotification(); - application.Render(); - - ResourceImage image1 = ResourceImage::New( TEST_IMAGE_FILE_NAME ); - imageView.SetImage( image1 ); - TestImage( imageView, image1 ); - - Image image2; - imageView.SetImage( image2 ); - - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - - //the value should be empty - std::string url; - DALI_TEST_CHECK( !value.Get( url ) ); - - Property::Map map; - value.Get( map ); - DALI_TEST_CHECK( map.Empty() ); - - END_TEST; -} - -int UtcDaliImageViewSetImageOffstageP(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New(); - - Stage::GetCurrent().Add( imageView ); - application.SendNotification(); - application.Render(); - Stage::GetCurrent().Remove( imageView ); - - ResourceImage image1 = ResourceImage::New( TEST_IMAGE_FILE_NAME ); - imageView.SetImage( image1 ); - TestImage( imageView, image1 ); - - int width = 300; - int height = 400; - BufferImage image2 = CreateBufferImage( width, height, Vector4( 1.f, 1.f, 1.f, 1.f ) ); - imageView.SetImage( image2 ); - TestImage( imageView, image2 ); - - END_TEST; -} - bool gResourceReadySignalFired = false; Vector3 gNaturalSize; @@ -1127,7 +895,7 @@ int UtcDaliImageViewCheckResourceReady(void) imageView.ResourceReadySignal().Connect( &ResourceReadySignal); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // loading started, this waits for the loader thread DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); @@ -1135,65 +903,14 @@ int UtcDaliImageViewCheckResourceReady(void) application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); - - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliImageViewSetImageOffstageN(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New(); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); - Stage::GetCurrent().Add( imageView ); application.SendNotification(); application.Render(); - Stage::GetCurrent().Remove( imageView ); - - ResourceImage image1 = ResourceImage::New( TEST_IMAGE_FILE_NAME ); - imageView.SetImage( image1 ); - TestImage( imageView, image1 ); - - Image image2; - imageView.SetImage( image2 ); - - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - - //the value should be empty - std::string url; - DALI_TEST_CHECK( !value.Get( url ) ); - - Property::Map map; - value.Get( map ); - DALI_TEST_CHECK( map.Empty() ); - - END_TEST; -} - -int UtcDaliImageViewSetImageN(void) -{ - ToolkitTestApplication application; - Image image1; - ImageView imageView = ImageView::New(); - imageView.SetImage( image1 ); - - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - - //the value should be empty - std::string url; - DALI_TEST_CHECK( !value.Get( url ) ); - - Property::Map map; - value.Get( map ); - DALI_TEST_CHECK( map.Empty() ); + DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); - std::string resource_url; - Property::Value val = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - DALI_TEST_CHECK( !val.Get( resource_url ) ); + DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); END_TEST; } @@ -1205,7 +922,7 @@ int UtcDaliImageViewSetImageTypeChangesP(void) ImageView imageView = ImageView::New(); Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); std::string url; Property::Map map; @@ -1235,34 +952,6 @@ int UtcDaliImageViewSetImageTypeChangesP(void) DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty DALI_TEST_CHECK( visual ); // Visual should be valid - // Set an empty Image - imageView.SetImage( Image() ); - - 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 - value.Get( map ); - DALI_TEST_CHECK( map.Empty() ); // Value should be empty - DALI_TEST_CHECK( ! visual ); // Visual should be invalid - - // Set an Image - ResourceImage image1 = ResourceImage::New( TEST_IMAGE_FILE_NAME ); - imageView.SetImage( image1 ); - - 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 URL imageView.SetImage( "" ); @@ -1336,370 +1025,42 @@ int UtcDaliImageViewResourceUrlP(void) END_TEST; } -// Scenarios 1: ImageView from regular image -int UtcDaliImageViewSetImageBufferImage(void) +int UtcDaliImageViewReplaceImage(void) { ToolkitTestApplication application; - ImageView imageView = ImageView::New(); - Stage::GetCurrent().Add( imageView ); + gResourceReadySignalFired = false; - TestGlAbstraction& gl = application.GetGlAbstraction(); - gl.EnableTextureCallTrace( true ); + // Check ImageView with background and main image, to ensure both visuals are marked as loaded + ImageView imageView = ImageView::New( TEST_IMAGE_1 ); - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); + DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); - int width = 300; - int height = 400; - BufferImage image = CreateBufferImage( width, height, Color::WHITE ); + imageView.ResourceReadySignal().Connect( &ResourceReadySignal); - imageView.SetImage( image ); + application.GetScene().Add( imageView ); application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); - - std::stringstream params; - params << GL_TEXTURE_2D << ", " << 23; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); - - END_TEST; -} + application.Render(16); -// Scenarios 2: ImageView from Native image -int UtcDaliImageViewSetImageNativeImage(void) -{ - ToolkitTestApplication application; + // loading started, this waits for the loader thread for max 30 seconds + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); - ImageView imageView = ImageView::New(); - Stage::GetCurrent().Add( imageView ); + DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION ); - TestGlAbstraction& gl = application.GetGlAbstraction(); - gl.EnableTextureCallTrace( true ); + DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); + gResourceReadySignalFired = false; - int width = 200; - int height = 500; - TestNativeImagePointer nativeImageInterface = TestNativeImage::New( width, height ); - NativeImage nativeImage = NativeImage::New( *(nativeImageInterface.Get()) ); + imageView.SetImage(TEST_IMAGE_2); - imageView.SetImage( nativeImage ); application.SendNotification(); - application.Render(); + application.Render(16); - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); + // loading started, this waits for the loader thread for max 30 seconds + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); - std::stringstream params; - params << GL_TEXTURE_EXTERNAL_OES << ", " << 23; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); - - END_TEST; -} - -// Scenarios 3: ImageView initially from regular image but then SetImage called with Native image -int UtcDaliImageViewSetImageBufferImageToNativeImage(void) -{ - ToolkitTestApplication application; - - int width = 300; - int height = 400; - BufferImage image = CreateBufferImage( width, height, Color::WHITE ); - - ImageView imageView = ImageView::New( image ); - Stage::GetCurrent().Add( imageView ); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - gl.EnableTextureCallTrace( true ); - - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); - - std::stringstream params; - params << GL_TEXTURE_2D << ", " << 23; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); - - width = 200; - height = 500; - TestNativeImagePointer nativeImageInterface = TestNativeImage::New( width, height ); - NativeImage nativeImage = NativeImage::New( *(nativeImageInterface.Get()) ); - imageView.SetImage( nativeImage ); - - ids.clear(); - ids.push_back( 24 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); - - std::stringstream nextTextureParams; - nextTextureParams << GL_TEXTURE_EXTERNAL_OES << ", " << 24; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", nextTextureParams.str()) ); - - END_TEST; -} - -// Scenarios 4: ImageView initially from Native image but then SetImage called with regular image -int UtcDaliImageViewSetImageNativeImageToBufferImage(void) -{ - ToolkitTestApplication application; - - int width = 300; - int height = 400; - TestNativeImagePointer nativeImageInterface = TestNativeImage::New( width, height ); - NativeImage nativeImage = NativeImage::New( *(nativeImageInterface.Get()) ); - - ImageView imageView = ImageView::New( nativeImage ); - Stage::GetCurrent().Add( imageView ); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - gl.EnableTextureCallTrace( true ); - - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); - - std::stringstream params; - params << GL_TEXTURE_EXTERNAL_OES << ", " << 23; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); - - width = 200; - height = 500; - BufferImage image = CreateBufferImage( width, height, Color::WHITE ); - imageView.SetImage( image ); - - ids.clear(); - ids.push_back( 24 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); - - std::stringstream nextTextureParams; - nextTextureParams << GL_TEXTURE_2D << ", " << 24; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", nextTextureParams.str()) ); - - END_TEST; -} - -// Scenarios 5: ImageView from Native image with custom shader -int UtcDaliImageViewSetImageNativeImageWithCustomShader(void) -{ - ToolkitTestApplication application; - - int width = 300; - int height = 400; - - Property::Map customShader; - customShader.Insert( "vertexShader", VERTEX_SHADER ); - customShader.Insert( "fragmentShader", FRAGMENT_SHADER ); - - Property::Array shaderHints; - shaderHints.PushBack( "requiresSelfDepthTest" ); - shaderHints.PushBack( "outputIsTransparent" ); - shaderHints.PushBack( "outputIsOpaque" ); - shaderHints.PushBack( "modifiesGeometry" ); - - customShader.Insert( "hints", shaderHints ); - - Property::Map map; - map.Insert( "shader", customShader ); - - TestNativeImagePointer nativeImageInterface = TestNativeImage::New( width, height ); - NativeImage nativeImage = NativeImage::New( *(nativeImageInterface.Get()) ); - - ImageView imageView = ImageView::New( nativeImage ); - imageView.SetProperty( ImageView::Property::IMAGE, map ); - Stage::GetCurrent().Add( imageView ); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - gl.EnableTextureCallTrace( true ); - - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); - - std::stringstream params; - params << GL_TEXTURE_EXTERNAL_OES << ", " << 23; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); - - END_TEST; -} - -// Scenarios 6: ImageView initially from regular image with custom shader but then SetImage called with Native -int UtcDaliImageViewSetImageBufferImageWithCustomShaderToNativeImage(void) -{ - ToolkitTestApplication application; - - int width = 300; - int height = 400; - - Property::Map customShader; - customShader.Insert( "vertexShader", VERTEX_SHADER ); - customShader.Insert( "fragmentShader", FRAGMENT_SHADER ); - - Property::Array shaderHints; - shaderHints.PushBack( "requiresSelfDepthTest" ); - shaderHints.PushBack( "outputIsTransparent" ); - shaderHints.PushBack( "outputIsOpaque" ); - shaderHints.PushBack( "modifiesGeometry" ); - - customShader.Insert( "hints", shaderHints ); - - Property::Map map; - map.Insert( "shader", customShader ); - - BufferImage image = CreateBufferImage( width, height, Color::WHITE ); - - ImageView imageView = ImageView::New( image ); - imageView.SetProperty( ImageView::Property::IMAGE, map ); - Stage::GetCurrent().Add( imageView ); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - gl.EnableTextureCallTrace( true ); - - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); - - std::stringstream params; - params << GL_TEXTURE_2D << ", " << 23; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); - - TestNativeImagePointer nativeImageInterface = TestNativeImage::New( width, height ); - NativeImage nativeImage = NativeImage::New( *(nativeImageInterface.Get()) ); - imageView.SetImage( nativeImage ); - - ids.clear(); - ids.push_back( 24 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); - - std::stringstream nativeImageParams; - nativeImageParams << GL_TEXTURE_EXTERNAL_OES << ", " << 24; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", nativeImageParams.str()) ); - - - END_TEST; -} - -int UtcDaliImageViewGetImageP1(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New(); - DALI_TEST_CHECK( ! imageView.GetImage() ); - - Image image = CreateBufferImage(); - imageView.SetImage( image ); - DALI_TEST_CHECK( imageView.GetImage() == image ); - - END_TEST; -} - -int UtcDaliImageViewGetImageP2(void) -{ - ToolkitTestApplication application; - - BufferImage image = CreateBufferImage(); - ImageView imageView = ImageView::New( image ); - DALI_TEST_CHECK( imageView.GetImage() == image ); - - END_TEST; -} - -int UtcDaliImageViewGetImageN(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME ); - DALI_TEST_CHECK( ! imageView.GetImage() ); - - Image image = CreateBufferImage(); - imageView.SetImage( image ); - DALI_TEST_CHECK( imageView.GetImage() == image ); - - imageView.SetImage( TEST_IMAGE_FILE_NAME ); - DALI_TEST_CHECK( ! imageView.GetImage() ); - - END_TEST; -} - - -int UtcDaliImageViewReplaceImage(void) -{ - ToolkitTestApplication application; - - gResourceReadySignalFired = false; - - int width = 100; - int height = 200; - Image image = CreateBufferImage( width, height, Vector4(1.f, 1.f, 1.f, 1.f) ); - - // Check ImageView with background and main image, to ensure both visuals are marked as loaded - ImageView imageView = ImageView::New( TEST_IMAGE_1 ); - - DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); - - imageView.ResourceReadySignal().Connect( &ResourceReadySignal); - - Stage::GetCurrent().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( imageView.GetRendererCount(), 1u, TEST_LOCATION ); - - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); - - gResourceReadySignalFired = false; - - imageView.SetImage(TEST_IMAGE_2); - - 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( imageView.GetRendererCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); @@ -1727,7 +1088,7 @@ int UtcDaliImageViewReplaceImageAndGetNaturalSize(void) dummyControl.Add( imageView ); dummyImpl.SetRelayoutCallback( &OnRelayoutOverride ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(); @@ -1855,7 +1216,7 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage02(void) tet_infoline("Connect to ResourceReady signal for second ImageView, it should still fire as resource is ready"); imageViewWithExistingImage.ResourceReadySignal().Connect( &ResourceReadySignal); - Stage::GetCurrent().Add( imageViewWithExistingImage ); + application.GetScene().Add( imageViewWithExistingImage ); DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); @@ -1873,10 +1234,10 @@ 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 ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -1885,7 +1246,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,10 +1284,10 @@ 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 ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -1964,10 +1325,10 @@ 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 ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -2012,10 +1373,10 @@ 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 ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -2065,9 +1426,9 @@ 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 ); - Stage::GetCurrent().Add( imageView ); + 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(); @@ -2101,7 +1462,7 @@ int UtcDaliImageViewUsingAtlasAndGetNaturalSize(void) imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_34_RGBA; imageMap[ Toolkit::ImageVisual::Property::ATLASING ] = true; imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2120,7 +1481,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; @@ -2130,7 +1490,7 @@ int UtcDaliImageViewFillMode(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2145,10 +1505,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,79 +1516,780 @@ 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 ); + application.GetScene().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 ); + application.GetScene().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 ); + + 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 ); // 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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + +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 "); + + 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 ); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(600,500) ); + + 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 ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + 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( 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::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + +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"); + + 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.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) ); + + 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 ); + + 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 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"); + + 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.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) ); + + 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 ); + + 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) ); + + 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 ); + + 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) ); + + 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 ); + + 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) ); + + 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 ); + + 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) ); + + 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 ); + + 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) ); + + 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 ); + + 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) ); + + application.GetScene().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) ); + + 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 ); + + 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) ); + + 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 ); + + 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) ); + + application.GetScene().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) ); + + 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 ); + + 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 SCALE_TO_FILL 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) ); + + 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 ); + + 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 ); + + application.GetScene().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 ); + + application.GetScene().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 { @@ -2246,7 +2306,7 @@ int UtcDaliImageViewCustomShader(void) imageView.SetProperty( ImageView::Property::IMAGE, properties ); imageView.SetProperty( ImageView::Property::IMAGE, TEST_IMAGE_FILE_NAME ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -2284,7 +2344,7 @@ int UtcDaliImageViewCustomShader(void) imageView.SetProperty( ImageView::Property::IMAGE, properties1 ); imageView.SetProperty( ImageView::Property::IMAGE, properties ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -2322,7 +2382,7 @@ int UtcDaliImageViewCustomShader(void) imageView.SetProperty( ImageView::Property::IMAGE, properties ); imageView.SetProperty( ImageView::Property::IMAGE, properties1 ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -2403,18 +2463,20 @@ 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 = 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 ); + application.GetScene().Add( imageView ); DALI_TEST_CHECK( imageView ); @@ -2432,21 +2494,162 @@ 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 ); + + 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 ); + + } + 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 ); + + 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 ); + } + 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 ); + + 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 ); + + 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 + // Local svg file - invalid file path + { + gResourceReadySignalFired = false; + + 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 ); + + application.GetScene().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 ); + } + + // Local svg file - invalid file { gResourceReadySignalFired = false; - ImageView imageView = ImageView::New( TEST_RESOURCE_DIR "/Kid1.svg" ); - imageView.SetSize( 200.f, 200.f ); + 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 ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); @@ -2466,12 +2669,12 @@ int UtcDaliImageViewSvgLoadingFailure(void) gResourceReadySignalFired = false; ImageView imageView = ImageView::New( "https://bar.org/foobar.svg" ); - imageView.SetSize( 200.f, 200.f ); + 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.GetScene().Add( imageView ); application.SendNotification(); @@ -2488,3 +2691,121 @@ int UtcDaliImageViewSvgLoadingFailure(void) END_TEST; } + +int UtcDaliImageViewSvgRasterizationFailure(void) +{ + ToolkitTestApplication application; + + gResourceReadySignalFired = false; + + ImageView imageView = ImageView::New( TEST_RESOURCE_DIR "/svg1.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 + 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::READY, TEST_LOCATION ); + + // Reset flag + gResourceReadySignalFired = false; + + // Change size + imageView.SetProperty( Actor::Property::SIZE, Vector2( 0.f, 0.f ) ); + + application.SendNotification(); + + // rasterization started, this waits for the rasterize 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 ); + // Fail to rasterize because the size is 0. + 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(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] = TEST_RESOURCE_DIR "/svg1.svg"; + } +} + +} + +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 ); + + 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 ); + + // 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; +}