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
Merge "Add log for FocusLost" 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
357e456
..
5f33099
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
@@
-2981,8
+2981,9
@@
int utcDaliTextFieldEvent08(void)
ToolkitTestApplication application;
tet_infoline(" utcDaliTextFieldEvent08");
ToolkitTestApplication application;
tet_infoline(" utcDaliTextFieldEvent08");
- Dali::TextClipboard clipboard = TextClipboard::Get();
- clipboard.SetItem("testTextFieldEvent");
+ Dali::Clipboard clipboard = Clipboard::Get();
+ Dali::Clipboard::ClipData data("text/plain;charset=utf-8", "testTextFieldEvent");
+ clipboard.SetData(data);
// Checks Longpress when only place holder text
// Checks Longpress when only place holder text
@@
-4789,7
+4790,7
@@
int utcDaliTextFieldGeometryEllipsisStart(void)
Vector<Vector2> expectedPositions;
expectedPositions.PushBack(Vector2(14, 0));
Vector<Vector2> expectedPositions;
expectedPositions.PushBack(Vector2(14, 0));
- expectedSizes.PushBack(Vector2(10
6
, 25));
+ expectedSizes.PushBack(Vector2(10
7
, 25));
TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
@@
-4836,7
+4837,7
@@
int utcDaliTextFieldGeometryEllipsisEnd(void)
Vector<Vector2> expectedPositions;
expectedPositions.PushBack(Vector2(-2, 0));
Vector<Vector2> expectedPositions;
expectedPositions.PushBack(Vector2(-2, 0));
- expectedSizes.PushBack(Vector2(12
2
, 25));
+ expectedSizes.PushBack(Vector2(12
3
, 25));
TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
@@
-4881,7
+4882,7
@@
int utcDaliTextFieldGeometryRTL(void)
Vector<Vector2> expectedPositions;
expectedPositions.PushBack(Vector2(38, 0));
Vector<Vector2> expectedPositions;
expectedPositions.PushBack(Vector2(38, 0));
- expectedSizes.PushBack(Vector2(7
3
, 25));
+ expectedSizes.PushBack(Vector2(7
5
, 25));
TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
@@
-4926,7
+4927,7
@@
int utcDaliTextFieldGeometryGlyphMiddle(void)
Vector<Vector2> expectedPositions;
expectedPositions.PushBack(Vector2(6, 0));
Vector<Vector2> expectedPositions;
expectedPositions.PushBack(Vector2(6, 0));
- expectedSizes.PushBack(Vector2(12
4
, 25));
+ expectedSizes.PushBack(Vector2(12
5
, 25));
TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);
TestTextGeometryUtils::CheckGeometryResult(positionsList, sizeList, expectedPositions, expectedSizes);