From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 9 Jul 2020 16:33:20 +0000 (+0000)
Subject: Merge "Support Asynchronous Loading of Animated Image" into devel/master
X-Git-Tag: dali_1.9.20~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=3a2dfe800fe4ec8214f42b28b3851ea8b8ffc72b;hp=-c

Merge "Support Asynchronous Loading of Animated Image" into devel/master
---

3a2dfe800fe4ec8214f42b28b3851ea8b8ffc72b
diff --combined automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
index c78d090,38883a3..bad210c
--- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
@@@ -1706,7 -1706,7 +1706,7 @@@ int UtcDaliVisualFactoryGetPrimitiveVis
    //Set up visual properties.
    Property::Map propertyMap;
    propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::PRIMITIVE );
 -  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTRUM );
 +  propertyMap.Insert( PrimitiveVisual::Property::SHAPE, PrimitiveVisual::Shape::CONICAL_FRUSTUM );
    propertyMap.Insert( PrimitiveVisual::Property::MIX_COLOR, Vector4( 0.5, 0.5, 0.5, 1.0 ) );
    propertyMap.Insert( PrimitiveVisual::Property::SLICES, 10 );
    propertyMap.Insert( PrimitiveVisual::Property::SCALE_TOP_RADIUS, 30.0f );
@@@ -2048,6 -2048,11 +2048,11 @@@ int UtcDaliVisualFactoryGetAnimatedImag
    application.SendNotification();
    application.Render();
  
+   DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+ 
+   application.SendNotification();
+   application.Render();
+ 
    // renderer is added to actor
    DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
    Renderer renderer = actor.GetRendererAt( 0u );
@@@ -2061,14 -2066,23 +2066,23 @@@
    timer.MockEmitSignal();
    application.SendNotification();
    application.Render();
+ 
+   DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+ 
+   application.SendNotification();
+   application.Render();
    DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
    textureTrace.Reset();
  
- 
    // Force the timer used by the animatedImageVisual to tick,
    timer.MockEmitSignal();
    application.SendNotification();
    application.Render();
+ 
+   DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+ 
+   application.SendNotification();
+   application.Render();
    DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
    textureTrace.Reset();
  
@@@ -2076,6 -2090,11 +2090,11 @@@
    timer.MockEmitSignal();
    application.SendNotification();
    application.Render();
+ 
+   DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+ 
+   application.SendNotification();
+   application.Render();
    DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), true, TEST_LOCATION );
    textureTrace.Reset();
  
@@@ -2117,6 -2136,11 +2136,11 @@@ int UtcDaliVisualFactoryGetAnimatedImag
    application.SendNotification();
    application.Render();
  
+   DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+ 
+   application.SendNotification();
+   application.Render();
+ 
    DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
  
    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );