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=7a7bf26d23ca1e6cff369120c54c0d115ff2e892;hp=5694d9f6ca67420a5e93b986c7b8294450468939;hb=23446c257d6ae1977bb69e53353fb1ccd5409432;hpb=3194e652e08af630b8996c88b0d0f09e3e78b568 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 5694d9f..7a7bf26 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -23,6 +23,7 @@ #include #include +#include #include "dummy-control.h" #include @@ -784,9 +785,25 @@ int UtcDaliImageViewAsyncLoadingEncodedBufferWithAtlasing(void) Property::Map imageMap; imageMap[ImageVisual::Property::URL] = url.GetUrl(); + imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 600; + imageMap[ImageVisual::Property::DESIRED_WIDTH] = 600; + imageMap[ImageVisual::Property::ATLASING] = true; + + // No atlasing with big image + ImageView imageView_bigdesired = ImageView::New(); + imageView_bigdesired.SetProperty(ImageView::Property::IMAGE, imageMap); + imageView_bigdesired.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u)); + + imageMap[ImageVisual::Property::DESIRED_HEIGHT] = 0; + imageMap[ImageVisual::Property::DESIRED_WIDTH] = 0; + + // No atlasing with zero desired size + ImageView imageView_nodesired = ImageView::New(); + imageView_nodesired.SetProperty(ImageView::Property::IMAGE, imageMap); + imageView_nodesired.SetProperty(Toolkit::Control::Property::PADDING, Extents(10u, 10u, 10u, 10u)); + 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); @@ -794,10 +811,15 @@ int UtcDaliImageViewAsyncLoadingEncodedBufferWithAtlasing(void) // By default, Aysnc loading is used // loading is not started if the actor is offScene - application.GetScene().Add(imageView); + application.GetScene().Add(imageView_bigdesired); + application.GetScene().Add(imageView_nodesired); 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); + application.Render(16); application.SendNotification(); @@ -848,6 +870,7 @@ int UtcDaliImageViewSyncLoadingEncodedBuffer(void) // Sync loading is used Property::Map syncLoadingMap; syncLoadingMap["url"] = url.GetUrl(); + syncLoadingMap["alphaMaskUrl"] = gImage_34_RGBA; syncLoadingMap["desiredHeight"] = 34; syncLoadingMap["desiredWidth"] = 34; syncLoadingMap["synchronousLoading"] = true; @@ -2645,30 +2668,58 @@ int UtcDaliImageViewLoadRemoteSVG(void) tet_infoline("Test load from a remote server."); ToolkitTestApplication application; - Toolkit::ImageView imageView; - imageView = Toolkit::ImageView::New(); - imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg"); - // Victor. Temporary (or permanent?) update as the url above seems not to work from time to time ... - // imageView.SetImage("https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/SVG_logo.svg/64px-SVG_logo.svg.png"); - imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); - imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); - imageView.SetProperty(Actor::Property::SIZE, Vector2(300, 300)); - imageView.SetProperty(Actor::Property::POSITION, Vector3(150.0f, 150.0f, 0.0f)); - application.GetScene().Add(imageView); + { + Toolkit::ImageView imageView; + imageView = Toolkit::ImageView::New(); + imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg"); + 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)); - DALI_TEST_CHECK(imageView); + application.GetScene().Add(imageView); - DALI_TEST_EQUALS(imageView.GetRendererCount(), 0u, TEST_LOCATION); + DALI_TEST_CHECK(imageView); - application.SendNotification(); + DALI_TEST_EQUALS(imageView.GetRendererCount(), 0u, TEST_LOCATION); - DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + application.SendNotification(); - application.SendNotification(); - application.Render(); + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); - DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + } + + // Without size set + { + Toolkit::ImageView imageView; + imageView = Toolkit::ImageView::New(); + imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg"); + imageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + imageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imageView.SetProperty(Actor::Property::POSITION, Vector3(150.0f, 150.0f, 0.0f)); + + application.GetScene().Add(imageView); + + DALI_TEST_CHECK(imageView); + + DALI_TEST_EQUALS(imageView.GetRendererCount(), 0u, TEST_LOCATION); + + application.SendNotification(); + + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + } END_TEST; } @@ -2679,12 +2730,7 @@ int UtcDaliImageViewSyncSVGLoading(void) tet_infoline("ImageView Testing SVG image sync loading"); - // Sync loading, automatic atlasing for small size image { - TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); - callStack.Reset(); - callStack.Enable(true); - ImageView imageView = ImageView::New(); // Sync loading is used @@ -2698,7 +2744,6 @@ int UtcDaliImageViewSyncSVGLoading(void) DALI_TEST_CHECK(imageView); application.SendNotification(); - application.Render(16); Vector3 naturalSize = imageView.GetNaturalSize(); DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION); @@ -2713,28 +2758,27 @@ int UtcDaliImageViewAsyncSVGLoading(void) tet_infoline("ImageView Testing SVG image async loading"); - // Sync loading, automatic atlasing for small size image { - TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); - callStack.Reset(); - callStack.Enable(true); - ImageView imageView = ImageView::New(); - // Sync loading is used - Property::Map syncLoadingMap; - syncLoadingMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); - syncLoadingMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg"); - syncLoadingMap.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, false); - imageView.SetProperty(ImageView::Property::IMAGE, syncLoadingMap); + // Async loading is used - default value of SYNCHRONOUS_LOADING is false. + Property::Map propertyMap; + propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + propertyMap.Insert(Toolkit::ImageVisual::Property::URL, TEST_RESOURCE_DIR "/svg1.svg"); + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); application.GetScene().Add(imageView); DALI_TEST_CHECK(imageView); application.SendNotification(); + + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); application.Render(16); - Vector3 naturalSize = imageView.GetNaturalSize(); + Vector3 naturalSize = imageView.GetNaturalSize(); DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION); DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION); } @@ -2747,12 +2791,8 @@ int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void) tet_infoline("ImageView Testing SVG image async loading"); - // Sync loading, automatic atlasing for small size image + // Sync loading { - TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); - callStack.Reset(); - callStack.Enable(true); - ImageView imageView = ImageView::New(); // Sync loading is used @@ -2771,7 +2811,13 @@ int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void) DALI_TEST_CHECK(imageView); application.SendNotification(); + + // Wait for loading + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); application.Render(16); + Vector3 naturalSize = imageView.GetNaturalSize(); DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION); DALI_TEST_EQUALS(naturalSize.height, 100.0f, TEST_LOCATION); @@ -2787,12 +2833,16 @@ int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void) END_TEST; } -int UtcDaliImageViewSvgLoadingFailure(void) +int UtcDaliImageViewSvgLoadingFailureLocalFile(void) { - ToolkitTestApplication application; - // Local svg file - invalid file path { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + gResourceReadySignalFired = false; ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/foo.svg"); @@ -2804,16 +2854,67 @@ int UtcDaliImageViewSvgLoadingFailure(void) application.GetScene().Add(imageView); application.SendNotification(); + + // loading started, this waits for the loader thread - load + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + } + + // Local svg file - invalid file path without size set + { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + gResourceReadySignalFired = false; + textureTrace.Reset(); + + ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/foo.svg"); + 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 - load & rasterize + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); application.Render(16); DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); } // Local svg file - invalid file { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + gResourceReadySignalFired = false; + textureTrace.Reset(); ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/invalid.svg"); imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); @@ -2824,18 +2925,38 @@ int UtcDaliImageViewSvgLoadingFailure(void) application.GetScene().Add(imageView); application.SendNotification(); + + // loading started, this waits for the loader thread - load & rasterize + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); application.Render(16); DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); } + END_TEST; +} + +int UtcDaliImageViewSvgLoadingFailureRemoteFile01(void) +{ // Remote svg file { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + gResourceReadySignalFired = false; - ImageView imageView = ImageView::New("https://bar.org/foobar.svg"); + ImageView imageView = ImageView::New("https://127.0.0.1/foobar.svg"); imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); imageView.ResourceReadySignal().Connect(&ResourceReadySignal); @@ -2845,7 +2966,46 @@ int UtcDaliImageViewSvgLoadingFailure(void) application.SendNotification(); - // loading started, this waits for the loader thread + // loading started, this waits for the loader thread - load & rasterize + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + DALI_TEST_EQUALS(gResourceReadySignalFired, true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + } + + END_TEST; +} + +int UtcDaliImageViewSvgLoadingFailureRemoteFile02(void) +{ + // Remote svg file without size set + { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + gResourceReadySignalFired = false; + + ImageView imageView = ImageView::New("https://127.0.0.1/foobar.svg"); + 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 - load & rasterize DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); @@ -2854,6 +3014,10 @@ int UtcDaliImageViewSvgLoadingFailure(void) 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); + + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); } END_TEST; @@ -2865,7 +3029,11 @@ int UtcDaliImageViewSvgRasterizationFailure(void) gResourceReadySignalFired = false; - ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/svg1.svg"); + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/invalid1.svg"); imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); imageView.ResourceReadySignal().Connect(&ResourceReadySignal); @@ -2875,34 +3043,109 @@ int UtcDaliImageViewSvgRasterizationFailure(void) application.SendNotification(); - // loading started, this waits for the loader thread - DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), 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); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(ImageView::Property::IMAGE), Visual::ResourceStatus::FAILED, TEST_LOCATION); - // Reset flag - gResourceReadySignalFired = false; + // Should be shown a broken image + DALI_TEST_EQUALS(imageView.GetRendererCount(), 1u, TEST_LOCATION); + DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION); + + END_TEST; +} - // Change size - imageView.SetProperty(Actor::Property::SIZE, Vector2(0.f, 0.f)); +int UtcDaliImageViewSvgChageSize(void) +{ + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + ImageView imageView = ImageView::New(TEST_SVG_FILE_NAME); + application.GetScene().Add(imageView); application.SendNotification(); - // rasterization started, this waits for the rasterize thread + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + DALI_TEST_EQUALS(Test::VectorImageRenderer::GetLoadCount(), 1, TEST_LOCATION); + + // Change actor size, then rasterization should be done again + imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); + + application.SendNotification(); + + // Wait for rasterization 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); + // We should not load the file again. + DALI_TEST_EQUALS(Test::VectorImageRenderer::GetLoadCount(), 1, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliImageViewSvgAtlasing(void) +{ + ToolkitTestApplication application; + + TraceCallStack& callStack = application.GetGlAbstraction().GetTextureTrace(); + callStack.Reset(); + callStack.Enable(true); + + Property::Map propertyMap; + propertyMap["url"] = TEST_SVG_FILE_NAME; + propertyMap["atlasing"] = true; + + ImageView imageView = ImageView::New(); + imageView.SetProperty(ImageView::Property::IMAGE, propertyMap); + imageView.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f)); + application.GetScene().Add(imageView); + + application.SendNotification(); + + // Wait for loading & rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + + // use atlas + TraceCallStack::NamedParams params1; + params1["width"] << 100; + params1["height"] << 100; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexSubImage2D", params1), true, TEST_LOCATION); + + imageView.SetProperty(Actor::Property::SIZE, Vector2(600.f, 600.f)); + + application.SendNotification(); + + // Wait for rasterization + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + callStack.Reset(); + + application.SendNotification(); + application.Render(16); + + // not use atlas + TraceCallStack::NamedParams params2; + params2["width"] << 600; + params2["height"] << 600; + DALI_TEST_EQUALS(callStack.FindMethodAndParams("TexImage2D", params2), true, TEST_LOCATION); END_TEST; } @@ -2914,12 +3157,17 @@ int UtcDaliImageViewTVGLoading(void) tet_infoline("ImageView Testing TVG image loading"); { - ImageView imageView = ImageView::New(); - - imageView.SetImage(TEST_RESOURCE_DIR "/test.tvg"); - + ImageView imageView = ImageView::New(TEST_RESOURCE_DIR "/test.tvg"); application.GetScene().Add(imageView); DALI_TEST_CHECK(imageView); + + application.SendNotification(); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(16); + Vector3 naturalSize = imageView.GetNaturalSize(); DALI_TEST_EQUALS(naturalSize.width, 100.0f, TEST_LOCATION); @@ -2927,6 +3175,7 @@ int UtcDaliImageViewTVGLoading(void) } END_TEST; } + int UtcDaliImageViewImageLoadFailure01(void) { ToolkitTestApplication application; @@ -3088,7 +3337,7 @@ void OnResourceReadySignal01(Control control) else if(control.GetVisualResourceStatus(ImageView::Property::IMAGE) == Visual::ResourceStatus::FAILED) { // Make the resource ready immediately - control[ImageView::Property::IMAGE] = TEST_RESOURCE_DIR "/svg1.svg"; + control[ImageView::Property::IMAGE] = gImage_600_RGB; } } @@ -3198,6 +3447,19 @@ void OnResourceReadySignal04(Control control) } } +void OnResourceReadySignal05(Control control) +{ + gResourceReadySignalCounter++; + + // Request load with same image + // NOTE : The url must not be same as gImageView1 + const int viewCount = 4; + for(int i = 0; i < viewCount; ++i) + { + gImageView1.Add(ImageView::New("invalid2.jpg")); + } +} + } // namespace int UtcDaliImageViewSetImageOnResourceReadySignal01(void) @@ -3222,6 +3484,15 @@ int UtcDaliImageViewSetImageOnResourceReadySignal01(void) DALI_TEST_EQUALS(imageView.IsResourceReady(), true, TEST_LOCATION); + // Create a new ImageView to cache the image + ImageView imageView1 = ImageView::New(gImage_600_RGB); + application.GetScene().Add(imageView1); + + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + application.SendNotification(); + application.Render(); + // Reset count gResourceReadySignalCounter = 0; @@ -3405,9 +3676,9 @@ int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) { tet_infoline("Test signal handler various case."); - ToolkitTestApplication application; + auto TestResourceReadyUrl = [](int eventTriggerCount, bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& mask, const char* location) { + ToolkitTestApplication application; - auto TestResourceReadyUrl = [&application](int eventTriggerCount, bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& mask, const char* location) { gResourceReadySignalCounter = 0; Property::Map map; @@ -3432,12 +3703,14 @@ int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) tet_printf("test %s [sync:%d] signal fired\n", url.c_str(), isSynchronous ? 1 : 0); DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, location); - DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE), loadSuccess ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED, TEST_LOCATION); + DALI_TEST_EQUALS(imageView.GetVisualResourceStatus(Toolkit::ImageView::Property::IMAGE), loadSuccess ? Toolkit::Visual::ResourceStatus::READY : Toolkit::Visual::ResourceStatus::FAILED, location); imageView.Unparent(); }; - auto TestAuxiliaryResourceReadyUrl = [&application](bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& auxiliaryUrl, const char* location) { + auto TestAuxiliaryResourceReadyUrl = [](bool isSynchronous, bool loadSuccess, const std::string& url, const std::string& auxiliaryUrl, const char* location) { + ToolkitTestApplication application; + gResourceReadySignalCounter = 0; Property::Map map; @@ -3473,11 +3746,11 @@ int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) // Test normal case TestResourceReadyUrl(1, 0, 1, gImage_600_RGB, "", TEST_LOCATION); - TestResourceReadyUrl(1, 0, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // 1 rasterize + TestResourceReadyUrl(2, 0, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // load & rasterize TestResourceReadyUrl(1, 0, 1, TEST_BROKEN_IMAGE_L, "", TEST_LOCATION); TestResourceReadyUrl(2, 0, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION); // 2 image loading - batch size - TestResourceReadyUrl(1, 0, 1, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME, "", TEST_LOCATION); // 1 rasterize + TestResourceReadyUrl(2, 0, 1, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME, "", TEST_LOCATION); // load & rasterize TestResourceReadyUrl(3, 0, 1, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); // 2 image loading + 1 applymask @@ -3485,10 +3758,10 @@ int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) // Test broken case TestResourceReadyUrl(1, 0, 0, "invalid.jpg", "", TEST_LOCATION); - TestResourceReadyUrl(0, 0, 0, "invalid.svg", "", TEST_LOCATION); // 0 rasterize + TestResourceReadyUrl(1, 0, 0, "invalid.svg", "", TEST_LOCATION); TestResourceReadyUrl(1, 0, 0, "invalid.9.png", "", TEST_LOCATION); TestResourceReadyUrl(1, 0, 0, "invalid.gif", "", TEST_LOCATION); // 1 image loading - TestResourceReadyUrl(0, 0, 0, "invalid.json", "", TEST_LOCATION); // 0 rasterize + TestResourceReadyUrl(1, 0, 0, "invalid.json", "", TEST_LOCATION); // 0 rasterize TestResourceReadyUrl(2, 0, 0, "invalid.jpg", "invalid.png", TEST_LOCATION); // 2 image loading TestResourceReadyUrl(2, 0, 1, gImage_600_RGB, "invalid.png", TEST_LOCATION); // 2 image loading @@ -3506,8 +3779,7 @@ int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) TestResourceReadyUrl(0, 1, 1, TEST_SVG_FILE_NAME, "", TEST_LOCATION); // synchronous rasterize TestResourceReadyUrl(0, 1, 1, TEST_BROKEN_IMAGE_L, "", TEST_LOCATION); - TestResourceReadyUrl(1, 1, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION); // first frame image loading sync + second frame image loading async - TestResourceReadyUrl(0, 1, 1, TEST_ANIMATED_VECTOR_IMAGE_FILE_NAME, "", TEST_LOCATION); // synchronous rasterize + TestResourceReadyUrl(1, 1, 1, TEST_GIF_FILE_NAME, "", TEST_LOCATION); // first frame image loading sync + second frame image loading async TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, gImage_34_RGBA, TEST_LOCATION); @@ -3515,10 +3787,9 @@ int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) // Test broken case TestResourceReadyUrl(0, 1, 0, "invalid.jpg", "", TEST_LOCATION); - TestResourceReadyUrl(0, 1, 0, "invalid.svg", "", TEST_LOCATION); // 0 rasterize + TestResourceReadyUrl(0, 1, 0, "invalid.svg", "", TEST_LOCATION); TestResourceReadyUrl(0, 1, 0, "invalid.9.png", "", TEST_LOCATION); TestResourceReadyUrl(0, 1, 0, "invalid.gif", "", TEST_LOCATION); - TestResourceReadyUrl(0, 1, 0, "invalid.json", "", TEST_LOCATION); // 0 rasterize TestResourceReadyUrl(0, 1, 0, "invalid.jpg", "invalid.png", TEST_LOCATION); TestResourceReadyUrl(0, 1, 1, gImage_600_RGB, "invalid.png", TEST_LOCATION); @@ -3586,3 +3857,33 @@ int UtcDaliImageViewSetImageOnResourceReadySignal04(void) END_TEST; } +int UtcDaliImageViewSetImageOnResourceReadySignal05(void) +{ + tet_infoline("Test multiple views with same image during ResourceReady load the image only 1 times"); + + ToolkitTestApplication application; + + gResourceReadySignalCounter = 0; + + gImageView1 = ImageView::New("invalid.jpg"); // request invalid image, to make loading failed fast. + gImageView1.ResourceReadySignal().Connect(&OnResourceReadySignal05); + application.GetScene().Add(gImageView1); + + application.SendNotification(); + application.Render(); + + tet_infoline("Try to load 1 invalid.jpg image"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + DALI_TEST_EQUALS(gResourceReadySignalCounter, 1, TEST_LOCATION); + + tet_infoline("Try to load 1 invalid2.jpg image"); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); + + tet_infoline("Now we don't have any image to be loaded. Check event thread trigger failed."); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 1), false, TEST_LOCATION); + + gImageView1.Unparent(); + gImageView1.Reset(); + + END_TEST; +}