Merge "Previous model height return problem fixed" into devel/master

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-ImageView.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index 97a4b1d..c9cbdc5 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@ -366,7 +366,7 @@ int UtcDaliImageViewSetGetProperty03(void)
   DALI_TEST_CHECK( srcFactorRgb == BlendFactor::ONE );
   DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
   DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
-  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE );
+  DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE_MINUS_SRC_ALPHA );
 
   value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
   DALI_TEST_CHECK( value.Get( enable ) );
@@ -1526,7 +1526,7 @@ int UtcDaliImageViewResourceReadySignalWithImmediateLoad(void)
   Property::Map imageMap;
 
   imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageMap[ DevelImageVisual::Property::LOAD_POLICY ] =  DevelImageVisual::LoadPolicy::IMMEDIATE;
+  imageMap[ ImageVisual::Property::LOAD_POLICY ] =  ImageVisual::LoadPolicy::IMMEDIATE;
 
   tet_infoline("Creating ImageView without URL so image does not start loading");
   ImageView imageView = ImageView::New();
@@ -1557,7 +1557,7 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage(void)
   Property::Map imageMap;
 
   imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageMap[ DevelImageVisual::Property::LOAD_POLICY ] =  DevelImageVisual::LoadPolicy::IMMEDIATE;
+  imageMap[ ImageVisual::Property::LOAD_POLICY ] =  ImageVisual::LoadPolicy::IMMEDIATE;
 
   ImageView imageView = ImageView::New();
   imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
@@ -1591,7 +1591,7 @@ int UtcDaliImageViewResourceReadySignalWithReusedImage02(void)
 
   Property::Map imageImmediateLoadingMap;
   imageImmediateLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
-  imageImmediateLoadingMap[ DevelImageVisual::Property::LOAD_POLICY ] =  DevelImageVisual::LoadPolicy::IMMEDIATE;
+  imageImmediateLoadingMap[ ImageVisual::Property::LOAD_POLICY ] =  ImageVisual::LoadPolicy::IMMEDIATE;
 
   tet_infoline("Immediate load an image");
   ImageView imageView = ImageView::New();