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

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
index 7a15412..b15d1e6 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
@@ -75,7 +75,7 @@ static int Wait(ToolkitTestApplication& application, int duration = 0)
 
 static Image CreateSolidColorImage( ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height )
 {
-  BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 );
+  BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
 
   // Create the image
   PixelBuffer* pixbuf = imageData.GetBuffer();
@@ -241,7 +241,7 @@ int UtcDaliBubbleEmitterSetBubbleDensity01(void)
   }
   catch(Dali::DaliException& e)
   {
-    tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
+    DALI_TEST_PRINT_ASSERT( e );
     DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION );
   }
   END_TEST;
@@ -261,7 +261,7 @@ int UtcDaliBubbleEmitterSetBubbleDensity02(void)
   }
   catch(Dali::DaliException& e)
   {
-    tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
+    DALI_TEST_PRINT_ASSERT( e );
     DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION );
   }
   END_TEST;