projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes for std::vector removal from api
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Ripple2DEffect.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
index
55d9c28
..
263a5d1
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
@@
-24,6
+24,7
@@
#include <dali.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali.h>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/ripple2d-effect.h>
using namespace Dali;
using namespace Dali;
@@
-53,7
+54,7
@@
int UtcDaliRipple2DEffectUninitialized(void)
catch (Dali::DaliException& e)
{
// Tests that a negative test of an assertion succeeds
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;
DALI_TEST_CHECK(!effect);
}
END_TEST;
@@
-79,7
+80,7
@@
int UtcDaliRipple2DEffectDefaultValues(void)
Toolkit::Ripple2DEffect effect = Toolkit::Ripple2DEffect::New();
DALI_TEST_CHECK( effect );
Toolkit::Ripple2DEffect effect = Toolkit::Ripple2DEffect::New();
DALI_TEST_CHECK( effect );
- B
itmapImage image = CreateBitmap
Image();
+ B
ufferImage image = CreateBuffer
Image();
ImageActor actor = ImageActor::New( image );
actor.SetSize( 100.0f, 100.0f );
ImageActor actor = ImageActor::New( image );
actor.SetSize( 100.0f, 100.0f );
@@
-107,7
+108,7
@@
int UtcDaliRipple2DEffectCustomValues(void)
Toolkit::Ripple2DEffect effect = Toolkit::Ripple2DEffect::New();
DALI_TEST_CHECK( effect );
Toolkit::Ripple2DEffect effect = Toolkit::Ripple2DEffect::New();
DALI_TEST_CHECK( effect );
- B
itmapImage image = CreateBitmap
Image();
+ B
ufferImage image = CreateBuffer
Image();
ImageActor actor = ImageActor::New( image );
actor.SetSize( 100.0f, 100.0f );
ImageActor actor = ImageActor::New( image );
actor.SetSize( 100.0f, 100.0f );