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
Merge "TET cases for Text." into devel/master
[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
..
e25d8d5
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
@@
-24,6
+24,9
@@
#include <dali.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali.h>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali/devel-api/actors/mesh-actor.h>
+#include <dali/devel-api/modeling/material.h>
+#include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
using namespace Dali;
using namespace Dali::Toolkit;
using namespace Dali;
using namespace Dali::Toolkit;
@@
-75,7
+78,7
@@
static int Wait(ToolkitTestApplication& application, int duration = 0)
static Image CreateSolidColorImage( ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height )
{
static Image CreateSolidColorImage( ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height )
{
- B
itmapImage imageData = Bitmap
Image::New( width, height, Pixel::RGBA8888 );
+ B
ufferImage imageData = Buffer
Image::New( width, height, Pixel::RGBA8888 );
// Create the image
PixelBuffer* pixbuf = imageData.GetBuffer();
// Create the image
PixelBuffer* pixbuf = imageData.GetBuffer();
@@
-241,7
+244,7
@@
int UtcDaliBubbleEmitterSetBubbleDensity01(void)
}
catch(Dali::DaliException& e)
{
}
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;
DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION );
}
END_TEST;
@@
-261,7
+264,7
@@
int UtcDaliBubbleEmitterSetBubbleDensity02(void)
}
catch(Dali::DaliException& e)
{
}
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;
DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION );
}
END_TEST;