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=24802c430efaedb10bf751b1a03e0d3f8473bf83;hp=10d644510a3b55861f1b93dd4c87652799773bb7;hb=d7d0746a5d6952f6087785b99a78108f2fec8999;hpb=1ca353dc14d04ecc3a36ece4669bfffe35ff4984 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 10d6445..24802c4 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 @@ -2685,7 +2686,8 @@ int UtcDaliImageViewLoadRemoteSVG(void) application.SendNotification(); - 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(); @@ -2710,7 +2712,8 @@ int UtcDaliImageViewLoadRemoteSVG(void) application.SendNotification(); - 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(); @@ -2727,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 @@ -2746,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); @@ -2761,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); } @@ -2795,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 @@ -2819,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); @@ -2835,16 +2833,16 @@ int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void) END_TEST; } -int UtcDaliImageViewSvgLoadingFailure(void) +int UtcDaliImageViewSvgLoadingFailureLocalFile(void) { - ToolkitTestApplication application; - - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); - textureTrace.Enable(true); - // 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"); @@ -2856,6 +2854,11 @@ 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); @@ -2869,6 +2872,12 @@ int UtcDaliImageViewSvgLoadingFailure(void) // 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(); @@ -2880,6 +2889,11 @@ 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); @@ -2893,6 +2907,12 @@ int UtcDaliImageViewSvgLoadingFailure(void) // Local svg file - invalid file { + ToolkitTestApplication application; + + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + gResourceReadySignalFired = false; textureTrace.Reset(); @@ -2905,6 +2925,11 @@ 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); @@ -2916,10 +2941,20 @@ int UtcDaliImageViewSvgLoadingFailure(void) 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; - textureTrace.Reset(); ImageView imageView = ImageView::New("https://bar.org/foobar.svg"); imageView.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f)); @@ -2931,7 +2966,7 @@ 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(); @@ -2946,10 +2981,20 @@ int UtcDaliImageViewSvgLoadingFailure(void) 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; - textureTrace.Reset(); ImageView imageView = ImageView::New("https://bar.org/foobar.svg"); imageView.ResourceReadySignal().Connect(&ResourceReadySignal); @@ -2960,7 +3005,7 @@ 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(); @@ -2998,8 +3043,8 @@ 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); @@ -3015,6 +3060,96 @@ int UtcDaliImageViewSvgRasterizationFailure(void) END_TEST; } +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(); + + // 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); + + // 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; +} + int UtcDaliImageViewTVGLoading(void) { ToolkitTestApplication application; @@ -3022,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); @@ -3307,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) @@ -3523,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; @@ -3555,7 +3708,9 @@ int UtcDaliImageViewCheckVariousCaseSendOnResourceReadySignal(void) 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; @@ -3591,7 +3746,7 @@ 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 @@ -3603,7 +3758,7 @@ 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 @@ -3633,7 +3788,7 @@ 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 @@ -3704,3 +3859,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; +}