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-Button.cpp;h=8ffc0bf14bba7936eae2608f009825a94cf2870b;hp=60df0f413b7d728fa078cf8d7491df131e0679c1;hb=refs%2Fchanges%2F41%2F98741%2F14;hpb=abbf60ed35112186269d2fe93b949eb8abd4283d

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index 60df0f4..8ffc0bf 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -987,17 +987,26 @@ int UtcDaliButtonSetButtonImageP(void)
 
   try
   {
-    ResourceImage image1 = ResourceImage::New( "TestImage.jpg");
+    ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
     button.SetButtonImage( image1 );
 
     Property::Value value = button.GetProperty(Button::Property::UNSELECTED_STATE_IMAGE );
-    DALI_TEST_CHECK( value.Get<std::string>() == "TestImage.jpg" );
+    DALI_TEST_CHECK( value.Get<std::string>() == TEST_IMAGE_ONE );
   }
   catch(...)
   {
     DALI_TEST_CHECK( false );
   }
 
+  std::string imageUrl;
+
+  Dali::Actor actor = button.GetButtonImage();
+
+  Toolkit::ImageView imageView = Toolkit::ImageView ::DownCast( actor );
+
+  tet_infoline(" UtcDaliButtonSetButtonImageP Ensure an ImageView is returned\n");
+  DALI_TEST_CHECK ( imageView )
+
   END_TEST;
 }
 
@@ -1009,7 +1018,7 @@ int UtcDaliButtonSetButtonImageN(void)
 
   try
   {
-    ResourceImage image1 = ResourceImage::New( "TestImage.jpg");
+    ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
     button.SetButtonImage( image1 );
 
     DALI_TEST_CHECK( false );
@@ -1033,7 +1042,7 @@ int UtcDaliButtonSetSelectedImageWithImageP(void)
   try
   {
     button.SetSelectedImage( image1 );
-    Property::Value value = button.GetProperty(Button::Property::SELECTED_STATE_IMAGE );
+    Property::Value value = button.GetProperty( Button::Property::SELECTED_STATE_IMAGE );
     DALI_TEST_CHECK( value.Get<std::string>() == TEST_IMAGE_ONE );
   }
   catch(...)
@@ -1041,6 +1050,14 @@ int UtcDaliButtonSetSelectedImageWithImageP(void)
     DALI_TEST_CHECK( false );
   }
 
+  std::string imageUrl;
+
+  Dali::Actor actor = button.GetSelectedImage();
+
+  Toolkit::ImageView imageView = Toolkit::ImageView::DownCast( actor );
+
+  tet_infoline(" UtcDaliButtonSetSelectedImageWithImageP Ensure an ImageView is returned\n");
+
   END_TEST;
 }