Merge "DALi Version 2.3.7" into devel/master

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
index d6ac646..5f33099 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
@@ -2982,7 +2982,8 @@ int utcDaliTextFieldEvent08(void)
   tet_infoline(" utcDaliTextFieldEvent08");
 
   Dali::Clipboard clipboard = Clipboard::Get();
-  clipboard.SetItem("testTextFieldEvent");
+  Dali::Clipboard::ClipData data("text/plain;charset=utf-8", "testTextFieldEvent");
+  clipboard.SetData(data);
 
   // Checks Longpress when only place holder text
 
@@ -4789,7 +4790,7 @@ int utcDaliTextFieldGeometryEllipsisStart(void)
   Vector<Vector2> expectedPositions;
 
   expectedPositions.PushBack(Vector2(14, 0));
-  expectedSizes.PushBack(Vector2(106, 25));
+  expectedSizes.PushBack(Vector2(107, 25));
 
   TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
 
@@ -4836,7 +4837,7 @@ int utcDaliTextFieldGeometryEllipsisEnd(void)
   Vector<Vector2> expectedPositions;
 
   expectedPositions.PushBack(Vector2(-2, 0));
-  expectedSizes.PushBack(Vector2(122, 25));
+  expectedSizes.PushBack(Vector2(123, 25));
 
   TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
 
@@ -4881,7 +4882,7 @@ int utcDaliTextFieldGeometryRTL(void)
   Vector<Vector2> expectedPositions;
 
   expectedPositions.PushBack(Vector2(38, 0));
-  expectedSizes.PushBack(Vector2(73, 25));
+  expectedSizes.PushBack(Vector2(75, 25));
 
   TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
 
@@ -4926,7 +4927,7 @@ int utcDaliTextFieldGeometryGlyphMiddle(void)
   Vector<Vector2> expectedPositions;
 
   expectedPositions.PushBack(Vector2(6, 0));
-  expectedSizes.PushBack(Vector2(124, 25));
+  expectedSizes.PushBack(Vector2(125, 25));
 
   TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);