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-RendererFactory.cpp;h=45550c24cc20faaa417170b32669bd1c424d1f1d;hp=a3d65a7bc073cefaf0c88174de3a60d3eadc0112;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=6da8438e9ac7350d9cc6f69b35cbcc4ab3987da1 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp index a3d65a7..45550c2 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp @@ -17,8 +17,9 @@ #include #include #include +#include #include -#include +#include #include #include @@ -32,6 +33,8 @@ typedef NinePatchImage::StretchRanges StretchRanges; const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg"; const char* TEST_NPATCH_FILE_NAME = "gallery_image_01.9.jpg"; +const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg"; + Integration::Bitmap* CreateBitmap( unsigned int imageWidth, unsigned int imageHeight, unsigned int initialColor, Pixel::Format pixelFormat ) { Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_RETAIN ); @@ -165,15 +168,25 @@ Integration::ResourcePointer CustomizeNinePatch( TestApplication& application, return resourcePtr; } -void TestControlRendererRender( ToolkitTestApplication& application, Actor& actor, ControlRenderer& controlRenderer, Integration::ResourcePointer resourcePtr = Integration::ResourcePointer(), std::size_t expectedSamplers = 0) +void TestControlRendererRender( ToolkitTestApplication& application, + Actor& actor, + ControlRenderer& controlRenderer, + std::size_t expectedSamplers = 0, + ImageDimensions imageDimensions = ImageDimensions(), + Integration::ResourcePointer resourcePtr = Integration::ResourcePointer()) { + if( resourcePtr ) + { + // set the image size, for test case, this needs to be set before loading started + application.GetPlatform().SetClosestImageSize( Vector2(imageDimensions.GetWidth(), imageDimensions.GetHeight()) ); + } + actor.SetSize( 200.f, 200.f ); Stage::GetCurrent().Add( actor ); controlRenderer.SetSize( Vector2(200.f, 200.f) ); controlRenderer.SetOnStage( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - DALI_TEST_CHECK( actor.GetRendererAt(0u).GetMaterial().GetNumberOfTextures() == expectedSamplers ); application.SendNotification(); application.Render(); @@ -275,8 +288,8 @@ int UtcDaliRendererFactoryGetColorRenderer1(void) Property::Map propertyMap; Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f ); - propertyMap.Insert("renderer-type", "color-renderer"); - propertyMap.Insert("blend-color", testColor); + propertyMap.Insert("rendererType", "color"); + propertyMap.Insert("blendColor", testColor); ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap); DALI_TEST_CHECK( controlRenderer ); @@ -286,7 +299,7 @@ int UtcDaliRendererFactoryGetColorRenderer1(void) Vector4 actualValue(Vector4::ZERO); TestGlAbstraction& gl = application.GetGlAbstraction(); - DALI_TEST_CHECK( gl.GetUniformValue( "uBlendColor", actualValue ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "blendColor", actualValue ) ); DALI_TEST_EQUALS( actualValue, testColor, TEST_LOCATION ); END_TEST; @@ -309,7 +322,7 @@ int UtcDaliRendererFactoryGetColorRenderer2(void) Vector4 actualValue(Vector4::ZERO); TestGlAbstraction& gl = application.GetGlAbstraction(); - DALI_TEST_CHECK( gl.GetUniformValue( "uBlendColor", actualValue ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "blendColor", actualValue ) ); DALI_TEST_EQUALS( actualValue, testColor, TEST_LOCATION ); controlRenderer.SetOffStage( actor ); @@ -329,9 +342,9 @@ int UtcDaliRendererFactoryGetBorderRenderer1(void) Property::Map propertyMap; Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f ); float testSize = 5.f; - propertyMap.Insert("renderer-type", "border-renderer"); - propertyMap.Insert("border-color", testColor); - propertyMap.Insert("border-size", testSize); + propertyMap.Insert("rendererType", "border"); + propertyMap.Insert("borderColor", testColor); + propertyMap.Insert("borderSize", testSize); ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap); DALI_TEST_CHECK( controlRenderer ); @@ -343,6 +356,8 @@ int UtcDaliRendererFactoryGetBorderRenderer1(void) controlRenderer.SetOnStage( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + int blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLENDING_MODE ); + DALI_TEST_EQUALS( static_cast(blendMode), BlendingMode::ON, TEST_LOCATION ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -350,11 +365,11 @@ int UtcDaliRendererFactoryGetBorderRenderer1(void) application.Render(0); Vector4 actualColor(Vector4::ZERO); - DALI_TEST_CHECK( gl.GetUniformValue( "uBorderColor", actualColor ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "borderColor", actualColor ) ); DALI_TEST_EQUALS( actualColor, testColor, TEST_LOCATION ); float actualSize = 0.f; - DALI_TEST_CHECK( gl.GetUniformValue( "uBorderSize", actualSize ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "borderSize", actualSize ) ); DALI_TEST_EQUALS( actualSize, testSize, TEST_LOCATION ); controlRenderer.SetOffStage( actor ); @@ -371,10 +386,10 @@ int UtcDaliRendererFactoryGetBorderRenderer2(void) RendererFactory factory = RendererFactory::Get(); DALI_TEST_CHECK( factory ); - Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f ); + Vector4 testColor( 1.f, 0.5f, 0.3f, 1.f ); float testSize = 5.f; - ControlRenderer controlRenderer = factory.GetControlRenderer(testSize, testColor); + ControlRenderer controlRenderer = factory.GetControlRenderer(testSize, testColor ); DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); @@ -390,18 +405,31 @@ int UtcDaliRendererFactoryGetBorderRenderer2(void) application.SendNotification(); application.Render(0); + int blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLENDING_MODE ); + DALI_TEST_EQUALS( static_cast(blendMode), BlendingMode::AUTO, TEST_LOCATION ); + Vector4 actualColor(Vector4::ZERO); - DALI_TEST_CHECK( gl.GetUniformValue( "uBorderColor", actualColor ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "borderColor", actualColor ) ); DALI_TEST_EQUALS( actualColor, testColor, TEST_LOCATION ); float actualSize = 0.f; - DALI_TEST_CHECK( gl.GetUniformValue( "uBorderSize", actualSize ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "borderSize", actualSize ) ); DALI_TEST_EQUALS( actualSize, testSize, TEST_LOCATION ); + controlRenderer.SetOffStage( actor ); + + // enable the anti-aliasing + controlRenderer = factory.GetControlRenderer(testSize, testColor, true ); + controlRenderer.SetOnStage( actor ); + + application.SendNotification(); + application.Render(0); + blendMode = actor.GetRendererAt(0u).GetProperty( Renderer::Property::BLENDING_MODE ); + DALI_TEST_EQUALS( static_cast(blendMode), BlendingMode::ON, TEST_LOCATION ); + END_TEST; } - int UtcDaliRendererFactoryGetLinearGradientRenderer(void) { ToolkitTestApplication application; @@ -411,30 +439,30 @@ int UtcDaliRendererFactoryGetLinearGradientRenderer(void) DALI_TEST_CHECK( factory ); Property::Map propertyMap; - propertyMap.Insert("renderer-type", "gradient-renderer"); + propertyMap.Insert("rendererType", "gradient"); Vector2 start(-1.f, -1.f); Vector2 end(1.f, 1.f); - propertyMap.Insert("gradient-start-position", start); - propertyMap.Insert("gradient-end-position", end); - propertyMap.Insert("gradient-spread-method", "repeat"); + propertyMap.Insert("startPosition", start); + propertyMap.Insert("endPosition", end); + propertyMap.Insert("spreadMethod", "repeat"); Property::Array stopOffsets; stopOffsets.PushBack( 0.2f ); stopOffsets.PushBack( 0.8f ); - propertyMap.Insert("gradient-stop-offset", stopOffsets); + propertyMap.Insert("stopOffset", stopOffsets); Property::Array stopColors; stopColors.PushBack( Color::RED ); stopColors.PushBack( Color::GREEN ); - propertyMap.Insert("gradient-stop-color", stopColors); + propertyMap.Insert("stopColor", stopColors); ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap); DALI_TEST_CHECK( controlRenderer ); // A lookup texture is generated and pass to shader as sampler Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, Integration::ResourcePointer(), 1u ); + TestControlRendererRender( application, actor, controlRenderer, 1u ); controlRenderer.SetOffStage( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); @@ -451,30 +479,30 @@ int UtcDaliRendererFactoryGetRadialGradientRenderer(void) DALI_TEST_CHECK( factory ); Property::Map propertyMap; - propertyMap.Insert("renderer-type", "gradient-renderer"); + propertyMap.Insert("rendererType", "gradient"); Vector2 center(100.f, 100.f); float radius = 100.f; - propertyMap.Insert("gradient-units", "user-space"); - propertyMap.Insert("gradient-center", center); - propertyMap.Insert("gradient-radius", radius); + propertyMap.Insert("units", "userSpace"); + propertyMap.Insert("center", center); + propertyMap.Insert("radius", radius); Property::Array stopOffsets; stopOffsets.PushBack( 0.0f ); stopOffsets.PushBack( 1.f ); - propertyMap.Insert("gradient-stop-offset", stopOffsets); + propertyMap.Insert("stopOffset", stopOffsets); Property::Array stopColors; stopColors.PushBack( Color::RED ); stopColors.PushBack( Color::GREEN ); - propertyMap.Insert("gradient-stop-color", stopColors); + propertyMap.Insert("stopColor", stopColors); ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap); DALI_TEST_CHECK( controlRenderer ); // A lookup texture is generated and pass to shader as sampler Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, Integration::ResourcePointer(), 1u ); + TestControlRendererRender( application, actor, controlRenderer, 1u ); Matrix3 alignMatrix( radius, 0.f, 0.f, 0.f, radius, 0.f, center.x, center.y, 1.f ); alignMatrix.Invert(); @@ -487,6 +515,41 @@ int UtcDaliRendererFactoryGetRadialGradientRenderer(void) END_TEST; } +int UtcDaliRendererFactoryDefaultOffsetsGradientRenderer(void) +{ + ToolkitTestApplication application; + tet_infoline("UtcDaliRendererFactoryGetRadialGradientRenderer"); + + RendererFactory factory = RendererFactory::Get(); + DALI_TEST_CHECK( factory ); + + Property::Map propertyMap; + propertyMap.Insert("rendererType", "gradient"); + + Vector2 start(-1.f, -1.f); + Vector2 end(1.f, 1.f); + propertyMap.Insert("startPosition", start); + propertyMap.Insert("endPosition", end); + propertyMap.Insert("spreadMethod", "repeat"); + + Property::Array stopColors; + stopColors.PushBack( Color::RED ); + stopColors.PushBack( Color::GREEN ); + propertyMap.Insert("stopColor", stopColors); + + ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap); + DALI_TEST_CHECK( controlRenderer ); + + // A lookup texture is generated and pass to shader as sampler + Actor actor = Actor::New(); + TestControlRendererRender( application, actor, controlRenderer, 1u ); + + controlRenderer.SetOffStage( actor ); + DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); + + END_TEST; +} + int UtcDaliRendererFactoryGetImageRenderer1(void) { ToolkitTestApplication application; @@ -496,19 +559,30 @@ int UtcDaliRendererFactoryGetImageRenderer1(void) DALI_TEST_CHECK( factory ); Property::Map propertyMap; - propertyMap.Insert( "renderer-type", "image-renderer" ); - propertyMap.Insert( "image-url", TEST_IMAGE_FILE_NAME ); + propertyMap.Insert( "rendererType", "image" ); + propertyMap.Insert( "imageUrl", TEST_IMAGE_FILE_NAME ); ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)), 1u ); + // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. + // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. + const int width=512; + const int height=513; TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD ); + bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, width, height,width, height ); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(width, height), + Integration::ResourcePointer( bitmap ) ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); controlRenderer.SetOffStage( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); @@ -528,12 +602,24 @@ int UtcDaliRendererFactoryGetImageRenderer2(void) ControlRenderer controlRenderer = factory.GetControlRenderer( image ); Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)), 1u ); + // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied. + // Image with a size smaller than 512*512 will be uploaded as a part of the atlas. + + const int width=512; + const int height=513; + + Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD ); + bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, width, height,width, height ); TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(width, height), + Integration::ResourcePointer(bitmap) ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); END_TEST; } @@ -555,35 +641,43 @@ int UtcDaliRendererFactoryGetNPatchRenderer1(void) Integration::ResourcePointer ninePatchResource = CustomizeNinePatch( application, ninePatchImageWidth, ninePatchImageHeight, stretchRangesX, stretchRangesY ); Property::Map propertyMap; - propertyMap.Insert( "renderer-type", "n-patch-renderer" ); - propertyMap.Insert( "image-url", TEST_NPATCH_FILE_NAME ); + propertyMap.Insert( "rendererType", "nPatch" ); + propertyMap.Insert( "imageUrl", TEST_NPATCH_FILE_NAME ); { tet_infoline( "whole grid" ); ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, ninePatchResource, 1u ); TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(ninePatchImageWidth, ninePatchImageHeight), + ninePatchResource ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); } - propertyMap.Insert( "border-only", true ); + propertyMap.Insert( "borderOnly", true ); { tet_infoline( "border only" ); ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, ninePatchResource, 1u ); TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(ninePatchImageWidth, ninePatchImageHeight), + ninePatchResource ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); } END_TEST; @@ -611,37 +705,44 @@ int UtcDaliRendererFactoryGetNPatchRenderer2(void) Integration::ResourcePointer ninePatchResource = CustomizeNinePatch( application, ninePatchImageWidth, ninePatchImageHeight, stretchRangesX, stretchRangesY ); Property::Map propertyMap; - propertyMap.Insert( "renderer-type", "n-patch-renderer" ); - propertyMap.Insert( "image-url", TEST_NPATCH_FILE_NAME ); + propertyMap.Insert( "rendererType", "nPatch" ); + propertyMap.Insert( "imageUrl", TEST_NPATCH_FILE_NAME ); { ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, ninePatchResource, 1u ); - TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(ninePatchImageWidth, ninePatchImageHeight), + ninePatchResource ); + + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); controlRenderer.SetOffStage( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); } - propertyMap.Insert( "border-only", true ); + propertyMap.Insert( "borderOnly", true ); { tet_infoline( "border only" ); ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); DALI_TEST_CHECK( controlRenderer ); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, ninePatchResource, 1u ); + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(ninePatchImageWidth, ninePatchImageHeight), + ninePatchResource ); - TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); controlRenderer.SetOffStage( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); @@ -670,12 +771,16 @@ int UtcDaliRendererFactoryGetNPatchRenderer3(void) DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, ninePatchResource, 1u ); TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(ninePatchImageWidth, ninePatchImageHeight), + ninePatchResource ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); END_TEST; } @@ -705,12 +810,16 @@ int UtcDaliRendererFactoryGetNPatchRenderer4(void) DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); - TestControlRendererRender( application, actor, controlRenderer, ninePatchResource, 1u ); TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(ninePatchImageWidth, ninePatchImageHeight), + ninePatchResource ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); END_TEST; } @@ -729,13 +838,20 @@ int UtcDaliRendererFactoryGetNPatchRendererN1(void) DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); + //The testkit still has to load a bitmap for the broken renderer image - TestControlRendererRender( application, actor, controlRenderer, Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)), 1u ); + Integration::Bitmap* bitmap = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD); + bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, 100, 100, 100, 100 ); TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(), + Integration::ResourcePointer(bitmap) ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); END_TEST; } @@ -751,20 +867,67 @@ int UtcDaliRendererFactoryGetNPatchRendererN2(void) DALI_TEST_CHECK( factory ); Property::Map propertyMap; - propertyMap.Insert( "renderer-type", "n-patch-renderer" ); - propertyMap.Insert( "image-url", 111 ); + propertyMap.Insert( "rendererType", "nPatch" ); + propertyMap.Insert( "imageUrl", 111 ); ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); DALI_TEST_CHECK( controlRenderer ); Actor actor = Actor::New(); + //The testkit still has to load a bitmap for the broken renderer image - TestControlRendererRender( application, actor, controlRenderer, Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)), 1u ); + Integration::Bitmap* bitmap = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD); + bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, 100, 100, 100, 100 ); + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + TestControlRendererRender( application, actor, controlRenderer, 1u, + ImageDimensions(), + Integration::ResourcePointer(bitmap) ); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliRendererFactoryGetSvgRenderer(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcDaliRendererFactoryGetSvgRenderer: Request svg renderer with a svg url" ); + + RendererFactory factory = RendererFactory::Get(); + ControlRenderer controlRenderer = factory.GetControlRenderer( TEST_SVG_FILE_NAME ); + DALI_TEST_CHECK( controlRenderer ); TestGlAbstraction& gl = application.GetGlAbstraction(); - int textureUnit = -1; - DALI_TEST_CHECK( gl.GetUniformValue< int >( "sTexture", textureUnit ) ); - DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION ); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + Actor actor = Actor::New(); + actor.SetSize( 200.f, 200.f ); + Stage::GetCurrent().Add( actor ); + controlRenderer.SetSize( Vector2(200.f, 200.f) ); + controlRenderer.SetOnStage( actor ); + application.SendNotification(); + application.Render(); + + DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + + EventThreadCallback* eventTrigger = EventThreadCallback::Get(); + CallbackBase* callback = eventTrigger->GetCallback(); + + eventTrigger->WaitingForTrigger( 1 );// waiting until the svg image is rasterized. + CallbackBase::Execute( *callback ); + + DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + + // waiting for the resource uploading + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION ); END_TEST; } @@ -785,13 +948,13 @@ int UtcDaliRendererFactoryResetRenderer1(void) Vector4 actualValue(Vector4::ZERO); TestGlAbstraction& gl = application.GetGlAbstraction(); - DALI_TEST_CHECK( gl.GetUniformValue( "uBlendColor", actualValue ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "blendColor", actualValue ) ); DALI_TEST_EQUALS( actualValue, Color::RED, TEST_LOCATION ); factory.ResetRenderer( controlRenderer, actor, Color::GREEN ); application.SendNotification(); application.Render(0); - DALI_TEST_CHECK( gl.GetUniformValue( "uBlendColor", actualValue ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "blendColor", actualValue ) ); DALI_TEST_EQUALS( actualValue, Color::GREEN, TEST_LOCATION ); Image bufferImage = CreateBufferImage( 100, 200, Vector4( 1.f, 1.f, 1.f, 1.f ) ); @@ -845,8 +1008,46 @@ int UtcDaliRendererFactoryResetRenderer2(void) application.SendNotification(); application.Render(0); Vector4 actualValue(Vector4::ZERO); - DALI_TEST_CHECK( gl.GetUniformValue( "uBlendColor", actualValue ) ); + DALI_TEST_CHECK( gl.GetUniformValue( "blendColor", actualValue ) ); DALI_TEST_EQUALS( actualValue, Color::RED, TEST_LOCATION ); END_TEST; } + +int UtcDaliRendererFactoryResetRenderer3(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcDaliRendererFactoryResetRenderer3" ); + + Actor actor = Actor::New(); + actor.SetSize(200.f, 200.f); + Stage::GetCurrent().Add( actor ); + RendererFactory factory = RendererFactory::Get(); + DALI_TEST_CHECK( factory ); + + // Get renderer for rendering a resource image + Image resourceImage = ResourceImage::New(TEST_IMAGE_FILE_NAME); + ControlRenderer controlRenderer = factory.GetControlRenderer( resourceImage ); + DALI_TEST_CHECK( controlRenderer ); + controlRenderer.SetSize(Vector2(200.f, 200.f)); + controlRenderer.SetOnStage( actor ); + application.SendNotification(); + application.Render(); + + DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + + // reset the renderer to renderer a svg image + factory.ResetRenderer( controlRenderer, actor, TEST_SVG_FILE_NAME, ImageDimensions( 100, 100 ) ); + application.SendNotification(); + application.Render(); + + DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + + EventThreadCallback* eventTrigger = EventThreadCallback::Get(); + CallbackBase* callback = eventTrigger->GetCallback(); + + eventTrigger->WaitingForTrigger( 1 );// waiting until the svg image is rasterized. + CallbackBase::Execute( *callback ); + + END_TEST; +}