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
Multi-line text. Cursor hit and cursor's position.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-Text-Shaping.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
index
9e830ec
..
7b319fb
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
@@
-112,8
+112,9
@@
struct ShapeInfoData
bool ShapeInfoTest( const ShapeInfoData& data )
{
// 1) Create the model.
bool ShapeInfoTest( const ShapeInfoData& data )
{
// 1) Create the model.
- LogicalModelPtr logicalModel = LogicalModel::New();
- VisualModelPtr visualModel = VisualModel::New();
+ LogicalModelPtr logicalModel;
+ VisualModelPtr visualModel;
+ MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
Size textArea(100.f, 60.f);
Size layoutSize;
@@
-125,7
+126,8
@@
bool ShapeInfoTest( const ShapeInfoData& data )
options,
layoutSize,
logicalModel,
options,
layoutSize,
logicalModel,
- visualModel );
+ visualModel,
+ metrics );
// 2) Clear the model.
// 2) Clear the model.
@@
-267,7
+269,6
@@
bool ShapeInfoTest( const ShapeInfoData& data )
int UtcDaliTextShape(void)
{
int UtcDaliTextShape(void)
{
- ToolkitTestApplication application;
tet_infoline(" UtcDaliTextShape");
struct GlyphInfoData glyphs02[] =
tet_infoline(" UtcDaliTextShape");
struct GlyphInfoData glyphs02[] =
@@
-521,6
+522,7
@@
int UtcDaliTextShape(void)
for( unsigned int index = 0u; index < numberOfTests; ++index )
{
for( unsigned int index = 0u; index < numberOfTests; ++index )
{
+ ToolkitTestApplication application;
if( !ShapeInfoTest( data[index] ) )
{
tet_result(TET_FAIL);
if( !ShapeInfoTest( data[index] ) )
{
tet_result(TET_FAIL);