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-Control.cpp;h=5255f100e5724682a5fd4cc24e18b5b7fd3453d9;hp=bd15bb0da2707d64adc1f94a429dc06d62a4c642;hb=0f3af5aa90602ae60079d11615d8de0765084afe;hpb=05fc311b489e5c929433c722439eef45116f0e8b

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
index bd15bb0..5255f10 100755
--- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
@@ -74,6 +74,7 @@ static void TestKeyInputFocusCallback( Control control )
 
 const char* TEST_LARGE_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/tbcol.png";
 const char* TEST_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/Kid1.svg";
 
 Vector4 GetControlBackgroundColor( Control& control )
 {
@@ -87,6 +88,20 @@ Vector4 GetControlBackgroundColor( Control& control )
   return color;
 }
 
+bool gResourceReadySignalFired = false;
+
+void ResourceReadySignal( Control control )
+{
+  if( control.GetVisualResourceStatus( Control::Property::BACKGROUND ) == Visual::ResourceStatus::FAILED )
+  {
+    Property::Map propertyMap;
+    propertyMap.Insert( ImageVisual::Property::URL, TEST_SVG_FILE_NAME );
+    control.SetProperty( Control::Property::BACKGROUND, propertyMap );
+  }
+
+  gResourceReadySignalFired = true;
+}
+
 } // namespace
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -986,6 +1001,38 @@ int UtcDaliControlResourcesReady(void)
   END_TEST;
 }
 
+int UtcDaliControlResourcesReady02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline( "Change a resource during ResourceReady callback" );
+
+  gResourceReadySignalFired = false;
+
+  Control control = Control::New();
+  control.SetSize( 200.f, 200.f );
+  control.ResourceReadySignal().Connect( &ResourceReadySignal );
+
+  Property::Map propertyMap;
+  propertyMap.Insert( ImageVisual::Property::URL, "invalid.jpg" );
+  control.SetProperty( Control::Property::BACKGROUND, propertyMap );
+
+  Stage::GetCurrent().Add( control );
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS( control.IsResourceReady(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+  gResourceReadySignalFired = false;
+
+  END_TEST;
+}
+
 int UtcDaliControlMarginProperty(void)
 {
   ToolkitTestApplication application;