X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ImageView.cpp;h=e8dd77e1f141042e880cc3c9842621445c7e8fc1;hb=4800a84a19c2fd33aea3174eae8e55297ee3a9af;hp=6829d9820b80f474e90631e8c030f2c8967ed876;hpb=cbda2de83c5025276c35d69044934ab1258b4998;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 6829d98..e8dd77e 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) 2021 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. @@ -28,8 +28,12 @@ #include #include #include +#include +#include +#include #include +#include #include #include @@ -52,40 +56,19 @@ 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"; const char* TEST_IMAGE_1 = TEST_RESOURCE_DIR "/TB-gloss.png"; const char* TEST_IMAGE_2 = TEST_RESOURCE_DIR "/tb-norm.png"; +const char* TEST_BROKEN_IMAGE_DEFAULT = TEST_RESOURCE_DIR "/broken.png"; +const char* TEST_BROKEN_IMAGE_S = TEST_RESOURCE_DIR "/broken_s.9.png"; +const char* TEST_BROKEN_IMAGE_M = TEST_RESOURCE_DIR "/broken_m.9.png"; +const char* TEST_BROKEN_IMAGE_L = TEST_RESOURCE_DIR "/broken_l.9.png"; +const char* TEST_BROKEN_IMAGE_01 = TEST_RESOURCE_DIR "/button-up.9.png"; +const char* TEST_BROKEN_IMAGE_02 = TEST_RESOURCE_DIR "/heartsframe.9.png"; + // resolution: 34*34, pixel format: RGBA8888 static const char* gImage_34_RGBA = TEST_RESOURCE_DIR "/icon-edit.png"; // resolution: 600*600, pixel format: RGB888 @@ -96,62 +79,6 @@ 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" ) ); - - 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 ); -} - void TestUrl( ImageView imageView, const std::string url ) { Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); @@ -174,19 +101,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; @@ -223,6 +137,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; @@ -236,6 +168,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; @@ -302,83 +253,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; @@ -395,7 +269,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; @@ -468,7 +342,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(); @@ -508,7 +382,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; @@ -549,7 +423,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(); @@ -583,6 +457,14 @@ int UtcDaliImageViewPixelArea(void) // Test pixel area property ToolkitTestApplication application; + static std::vector customUniforms = + { + UniformData("pixelArea", Property::Type::VECTOR4), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); + // Gif image, use AnimatedImageVisual internally // Atlasing is applied to pack multiple frames, use custom wrap mode ImageView gifView = ImageView::New(); @@ -592,12 +474,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 ); @@ -645,7 +532,7 @@ int UtcDaliImageViewAsyncLoadingWithoutAltasing(void) ImageView imageView = ImageView::New( gImage_600_RGB ); // By default, Aysnc loading is used - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); imageView.SetProperty( Actor::Property::SIZE, Vector2(100, 100) ); imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); @@ -658,8 +545,6 @@ int UtcDaliImageViewAsyncLoadingWithoutAltasing(void) const std::vector& textures2 = gl.GetBoundTextures(); DALI_TEST_GREATER( textures2.size(), numTextures, TEST_LOCATION ); - - END_TEST; } @@ -684,9 +569,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); @@ -707,9 +592,9 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing(void) callStack.Enable(false); TraceCallStack::NamedParams params; - params["width"] = ToString(34); - params["height"] = ToString(34); - DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION ); + params["width"] << 34; + params["height"] << 34; +DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION ); END_TEST; } @@ -733,7 +618,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); @@ -748,8 +633,8 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing02(void) callStack.Enable(false); TraceCallStack::NamedParams params; - params["width"] = ToString(34); - params["height"] = ToString(34); + params["width"] << 34; + params["height"] << 34; DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION ); END_TEST; @@ -788,13 +673,13 @@ 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); TraceCallStack::NamedParams params; - params["width"] = ToString(34); - params["height"] = ToString(34); + params["width"] << 34; + params["height"] << 34; DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION ); } @@ -824,16 +709,160 @@ 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); + + TraceCallStack::NamedParams params; + params["width"] << 34; + params["height"] << 34; + DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), + true, TEST_LOCATION ); + } + END_TEST; +} + +int UtcDaliImageViewAsyncLoadingEncodedBuffer(void) +{ + ToolkitTestApplication application; + TestGlAbstraction& gl = application.GetGlAbstraction(); + const std::vector& textures = gl.GetBoundTextures(); + size_t numTextures = textures.size(); + + // Get encoded raw-buffer image and generate url + EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(gImage_600_RGB); + ImageUrl url = Toolkit::Image::GenerateUrl(buffer); + + // Async loading, no atlasing for big size image + ImageView imageView = ImageView::New(url.GetUrl()); + + // By default, Aysnc loading is used + application.GetScene().Add(imageView); + imageView.SetProperty( Actor::Property::SIZE, Vector2(100, 100) ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(16); + application.SendNotification(); + + const std::vector& textures2 = gl.GetBoundTextures(); + DALI_TEST_GREATER( textures2.size(), numTextures, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewAsyncLoadingEncodedBufferWithAtlasing(void) +{ + ToolkitTestApplication application; + + // Get encoded raw-buffer image and generate url + EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(gImage_600_RGB); + ImageUrl url = Toolkit::Image::GenerateUrl(buffer); + ImageUrl url2 = Toolkit::Image::GenerateUrl(buffer); + + // Generate url is not equal to url2 + // NOTE : This behavior may changed when ImageUrl compare operator changed. + DALI_TEST_CHECK(url != url2); + // Generate url's string is equal to url2's string + DALI_TEST_CHECK(url.GetUrl() == url2.GetUrl()); + + EncodedImageBuffer buffer2 = ConvertFileToEncodedImageBuffer(gImage_600_RGB); + url2 = Toolkit::Image::GenerateUrl(buffer2); + + // Check whethere two url are not equal + DALI_TEST_CHECK(url.GetUrl() != url2.GetUrl()); + + // Async loading, automatic atlasing for small size image + TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); + callStack.Reset(); + callStack.Enable(true); + + Property::Map imageMap; + + imageMap[ ImageVisual::Property::URL ] = url.GetUrl(); + imageMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34; + imageMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34; + imageMap[ ImageVisual::Property::ATLASING] = true; + + ImageView imageView = ImageView::New(); + imageView.SetProperty( ImageView::Property::IMAGE, imageMap ); + imageView.SetProperty( Toolkit::Control::Property::PADDING, Extents( 10u, 10u, 10u, 10u ) ); + + // By default, Aysnc loading is used + // loading is not started if the actor is offScene + + application.GetScene().Add( imageView ); + application.SendNotification(); + application.Render(16); + application.Render(16); + application.SendNotification(); + + // Change url to url2 + imageMap[ ImageVisual::Property::URL ] = url2.GetUrl(); + imageView.SetProperty( ImageView::Property::IMAGE, imageMap ); + + imageView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT ); + application.SendNotification(); + application.Render(16); + application.Render(16); + application.SendNotification(); + + // loading started, this waits for the loader thread for max 30 seconds + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(16); + + callStack.Enable(false); + + TraceCallStack::NamedParams params; + params["width"] << 34; + params["height"] << 34; + DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewSyncLoadingEncodedBuffer(void) +{ + ToolkitTestApplication application; + + tet_infoline("ImageView Testing sync loading from EncodedImageBuffer"); + + // Get encoded raw-buffer image and generate url + EncodedImageBuffer buffer = ConvertFileToEncodedImageBuffer(gImage_34_RGBA); + ImageUrl url = Toolkit::Image::GenerateUrl(buffer); + + // Sync loading, automatic atlasing for small size image + { + TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); + callStack.Reset(); + callStack.Enable(true); + + ImageView imageView = ImageView::New( ); + + // Sync loading is used + Property::Map syncLoadingMap; + syncLoadingMap[ "url" ] = url.GetUrl(); + syncLoadingMap[ "desiredHeight" ] = 34; + syncLoadingMap[ "desiredWidth" ] = 34; + syncLoadingMap[ "synchronousLoading" ] = true; + syncLoadingMap[ "atlasing" ] = true; + imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); + + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(16); TraceCallStack::NamedParams params; - params["width"] = ToString(34); - params["height"] = ToString(34); + params["width"] << 34; + params["height"] << 34; DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION ); } + END_TEST; } @@ -854,7 +883,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(); @@ -878,7 +907,7 @@ int UtcDaliImageViewSizeWithBackground(void) } ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -894,9 +923,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(); @@ -909,9 +937,9 @@ 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(); @@ -939,7 +967,7 @@ int UtcDaliImageViewHeightForWidthBackground(void) } ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -958,9 +986,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(); @@ -971,11 +997,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(); @@ -985,28 +1011,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; @@ -1022,99 +1026,22 @@ 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 ); +bool gResourceReadySignalFired = false; +Vector3 gNaturalSize; - END_TEST; +void ResourceReadySignal( Control control ) +{ + gResourceReadySignalFired = true; } -int UtcDaliImageViewSetImageOnstageN(void) +int UtcDaliImageViewCheckResourceReady(void) { ToolkitTestApplication application; - ImageView imageView = ImageView::New(); + gResourceReadySignalFired = false; - 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; - -void ResourceReadySignal( Control control ) -{ - gResourceReadySignalFired = true; -} - -int UtcDaliImageViewCheckResourceReady(void) -{ - ToolkitTestApplication application; - - gResourceReadySignalFired = false; - - // Check ImageView with background and main image, to ensure both visuals are marked as loaded - ImageView imageView = ImageView::New( TEST_GIF_FILE_NAME ); + // Check ImageView with background and main image, to ensure both visuals are marked as loaded + ImageView imageView = ImageView::New( TEST_GIF_FILE_NAME ); imageView.SetProperty( Control::Property::BACKGROUND, { @@ -1129,7 +1056,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 ); @@ -1137,65 +1064,14 @@ int UtcDaliImageViewCheckResourceReady(void) application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); - - DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); - END_TEST; -} - -int UtcDaliImageViewSetImageOffstageN(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 ); - - 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; } @@ -1207,7 +1083,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; @@ -1233,445 +1109,89 @@ int UtcDaliImageViewSetImageTypeChangesP(void) value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - DALI_TEST_CHECK( value.Get( url ) ); // Value should NOT be empty - DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty - DALI_TEST_CHECK( visual ); // Visual should be valid - - // 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( "" ); - - 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 a URL in property map - Property::Map propertyMap; - propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; - imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); - - application.SendNotification(); - application.Render( 16 ); - - value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - - DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty - DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty - DALI_TEST_CHECK( visual ); // Visual should be valid - - // Set a URL in property map again - propertyMap[ImageVisual::Property::URL] = gImage_34_RGBA; - imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); - - application.SendNotification(); - application.Render( 16 ); - - value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - - DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty - DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty - DALI_TEST_CHECK( visual ); // Visual should be valid - - // Set an empty URL in property map - propertyMap[ImageVisual::Property::URL] = std::string(); - imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); - - application.SendNotification(); - application.Render( 16 ); - - value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - - DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty - DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty - DALI_TEST_CHECK( ! visual ); // Visual should be invalid - - END_TEST; -} - -int UtcDaliImageViewResourceUrlP(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New(); - DALI_TEST_CHECK( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >().empty() ); - - imageView.SetProperty( ImageView::Property::IMAGE, "TestString" ); - DALI_TEST_EQUALS( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >(), "TestString", TEST_LOCATION ); - - END_TEST; -} - -// Scenarios 1: ImageView from regular image -int UtcDaliImageViewSetImageBufferImage(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New(); - Stage::GetCurrent().Add( imageView ); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - gl.EnableTextureCallTrace( true ); - - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - int width = 300; - int height = 400; - BufferImage image = CreateBufferImage( width, height, Color::WHITE ); - - imageView.SetImage( image ); - - 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; -} - -// Scenarios 2: ImageView from Native image -int UtcDaliImageViewSetImageNativeImage(void) -{ - ToolkitTestApplication application; - - ImageView imageView = ImageView::New(); - Stage::GetCurrent().Add( imageView ); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - gl.EnableTextureCallTrace( true ); - - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); - - int width = 200; - int height = 500; - TestNativeImagePointer nativeImageInterface = TestNativeImage::New( width, height ); - NativeImage nativeImage = NativeImage::New( *(nativeImageInterface.Get()) ); - - imageView.SetImage( nativeImage ); - 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 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 ); + DALI_TEST_CHECK( value.Get( url ) ); // Value should NOT be empty + DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty + DALI_TEST_CHECK( visual ); // Visual should be valid - std::vector< GLuint > ids; - ids.push_back( 23 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); + // Set an empty URL + imageView.SetImage( "" ); application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); + application.Render( 16 ); - std::stringstream params; - params << GL_TEXTURE_2D << ", " << 23; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); + value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); + visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - TestNativeImagePointer nativeImageInterface = TestNativeImage::New( width, height ); - NativeImage nativeImage = NativeImage::New( *(nativeImageInterface.Get()) ); - imageView.SetImage( nativeImage ); + 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 - ids.clear(); - ids.push_back( 24 ); - application.GetGlAbstraction().SetNextTextureIds( ids ); + // Set a URL in property map + Property::Map propertyMap; + propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME; + imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); application.SendNotification(); - application.Render(); + application.Render( 16 ); - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); + value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); + visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - std::stringstream nativeImageParams; - nativeImageParams << GL_TEXTURE_EXTERNAL_OES << ", " << 24; - DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", nativeImageParams.str()) ); + DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty + DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty + DALI_TEST_CHECK( visual ); // Visual should be valid + // Set a URL in property map again + propertyMap[ImageVisual::Property::URL] = gImage_34_RGBA; + imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); - END_TEST; -} + application.SendNotification(); + application.Render( 16 ); -int UtcDaliImageViewGetImageP1(void) -{ - ToolkitTestApplication application; + value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); + visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - ImageView imageView = ImageView::New(); - DALI_TEST_CHECK( ! imageView.GetImage() ); + 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 - Image image = CreateBufferImage(); - imageView.SetImage( image ); - DALI_TEST_CHECK( imageView.GetImage() == image ); + // Set an empty URL in property map + propertyMap[ImageVisual::Property::URL] = std::string(); + imageView.SetProperty( ImageView::Property::IMAGE, propertyMap ); - END_TEST; -} + application.SendNotification(); + application.Render( 16 ); -int UtcDaliImageViewGetImageP2(void) -{ - ToolkitTestApplication application; + value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); + visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE ); - BufferImage image = CreateBufferImage(); - ImageView imageView = ImageView::New( image ); - DALI_TEST_CHECK( imageView.GetImage() == image ); + DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty + DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty + DALI_TEST_CHECK( ! visual ); // Visual should be invalid END_TEST; } -int UtcDaliImageViewGetImageN(void) +int UtcDaliImageViewResourceUrlP(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 imageView = ImageView::New(); + DALI_TEST_CHECK( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >().empty() ); - imageView.SetImage( TEST_IMAGE_FILE_NAME ); - DALI_TEST_CHECK( ! imageView.GetImage() ); + imageView.SetProperty( ImageView::Property::IMAGE, "TestString" ); + DALI_TEST_EQUALS( imageView.GetProperty( ImageView::Property::IMAGE ).Get< std::string >(), "TestString", TEST_LOCATION ); 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 ); @@ -1679,7 +1199,7 @@ int UtcDaliImageViewReplaceImage(void) imageView.ResourceReadySignal().Connect( &ResourceReadySignal); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(16); @@ -1729,7 +1249,7 @@ int UtcDaliImageViewReplaceImageAndGetNaturalSize(void) dummyControl.Add( imageView ); dummyImpl.SetRelayoutCallback( &OnRelayoutOverride ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(); @@ -1857,7 +1377,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 ); @@ -1878,7 +1398,7 @@ int UtcDaliImageViewPaddingProperty(void) 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(); @@ -1928,7 +1448,7 @@ int UtcDaliImageViewPaddingProperty02(void) 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(); @@ -1969,7 +1489,7 @@ int UtcDaliImageViewPaddingProperty03(void) 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(); @@ -2017,7 +1537,7 @@ int UtcDaliImageViewPaddingProperty04(void) 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(); @@ -2069,7 +1589,7 @@ int UtcDaliImageViewTransformTest01(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -2103,7 +1623,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(); @@ -2131,7 +1651,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(); @@ -2173,7 +1693,7 @@ int UtcDaliImageViewFittingModeFitKeepAspectRatio(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2220,7 +1740,7 @@ int UtcDaliImageViewFittingModesFill(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2266,7 +1786,7 @@ int UtcDaliImageViewFittingModesOverfitKeepAspectRatio(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(600,500) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2313,7 +1833,7 @@ int UtcDaliImageViewFittingModesCenter01(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2359,7 +1879,7 @@ int UtcDaliImageViewFittingModesCenter02(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(700,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2404,7 +1924,7 @@ int UtcDaliImageViewFittingModesFitHeight01(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2449,7 +1969,7 @@ int UtcDaliImageViewFittingModesFitHeight02(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(700,600) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2494,7 +2014,7 @@ int UtcDaliImageViewFittingModesFitWidth01(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(600,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2539,7 +2059,7 @@ int UtcDaliImageViewFittingModesFitWidth02(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(700,600) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2586,7 +2106,7 @@ int UtcDaliImageViewFittingModesChangeFittingMode01(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2622,7 +2142,7 @@ int UtcDaliImageViewFittingModesChangeFittingMode01(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 ); imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); @@ -2661,7 +2181,7 @@ int UtcDaliImageViewFittingModesChangeFittingMode01(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 ); imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2708,7 +2228,7 @@ int UtcDaliImageViewFittingModesChangeFittingMode02(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2744,7 +2264,7 @@ int UtcDaliImageViewFittingModesChangeFittingMode02(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 ); imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); @@ -2783,7 +2303,7 @@ int UtcDaliImageViewFittingModesChangeFittingMode02(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 ); imageView.SetProperty( Actor::Property::SIZE, Vector2(800,700) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2817,7 +2337,7 @@ int UtcDaliImageViewFittingModesWithAnimatedVectorImageVisual(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using ScaleToFill and animated vector image ( image: [600,600], view:[600,600] )" ); + tet_infoline( "Create an ImageVisual using SCALE_TO_FILL and animated vector image ( image: [600,600], view:[600,600] )" ); ImageView imageView = ImageView::New(); Property::Map imageMap; @@ -2827,7 +2347,7 @@ int UtcDaliImageViewFittingModesWithAnimatedVectorImageVisual(void) imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); imageView.SetProperty( Actor::Property::SIZE, Vector2(600,600) ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); // Trigger a potential relayout application.SendNotification(); @@ -2878,7 +2398,7 @@ int UtcDaliImageViewCustomShader(void) ImageView imageView = ImageView::New(); imageView.SetProperty( ImageView::Property::IMAGE, properties ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -2912,7 +2432,7 @@ int UtcDaliImageViewCustomShader(void) ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME ); imageView.SetProperty( ImageView::Property::IMAGE, properties ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(); @@ -2947,7 +2467,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(); @@ -2985,7 +2505,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(); @@ -3023,7 +2543,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(); @@ -3108,16 +2628,16 @@ int UtcDaliImageViewLoadRemoteSVG(void) 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"); // 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.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 ); @@ -3156,7 +2676,7 @@ int UtcDaliImageViewSyncSVGLoading(void) syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, true); imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); DALI_TEST_CHECK( imageView ); application.SendNotification(); @@ -3191,7 +2711,7 @@ int UtcDaliImageViewAsyncSVGLoading(void) syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, false); imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); DALI_TEST_CHECK( imageView ); application.SendNotification(); @@ -3230,7 +2750,7 @@ int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void) syncLoadingMap.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, std::to_string(5) ); imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); DALI_TEST_CHECK( imageView ); application.SendNotification(); @@ -3255,22 +2775,37 @@ int UtcDaliImageViewSvgLoadingFailure(void) { ToolkitTestApplication application; - // Local svg file + // Local svg file - invalid file path { gResourceReadySignalFired = false; - ImageView imageView = ImageView::New( TEST_RESOURCE_DIR "/Kid1.svg" ); + 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 ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); + application.Render(16); - // loading started, this waits for the loader thread - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + 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 "/invalid.svg" ); + imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); + imageView.ResourceReadySignal().Connect( &ResourceReadySignal); + + DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); + + application.GetScene().Add( imageView ); application.SendNotification(); application.Render(16); @@ -3290,7 +2825,7 @@ int UtcDaliImageViewSvgLoadingFailure(void) DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); application.SendNotification(); @@ -3308,26 +2843,275 @@ 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; +} + +int UtcDaliImageViewTVGLoading(void) +{ + ToolkitTestApplication application; + + tet_infoline("ImageView Testing TVG image loading"); + + { + ImageView imageView = ImageView::New( ); + + imageView.SetImage( TEST_RESOURCE_DIR "/test.tvg" ); + + application.GetScene().Add( imageView ); + DALI_TEST_CHECK( imageView ); + Vector3 naturalSize = imageView.GetNaturalSize(); + + DALI_TEST_EQUALS( naturalSize.width, 100.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( naturalSize.height, 100.0f, TEST_LOCATION ); + } + END_TEST; +} +int UtcDaliImageViewImageLoadFailure01(void) +{ + ToolkitTestApplication application; + + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_S); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_M); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L); + + std::string brokenUrl; + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL); + DALI_TEST_EQUALS( TEST_BROKEN_IMAGE_S, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL); + DALI_TEST_EQUALS( TEST_BROKEN_IMAGE_M, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE); + DALI_TEST_EQUALS( TEST_BROKEN_IMAGE_L, brokenUrl, TEST_LOCATION); + + ImageView imageView = ImageView::New("invalidUrl.png"); + imageView.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); + + application.GetScene().Add( imageView ); + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewImageLoadFailure02(void) +{ + ToolkitTestApplication application; + + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_DEFAULT); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_M); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE, TEST_BROKEN_IMAGE_L); + + std::string brokenUrl; + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL); + DALI_TEST_EQUALS( TEST_BROKEN_IMAGE_DEFAULT, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL); + DALI_TEST_EQUALS( TEST_BROKEN_IMAGE_M, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::LARGE); + DALI_TEST_EQUALS( TEST_BROKEN_IMAGE_L, brokenUrl, TEST_LOCATION); + + ImageView imageView = ImageView::New("invalidUrl.png"); + imageView.SetProperty( Actor::Property::SIZE, Vector2( 30.f, 30.f ) ); + application.GetScene().Add( imageView ); + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewImageLoadFailure03(void) +{ + ToolkitTestApplication application; + + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL, TEST_BROKEN_IMAGE_01); + DevelStyleManager::SetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL, TEST_BROKEN_IMAGE_02); + + std::string brokenUrl; + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::SMALL); + DALI_TEST_EQUALS( TEST_BROKEN_IMAGE_01, brokenUrl, TEST_LOCATION); + + brokenUrl = DevelStyleManager::GetBrokenImageUrl(styleManager, DevelStyleManager::BrokenImageType::NORMAL); + DALI_TEST_EQUALS( TEST_BROKEN_IMAGE_02, brokenUrl, TEST_LOCATION); + + ImageView imageView = ImageView::New("invalidUrl.png"); + imageView.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); + application.GetScene().Add( imageView ); + application.SendNotification(); + application.Render(16); + + // loading started, this waits for the loader thread + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + END_TEST; +} + namespace { static int gResourceReadySignalCounter = 0; -void OnResourceReadySignal( Control control ) +void OnResourceReadySignal01( Control control ) { gResourceReadySignalCounter++; - if( gResourceReadySignalCounter == 1 ) + 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"; + } +} + +void OnResourceReadySignal02( Control control ) +{ + if(++gResourceReadySignalCounter == 1) + { + // It makes the first new visual be deleted immediately + // The first image will not be loaded. + control[ImageView::Property::IMAGE] = Property::Map().Add(ImageVisual::Property::URL, gImage_600_RGB) + .Add(ImageVisual::Property::RELEASE_POLICY, ImageVisual::ReleasePolicy::NEVER); + control[ImageView::Property::IMAGE] = TEST_IMAGE_1; + } +} + +ImageView gImageView1; +ImageView gImageView2; +ImageView gImageView3; + +void OnResourceReadySignal03( Control control ) +{ + if(gResourceReadySignalCounter == 0) + { + // Queue loading + // 1. Use cached image, then UploadComplete will be called right after OnResourceReadySignal03. + gImageView2[ImageView::Property::IMAGE] = gImage_34_RGBA; + + // 2. Load a new image + gImageView3[ImageView::Property::IMAGE] = TEST_IMAGE_1; + + // 3. Use the new image again + gImageView1[ImageView::Property::IMAGE] = TEST_IMAGE_1; + gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal03); + } + else if(gResourceReadySignalCounter == 1) { - // Set image twice - ImageView::DownCast( control ).SetImage( gImage_34_RGBA ); - ImageView::DownCast( control ).SetImage( gImage_34_RGBA ); + // This is called from TextureManager::ProcessQueuedTextures(). + gImageView1.Unparent(); + gImageView1.Reset(); } + gResourceReadySignalCounter++; +} + } +int UtcDaliImageViewSetImageOnResourceReadySignal01(void) +{ + tet_infoline("Test setting image from within signal handler."); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + ImageView imageView = ImageView::New( gImage_34_RGBA ); + imageView.ResourceReadySignal().Connect( &OnResourceReadySignal01 ); + + application.GetScene().Add( imageView ); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION ); + + DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); + + // Reset count + gResourceReadySignalCounter = 0; + + imageView[ImageView::Property::IMAGE] = "invalid.jpg"; + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + // Run idle callback + application.RunIdles(); + + DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION ); + + DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); + + END_TEST; } -int UtcDaliImageViewSetImageOnResourceReadySignal(void) +int UtcDaliImageViewSetImageOnResourceReadySignal02(void) { tet_infoline("Test setting image from within signal handler."); @@ -3336,18 +3120,50 @@ int UtcDaliImageViewSetImageOnResourceReadySignal(void) gResourceReadySignalCounter = 0; ImageView imageView = ImageView::New( gImage_34_RGBA ); - imageView.ResourceReadySignal().Connect( &OnResourceReadySignal ); + imageView.ResourceReadySignal().Connect( &OnResourceReadySignal02 ); - Stage::GetCurrent().Add( imageView ); + application.GetScene().Add( imageView ); DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); application.SendNotification(); application.Render(); + // Wait for loading an image + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION ); DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION ); END_TEST; } + +int UtcDaliImageViewSetImageOnResourceReadySignal03(void) +{ + tet_infoline("Test setting image from within signal handler."); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + gImageView1 = ImageView::New(gImage_34_RGBA); + application.GetScene().Add(gImageView1); + + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + gImageView2 = ImageView::New(gImage_600_RGB); + gImageView2.ResourceReadySignal().Connect(&OnResourceReadySignal03); + application.GetScene().Add(gImageView2); + + gImageView3 = ImageView::New(); + application.GetScene().Add(gImageView3); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + END_TEST; +}