Merge remote-tracking branch 'origin/tizen' into new_text

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
index befc3b2..66a3664 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
@@ -54,7 +54,7 @@ int UtcDaliDissolveUninitializedEffect(void)
   catch (Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
+    DALI_TEST_PRINT_ASSERT( e );
     DALI_TEST_CHECK(!effect);
   }
   END_TEST;
@@ -81,7 +81,7 @@ int UtcDaliDissolveDefaultValuesEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -106,7 +106,7 @@ int UtcDaliDissolveCustomValuesEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -133,10 +133,10 @@ int UtcDaliSetEffectImageEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  Image effectImage = CreateBitmapImage();
+  Image effectImage = CreateBufferImage();
   effect.SetEffectImage(effectImage);
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );