Merge "Move tts-player.h from devel-api to public-api" into devel/master

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp
index 2f41d9c..ca77428 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/water-effect.h>
 
 using namespace Dali;
 
@@ -102,7 +103,7 @@ int UtcDaliWaterEffectDefaultValues(void)
   // Check that the effect has the number of waves it was requested
   DALI_TEST_CHECK( effect.GetNumberOfWaves() == 4 );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -140,7 +141,7 @@ int UtcDaliWaterEffectCustomValues(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -180,7 +181,7 @@ int UtcDaliWaterEffectGetAmplitudePositive(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -205,7 +206,7 @@ int UtcDaliWaterEffectGetAmplitudeNegative(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -231,7 +232,7 @@ int UtcDaliWaterEffectGetCenterPositive(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -256,7 +257,7 @@ int UtcDaliWaterEffectGetCenterNegative(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -282,7 +283,7 @@ int UtcDaliWaterEffectGetPropagationPositive(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -307,7 +308,7 @@ int UtcDaliWaterEffectGetPropagationNegative(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );