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=e8198cacab4c84d12d1261c15a013c4029d923fa;hp=40f9c7cbe3ea6c5c08ca2ae1fcfb08341a667bd4;hb=6b496cacd2a596235a246c912a6b507a72d67ad4;hpb=0ade1ea02b460b002d9cd82cd3023a5107eb6294 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 40f9c7c..e8198ca 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) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -18,15 +18,17 @@ // Need to override adaptor classes for toolkit test harness, so include // test harness headers before dali headers. #include -#include #include #include #include +#include +#include #include #include #include +#include using namespace Dali; using namespace Toolkit; @@ -75,11 +77,17 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( 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"; + // resolution: 34*34, pixel format: RGBA8888 static const char* gImage_34_RGBA = TEST_RESOURCE_DIR "/icon-edit.png"; // resolution: 600*600, pixel format: RGB888 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" ) ); @@ -363,23 +371,87 @@ int UtcDaliImageViewSetGetProperty03(void) END_TEST; } +int UtcDaliImageViewPixelArea(void) +{ + // Test pixel area property + ToolkitTestApplication application; + + // Gif image, use AnimatedImageVisual internally + // Atlasing is applied to pack multiple frames, use custom wrap mode + ImageView gifView = ImageView::New(); + const Vector4 pixelAreaVisual( 0.f, 0.f, 2.f, 2.f ); + gifView.SetProperty( ImageView::Property::IMAGE, + Property::Map().Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME ) + .Add( ImageVisual::Property::PIXEL_AREA, pixelAreaVisual ) ); + + // Add to stage + Stage stage = Stage::GetCurrent(); + stage.Add( gifView ); + + // loading started + application.SendNotification(); + application.Render(16); + DALI_TEST_CHECK( gifView.GetRendererCount() == 1u ); + + const Vector4 fullTextureRect( 0.f, 0.f, 1.f, 1.f ); + // test that the pixel area value defined in the visual property map is registered on renderer + Renderer renderer = gifView.GetRendererAt(0); + Property::Value pixelAreaValue = renderer.GetProperty( renderer.GetPropertyIndex( "pixelArea" ) ); + DALI_TEST_EQUALS( pixelAreaValue.Get(), pixelAreaVisual, TEST_LOCATION ); + + // test that the shader has the default pixel area value registered. + Shader shader = renderer.GetShader(); + pixelAreaValue = shader.GetProperty( shader.GetPropertyIndex( "pixelArea" ) ); + DALI_TEST_EQUALS( pixelAreaValue.Get(), fullTextureRect, TEST_LOCATION ); + + // test that the uniform uses the pixelArea property on the renderer. + TestGlAbstraction& gl = application.GetGlAbstraction(); + Vector4 pixelAreaUniform; + DALI_TEST_CHECK( gl.GetUniformValue( "pixelArea", pixelAreaUniform ) ); + DALI_TEST_EQUALS( pixelAreaVisual, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + + // set the pixelArea property on the control + const Vector4 pixelAreaControl( -1.f, -1.f, 3.f, 3.f ); + gifView.SetProperty( ImageView::Property::PIXEL_AREA, pixelAreaControl ); + application.SendNotification(); + application.Render(16); + + // check the pixelArea property on the control + pixelAreaValue = gifView.GetProperty( gifView.GetPropertyIndex( "pixelArea" ) ); + DALI_TEST_EQUALS( pixelAreaValue.Get(), pixelAreaControl, TEST_LOCATION ); + // test that the uniform uses the pixelArea property on the control. + DALI_TEST_CHECK( gl.GetUniformValue( "pixelArea", pixelAreaUniform ) ); + DALI_TEST_EQUALS( pixelAreaControl, pixelAreaUniform, Math::MACHINE_EPSILON_100, TEST_LOCATION ); + + + END_TEST; +} + int UtcDaliImageViewAsyncLoadingWithoutAltasing(void) { ToolkitTestApplication application; + TestGlAbstraction& gl = application.GetGlAbstraction(); + const std::vector& textures = gl.GetBoundTextures(); + size_t numTextures = textures.size(); // Async loading, no atlasing for big size image ImageView imageView = ImageView::New( gImage_600_RGB ); // By default, Aysnc loading is used Stage::GetCurrent().Add( imageView ); + imageView.SetSize(100, 100); + imageView.SetParentOrigin( ParentOrigin::CENTER ); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + application.SendNotification(); application.Render(16); - application.Render(16); application.SendNotification(); - // BitmapLoader is not used - BitmapLoader loader = BitmapLoader::GetLatestCreated(); - DALI_TEST_CHECK( !loader ); + const std::vector& textures2 = gl.GetBoundTextures(); + DALI_TEST_GREATER( textures2.size(), numTextures, TEST_LOCATION ); + + END_TEST; } @@ -393,7 +465,15 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing(void) callStack.Reset(); callStack.Enable(true); - ImageView imageView = ImageView::New( gImage_34_RGBA, ImageDimensions( 34, 34 ) ); + Property::Map imageMap; + + imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; + imageMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34; + imageMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34; + imageMap[ DevelImageVisual::Property::ATLASING] = true; + + ImageView imageView = ImageView::New(); + imageView.SetProperty( ImageView::Property::IMAGE, imageMap ); // By default, Aysnc loading is used // loading is not started if the actor is offStage @@ -434,6 +514,7 @@ int UtcDaliImageViewAsyncLoadingWithAtlasing02(void) asyncLoadingMap[ "desiredHeight" ] = 34; asyncLoadingMap[ "desiredWidth" ] = 34; asyncLoadingMap[ "synchronousLoading" ] = false; + asyncLoadingMap[ "atlasing" ] = true; ImageView imageView = ImageView::New(); imageView.SetProperty( ImageView::Property::IMAGE, asyncLoadingMap ); @@ -468,6 +549,7 @@ int UtcDaliImageViewSyncLoading(void) Property::Map syncLoadingMap; syncLoadingMap[ ImageVisual::Property::SYNCHRONOUS_LOADING ] = true; + syncLoadingMap[ DevelImageVisual::Property::ATLASING ] = true; // Sync loading, no atlasing for big size image { @@ -476,34 +558,22 @@ int UtcDaliImageViewSyncLoading(void) // Sync loading is used syncLoadingMap[ ImageVisual::Property::URL ] = gImage_600_RGB; imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - - // BitmapLoader is used, and the loading is started immediately even the actor is not on stage. - BitmapLoader loader = BitmapLoader::GetLatestCreated(); - DALI_TEST_CHECK( loader ); } // Sync loading, automatic atlasing for small size image { - BitmapLoader::ResetLatestCreated(); TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); callStack.Reset(); callStack.Enable(true); ImageView imageView = ImageView::New( ); + // Sync loading is used syncLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA; syncLoadingMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34; syncLoadingMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34; imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - // loading is started even if the actor is offStage - BitmapLoader loader = BitmapLoader::GetLatestCreated(); - DALI_TEST_CHECK( loader ); - - loader.WaitForLoading(); - - DALI_TEST_CHECK( loader.IsLoaded() ); - Stage::GetCurrent().Add( imageView ); application.SendNotification(); application.Render(16); @@ -526,7 +596,6 @@ int UtcDaliImageViewSyncLoading02(void) // Sync loading, automatic atlasing for small size image { - BitmapLoader::ResetLatestCreated(); TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); callStack.Reset(); callStack.Enable(true); @@ -539,16 +608,9 @@ int UtcDaliImageViewSyncLoading02(void) syncLoadingMap[ "desiredHeight" ] = 34; syncLoadingMap[ "desiredWidth" ] = 34; syncLoadingMap[ "synchronousLoading" ] = true; + syncLoadingMap[ "atlasing" ] = true; imageView.SetProperty( ImageView::Property::IMAGE, syncLoadingMap ); - // loading is started even if the actor is offStage - BitmapLoader loader = BitmapLoader::GetLatestCreated(); - DALI_TEST_CHECK( loader ); - - loader.WaitForLoading(); - - DALI_TEST_CHECK( loader.IsLoaded() ); - Stage::GetCurrent().Add( imageView ); application.SendNotification(); application.Render(16); @@ -768,6 +830,46 @@ int UtcDaliImageViewSetImageOffstageP(void) END_TEST; } +bool gResourceReadySignalFired = false; + +void ResourceReadySignal( Control control ) +{ + gResourceReadySignalFired = true; +} + +int UtcDaliImageViewCheckResourceReady(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_GIF_FILE_NAME ); + + imageView.SetBackgroundImage( image ); + + DALI_TEST_EQUALS( Toolkit::DevelControl::IsResourceReady( imageView ), false, TEST_LOCATION ); + + Toolkit::DevelControl::ResourceReadySignal( imageView ).Connect( &ResourceReadySignal); + + Stage::GetCurrent().Add( imageView ); + + application.SendNotification(); + application.Render(16); + + + DALI_TEST_EQUALS( Toolkit::DevelControl::IsResourceReady( imageView ), true, TEST_LOCATION ); + + DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + + END_TEST; +} + int UtcDaliImageViewSetImageOffstageN(void) { ToolkitTestApplication application; @@ -941,7 +1043,7 @@ int UtcDaliImageViewSetImageNativeImage(void) DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); std::stringstream params; - params << GL_TEXTURE_2D << ", " << 23; + params << GL_TEXTURE_EXTERNAL_OES << ", " << 23; DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); END_TEST; @@ -991,7 +1093,7 @@ int UtcDaliImageViewSetImageBufferImageToNativeImage(void) DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); std::stringstream nextTextureParams; - nextTextureParams << GL_TEXTURE_2D << ", " << 24; + nextTextureParams << GL_TEXTURE_EXTERNAL_OES << ", " << 24; DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", nextTextureParams.str()) ); END_TEST; @@ -1023,7 +1125,7 @@ int UtcDaliImageViewSetImageNativeImageToBufferImage(void) DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); std::stringstream params; - params << GL_TEXTURE_2D << ", " << 23; + params << GL_TEXTURE_EXTERNAL_OES << ", " << 23; DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); width = 200; @@ -1090,7 +1192,7 @@ int UtcDaliImageViewSetImageNativeImageWithCustomShader(void) DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); std::stringstream params; - params << GL_TEXTURE_2D << ", " << 23; + params << GL_TEXTURE_EXTERNAL_OES << ", " << 23; DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", params.str()) ); END_TEST; @@ -1155,7 +1257,7 @@ int UtcDaliImageViewSetImageBufferImageWithCustomShaderToNativeImage(void) DALI_TEST_CHECK( gl.GetTextureTrace().FindMethod("BindTexture") ); std::stringstream nativeImageParams; - nativeImageParams << GL_TEXTURE_2D << ", " << 24; + nativeImageParams << GL_TEXTURE_EXTERNAL_OES << ", " << 24; DALI_TEST_CHECK( gl.GetTextureTrace().FindMethodAndParams("BindTexture", nativeImageParams.str()) ); @@ -1203,3 +1305,52 @@ int UtcDaliImageViewGetImageN(void) 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( Toolkit::DevelControl::IsResourceReady( imageView ), false, TEST_LOCATION ); + + Toolkit::DevelControl::ResourceReadySignal( imageView ).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( Toolkit::DevelControl::IsResourceReady( imageView ), true, TEST_LOCATION ); + + DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION ); + + END_TEST; +}