X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Shaping.cpp;h=e4464fd6a8189bde7b5781961c34a5cce2dea67b;hb=c25ab6d22aec336cd938bd186987291517081355;hp=0dd3144787334bc90f05cb12cae20c7c553030f9;hpb=4f2f51d77ac571ac97d44af755d9a86da41c29d2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 0dd3144..e4464fd 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include using namespace Dali; using namespace Toolkit; @@ -112,16 +112,22 @@ struct ShapeInfoData 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; + const Vector fontDescriptions; + const LayoutOptions options; CreateTextModel( data.text, textArea, + fontDescriptions, + options, layoutSize, logicalModel, - visualModel ); + visualModel, + metrics ); // 2) Clear the model. @@ -263,7 +269,6 @@ bool ShapeInfoTest( const ShapeInfoData& data ) int UtcDaliTextShape(void) { - ToolkitTestApplication application; tet_infoline(" UtcDaliTextShape"); struct GlyphInfoData glyphs02[] = @@ -517,6 +522,7 @@ int UtcDaliTextShape(void) for( unsigned int index = 0u; index < numberOfTests; ++index ) { + ToolkitTestApplication application; if( !ShapeInfoTest( data[index] ) ) { tet_result(TET_FAIL);