X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ImageView.cpp;h=24802c430efaedb10bf751b1a03e0d3f8473bf83;hb=e483020277e28cd5f93a93cf50119edaac49a9e9;hp=edaeec19eab450505f11d00a39a6f3ce6a081967;hpb=42e6d93abfd4fc9ced3b9f366ebbc32228aa490b;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 edaeec1..24802c4 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -2686,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(); @@ -2711,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(); @@ -2770,7 +2772,7 @@ int UtcDaliImageViewAsyncSVGLoading(void) application.SendNotification(); - // Wait for rasterization + // Wait for loading DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); @@ -2810,7 +2812,7 @@ int UtcDaliImageViewSVGLoadingSyncSetInvalidValue(void) application.SendNotification(); - // Wait for rasterization + // Wait for loading DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); @@ -2831,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"); @@ -2853,7 +2855,7 @@ int UtcDaliImageViewSvgLoadingFailure(void) application.SendNotification(); - // loading started, this waits for the loader thread + // loading started, this waits for the loader thread - load DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); @@ -2870,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(); @@ -2882,7 +2890,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(); @@ -2899,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(); @@ -2912,7 +2926,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(); @@ -2927,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)); @@ -2942,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(); @@ -2957,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); @@ -2971,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(); @@ -3009,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); @@ -3039,8 +3073,8 @@ int UtcDaliImageViewSvgChageSize(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); @@ -3052,7 +3086,7 @@ int UtcDaliImageViewSvgChageSize(void) application.SendNotification(); - // loading started, this waits for the loader thread + // Wait for rasterization DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); @@ -3064,6 +3098,58 @@ int UtcDaliImageViewSvgChageSize(void) 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; @@ -3361,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) @@ -3577,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; @@ -3609,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; @@ -3645,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 @@ -3758,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; +}