X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-ViewModel.cpp;h=74be44b0b7bad76dc5933106eeaa1051ae3a7ae0;hb=a25b88a29acff0c628001f3735f744a765dc6e64;hp=49d36e0b5ecb31daa34863ffc617d666f3501f2f;hpb=db345a276572844ef456bff2339cfc3143a46991;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git
diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
old mode 100644
new mode 100755
index 49d36e0..74be44b
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,14 +49,14 @@ const char* LOREM_IPSUM = "Lorem ipsum dolor sit amet, aeque definiebas ea mei,
"Aliquip sanctůs delicáta quà Äá, et natum aliquam est?\n"
"Asšúm sapÄret usu ůť.\n"
"SÃÅ¥ ut apeirián laboramúš percipitur, sůas haÅum Ãn éos?\n";
-const Vector2 LOREM_SCROLL_POSITION( 0.f, -208.f );
-const Length LOREM_NUMBER_OF_LINES = 32u;
+const Vector2 LOREM_SCROLL_POSITION( 0.f, -265.f );
+const Length LOREM_NUMBER_OF_LINES = 35u;
const Length LOREM_NUMBER_OF_LINES_ELIDED = 21u;
const Length LOREM_NUMBER_OF_GLYPHS = 632;
-const Length LOREM_NUMBER_OF_GLYPHS_ELIDED = 397u;
+const Length LOREM_NUMBER_OF_GLYPHS_ELIDED = 395u;
// The expected layout size for UtcDaliTextViewModelGetLayoutSize
-const Size LAYOUT_SIZE( 190.f, 48.f );
+const Size LAYOUT_SIZE( 194.f, 45.f );
// The expected color indices for UtcDaliTextViewModelGetColors
const ColorIndex COLOR_INDICES[] = { 0u, 0u, 0u, 0u, 0u, 0u, 1u, 1u, 1u, 2u, 2u, 2u, 2u, 2u, 1u, 1u, 1u, 1u, 1u, 3u, 1u, 1u, 1u, 0u, 0u, 0u, 0u };
@@ -583,13 +583,13 @@ int UtcDaliTextViewModelElideText02(void)
Size textSize00( 100.f, 100.f );
Size textSize01( 80.f, 100.f );
- float positions01[] = { 0.f, 9.f, 17.f, 27.f, 35.f, 37.f, 46.f, 56.f };
+ float positions01[] = { 0.f, 8.f, 16.f, 26.f, 33.f, 41.f, 45.f, 54.f, 64.0f };
Size textSize02( 80.f, 100.f );
- float positions02[] = { 72.f, 63.f, 54.f, 50.f, 43.f, 38.f, 30.f, 11.f };
+ float positions02[] = { 72.f, 63.f, 54.f, 50.f, 43.f, 38.f, 30.f, 13.0f };
Size textSize03( 80.f, 100.f );
- float positions03[] = { 77.f, 76.f, 71.f, 62.f, 59.f, 52.f, 47.f, 42.f, 39.f, 35.f, 32.f, 13.f };
+ float positions03[] = { 74.f, 69.f, 66.f, 61.f, 53.f, 51.f, 47.f, 46.f, 41.f, 31.f, 28.f, 14.f, 7.f };
Size textSize04( 80.f, 10.f );
float positions04[] = { 2.f };
@@ -609,7 +609,7 @@ int UtcDaliTextViewModelElideText02(void)
"Lorem ipsum dolor sit amet, aeque definiebas ea mei, posse iracundia ne cum.",
textSize01,
5u,
- 42u,
+ 37u,
positions01
},
{
@@ -625,7 +625,7 @@ int UtcDaliTextViewModelElideText02(void)
"ع٠اÙÙÙØ· دÙسÙ
بر اÙØ¥Ù
داد باÙ, بÙÙ Ùتر٠شعار ÙÙ. ÙÙ
Ù Ù
٠اÙÙ
برÙ
Ø© اÙÙÙØ· باÙسÙطرة, Ø£Ù
ÙتÙ
تØرÙÙ Ùبغطاء, عدÙ
ÙÙ Ùإعادة ÙØ¥ÙاÙ
Ø© رجÙعÙÙ
.",
textSize03,
5u,
- 79u,
+ 73u,
positions03
},
{