Merge "Add bidirectional text tct." into devel/master

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit-internal / utc-Dali-Text-Cursor.cpp

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
index 1e2b72d..cba35a3 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
@@ -112,7 +112,8 @@ bool GetClosestLineTest( const GetClosestLineData& data )
                    layoutSize,
                    logicalModel,
                    visualModel,
-                   metrics );
+                   metrics,
+                   false );
 
   for( unsigned int index = 0; index < data.numberOfTests; ++index )
   {
@@ -156,7 +157,8 @@ bool GetClosestCursorIndexTest( const GetClosestCursorIndexData& data )
                    layoutSize,
                    logicalModel,
                    visualModel,
-                   metrics );
+                   metrics,
+                   false );
 
   for( unsigned int index = 0; index < data.numberOfTests; ++index )
   {
@@ -204,15 +206,21 @@ bool GetCursorPositionTest( const GetCursorPositionData& data )
                    layoutSize,
                    logicalModel,
                    visualModel,
-                   metrics );
+                   metrics,
+                   false );
+
+  GetCursorPositionParameters parameters;
+  parameters.visualModel = visualModel;
+  parameters.logicalModel = logicalModel;
+  parameters.metrics = metrics;
+  parameters.isMultiline = true;
 
   for( unsigned int index = 0; index < data.numberOfTests; ++index )
   {
     CursorInfo cursorInfo;
-    GetCursorPosition( visualModel,
-                       logicalModel,
-                       metrics,
-                       data.logicalIndex[index],
+    parameters.logical = data.logicalIndex[index];
+
+    GetCursorPosition( parameters,
                        cursorInfo );
 
     if( cursorInfo.primaryPosition.x != data.visualX[index] )
@@ -250,7 +258,8 @@ bool FindSelectionIndicesTest( const FindSelectionIndicesData& data )
                    layoutSize,
                    logicalModel,
                    visualModel,
-                   metrics );
+                   metrics,
+                   false );
 
   for( unsigned int index = 0; index < data.numberOfTests; ++index )
   {