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=2feeee265d1a7bee8848c0c01ec4c85dbf52deae;hp=e40862c13eba403678b550d48cbc42dc5295892f;hb=a5fd3c7972dade609f0a66a3c4fca27d33ee7454;hpb=018b3b5ba7512694a9b95494493f2ae0477f2746

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index e40862c..2feeee2 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@ -53,11 +53,11 @@ void TestImage( ImageView imageView, BufferImage image )
 
   int width = 0;
   DALI_TEST_CHECK( map[ "width" ].Get( width ) );
-  DALI_TEST_EQUALS( width, image.GetWidth(), TEST_LOCATION );
+  DALI_TEST_EQUALS( (unsigned int)width, image.GetWidth(), TEST_LOCATION );
 
   int height = 0;
   DALI_TEST_CHECK( map[ "height" ].Get( height ) );
-  DALI_TEST_EQUALS( height, image.GetHeight(), TEST_LOCATION );
+  DALI_TEST_EQUALS( (unsigned int)height, image.GetHeight(), TEST_LOCATION );
 
   std::string type;
   DALI_TEST_CHECK( map[ "type" ].Get( type ) );
@@ -75,14 +75,14 @@ void TestImage( ImageView imageView, ResourceImage image )
   {
     int width = 0;
     DALI_TEST_CHECK( map[ "width" ].Get( width ) );
-    DALI_TEST_EQUALS( width, image.GetWidth(), TEST_LOCATION );
+    DALI_TEST_EQUALS( (unsigned int)width, image.GetWidth(), TEST_LOCATION );
   }
 
   if( map.Find( "height" ) )
   {
     int height = 0;
     DALI_TEST_CHECK( map[ "height" ].Get( height ) );
-    DALI_TEST_EQUALS( height, image.GetHeight(), TEST_LOCATION );
+    DALI_TEST_EQUALS( (unsigned int)height, image.GetHeight(), TEST_LOCATION );
   }
 
   DALI_TEST_CHECK( map.Find( "type" ) );
@@ -238,7 +238,7 @@ int UtcDaliImageViewSetGetProperty01(void)
   ImageView imageView = ImageView::New();
 
   Property::Index idx = imageView.GetPropertyIndex( "image" );
-  DALI_TEST_EQUALS( idx, ImageView::Property::IMAGE, TEST_LOCATION );
+  DALI_TEST_EQUALS( idx, (Property::Index)ImageView::Property::IMAGE, TEST_LOCATION );
 
   imageView.SetProperty( idx, TEST_IMAGE_FILE_NAME );
   TestUrl( imageView, TEST_IMAGE_FILE_NAME );
@@ -260,8 +260,8 @@ int UtcDaliImageViewSizeWithBackground(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetCurrentSize().width, width, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.GetCurrentSize().height, height, TEST_LOCATION );
+  DALI_TEST_EQUALS( imageView.GetCurrentSize().width, (float)width, TEST_LOCATION );
+  DALI_TEST_EQUALS( imageView.GetCurrentSize().height, (float)height, TEST_LOCATION );
 
   END_TEST;
 }
@@ -285,8 +285,8 @@ int UtcDaliImageViewSizeWithBackgroundAndImage(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetCurrentSize().width, width, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.GetCurrentSize().height, height, TEST_LOCATION );
+  DALI_TEST_EQUALS( imageView.GetCurrentSize().width, (float)width, TEST_LOCATION );
+  DALI_TEST_EQUALS( imageView.GetCurrentSize().height, (float)height, TEST_LOCATION );
 
   END_TEST;
 }
@@ -333,8 +333,8 @@ int UtcDaliImageViewHeightForWidthBackgroundAndImage(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( imageView.GetHeightForWidth( width ), height, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageView.GetWidthForHeight( height ), width, TEST_LOCATION );
+  DALI_TEST_EQUALS( imageView.GetHeightForWidth( width ), (float)height, TEST_LOCATION );
+  DALI_TEST_EQUALS( imageView.GetWidthForHeight( height ), (float)width, TEST_LOCATION );
 
   END_TEST;
 }
@@ -505,3 +505,62 @@ int UtcDaliImageViewSetImageN(void)
 
   END_TEST;
 }
+
+int UtcDaliImageViewSetImageTypeChangesP(void)
+{
+  ToolkitTestApplication application;
+
+  ImageView imageView = ImageView::New();
+
+
+  std::string url;
+  Property::Map map;
+
+  Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
+  DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
+
+  // Set a URL
+  imageView.SetImage( "TEST_URL" );
+  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+
+  DALI_TEST_CHECK( value.Get( url ) );   // Value should NOT be empty
+  DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
+
+  // Set an empty Image
+  imageView.SetImage( Image() );
+  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+
+  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
+  DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
+
+  // Set an Image
+  ResourceImage image1 = ResourceImage::New( TEST_IMAGE_FILE_NAME );
+  imageView.SetImage( image1 );
+  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+
+  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
+  DALI_TEST_CHECK( value.Get( map ) );   // Value should NOT be empty
+
+  // Set an empty URL
+  imageView.SetImage( "" );
+  value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+
+  DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
+  DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
+
+  END_TEST;
+}
+
+int UtcDaliImageViewResourceUrlP(void)
+{
+  ToolkitTestApplication application;
+
+  ImageView imageView = ImageView::New();
+  DALI_TEST_CHECK( imageView.GetProperty( ImageView::Property::RESOURCE_URL ).Get< std::string >().empty() );
+
+  imageView.SetProperty( ImageView::Property::RESOURCE_URL, "TestString" );
+  DALI_TEST_EQUALS( imageView.GetProperty( ImageView::Property::RESOURCE_URL ).Get< std::string >(), "TestString", TEST_LOCATION );
+
+  END_TEST;
+}