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
[dali_2.0.49] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-TextLabel.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
index
f4655ab
..
c9453e1
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
@@
-836,6
+836,13
@@
int UtcDaliToolkitTextLabelEmojisP(void)
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
+ // EMOJI + ZWJ + EMOJI case for coverage.
+ const std::string emojiWithZWJ = "👩‍🔬";
+ label.SetProperty( TextLabel::Property::TEXT, emojiWithZWJ );
+
+ application.SendNotification();
+ application.Render();
+
END_TEST;
}
END_TEST;
}
@@
-1641,7
+1648,7
@@
int UtcDaliToolkitTextlabelTextFit(void)
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- const Vector3 EXPECTED_NATURAL_SIZE( 45
2.0f, 94
.0f, 0.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 45
0.0f, 96
.0f, 0.0f );
DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION );
// check pixel size
DALI_TEST_EQUALS( EXPECTED_NATURAL_SIZE, label.GetNaturalSize(), TEST_LOCATION );
// check pixel size