X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Shaping.cpp;h=e4464fd6a8189bde7b5781961c34a5cce2dea67b;hp=9e830ec27809e7fccb6cbd1c5e5a642b9c7ddb06;hb=a68dbe03813fd3db34c81f4e6960572e8882930b;hpb=d8cbd048a3d77a627c97eba193afd3c0514a789a

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..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 <dali-toolkit/internal/text/shaper.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <toolkit-text-model.h>
+#include <toolkit-text-utils.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -112,8 +112,9 @@ 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;
 
@@ -125,7 +126,8 @@ bool ShapeInfoTest( const ShapeInfoData& data )
                    options,
                    layoutSize,
                    logicalModel,
-                   visualModel );
+                   visualModel,
+                   metrics );
 
   // 2) Clear the model.
 
@@ -267,7 +269,6 @@ bool ShapeInfoTest( const ShapeInfoData& data )
 
 int UtcDaliTextShape(void)
 {
-  ToolkitTestApplication application;
   tet_infoline(" UtcDaliTextShape");
 
   struct GlyphInfoData glyphs02[] =
@@ -521,6 +522,7 @@ int UtcDaliTextShape(void)
 
   for( unsigned int index = 0u; index < numberOfTests; ++index )
   {
+    ToolkitTestApplication application;
     if( !ShapeInfoTest( data[index] ) )
     {
       tet_result(TET_FAIL);