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=f31da7c8d8765ed78272e14d719fcf0a4ee3ce2f;hp=7b0b54d7abee2f4bd672bbce3ac5c484576459bb;hb=ee7b436210b09635d032b50eefecb7369be136e7;hpb=8e023dac0dbb1cbb6c83ff919ccadbd93171d0fc

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index 7b0b54d..f31da7c 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@ -2749,11 +2749,20 @@ void OnResourceReadySignal( Control control )
 {
   gResourceReadySignalCounter++;
 
-  if( gResourceReadySignalCounter == 1 )
+  if(control.GetVisualResourceStatus(ImageView::Property::IMAGE) == Visual::ResourceStatus::READY)
   {
-    // Set image twice
-    ImageView::DownCast( control ).SetImage( gImage_34_RGBA );
-    ImageView::DownCast( control ).SetImage( gImage_34_RGBA );
+    if( gResourceReadySignalCounter == 1 )
+    {
+      // Set image twice
+      // It makes the first new visual be deleted immediately
+      ImageView::DownCast( control ).SetImage( gImage_34_RGBA );
+      ImageView::DownCast( control ).SetImage( gImage_34_RGBA );
+    }
+  }
+  else if(control.GetVisualResourceStatus(ImageView::Property::IMAGE) == Visual::ResourceStatus::FAILED)
+  {
+    // Make the resource ready immediately
+    control[ImageView::Property::IMAGE] = TEST_RESOURCE_DIR "/svg1.svg";
   }
 }
 
@@ -2781,5 +2790,22 @@ int UtcDaliImageViewSetImageOnResourceReadySignal(void)
 
   DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
 
+  // Reset count
+  gResourceReadySignalCounter = 0;
+
+  imageView[ImageView::Property::IMAGE] = "invalid.jpg";
+
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+  application.SendNotification();
+  application.Render();
+
+  // Run idle callback
+  application.RunIdles();
+
+  DALI_TEST_EQUALS( gResourceReadySignalCounter, 2, TEST_LOCATION );
+
+  DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+
   END_TEST;
 }