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
[4.0] Support custom fonts registration
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-styling
/
utc-Dali-StyleManager.cpp
diff --git
a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
index
e8348f1
..
a143f7e
100644
(file)
--- a/
automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
+++ b/
automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
@@
-1313,7
+1313,8
@@
int UtcDaliStyleManagerConfigSectionTest(void)
" \"config\":\n"
" {\n"
" \"alwaysShowFocus\":false,\n"
" \"config\":\n"
" {\n"
" \"alwaysShowFocus\":false,\n"
- " \"clearFocusOnEscape\":false\n"
+ " \"clearFocusOnEscape\":false,\n"
+ " \"customFontDirectory\":\"" DALI_STYLE_DIR "\"\n"
" },\n"
" \"styles\":\n"
" {\n"
" },\n"
" \"styles\":\n"
" {\n"
@@
-1331,9
+1332,12
@@
int UtcDaliStyleManagerConfigSectionTest(void)
DALI_TEST_CHECK( !alwaysShowFocus );
bool clearFocusOnEscape = config["clearFocusOnEscape"].Get<bool>();
DALI_TEST_CHECK( !clearFocusOnEscape );
DALI_TEST_CHECK( !alwaysShowFocus );
bool clearFocusOnEscape = config["clearFocusOnEscape"].Get<bool>();
DALI_TEST_CHECK( !clearFocusOnEscape );
+ std::string customFontDirectory = config["customFontDirectory"].Get<std::string>();
+ DALI_TEST_EQUALS( customFontDirectory, DALI_STYLE_DIR, TEST_LOCATION );
// For coverage
Toolkit::TextEditor editor = Toolkit::TextEditor::New();
// For coverage
Toolkit::TextEditor editor = Toolkit::TextEditor::New();
+ editor.SetProperty( TextEditor::Property::TEXT, "Test" );
editor.SetKeyboardFocusable( true );
Stage::GetCurrent().Add( editor );
editor.SetKeyboardFocusable( true );
Stage::GetCurrent().Add( editor );