X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Typesetter.cpp;h=50ca75dc520a02f62955914e58036e433fb891c6;hb=56f0e94bab1f9ecc097c4a5209716cdc1ede7715;hp=63f9a22db418095b2e79145c5bb9deab5a46671d;hpb=09ae840a22681a4bbdc770f00674498ab75aec69;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
index 63f9a22..50ca75d 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
@@ -35,7 +35,7 @@ using namespace Text;
 namespace
 {
 const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
-const PointSize26Dot6 EMOJI_FONT_SIZE = 62u * 64u;
+const PointSize26Dot6 EMOJI_FONT_SIZE = 3840u; // 60 * 64
 } // namespace
 
 int UtcDaliTextTypesetter(void)
@@ -86,7 +86,7 @@ int UtcDaliTextRenderingControllerRender(void)
   const std::string pathName( pathNamePtr );
   free( pathNamePtr );
 
-  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenColorEmoji.ttf", EMOJI_FONT_SIZE );
+  fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/BreezeColorEmoji.ttf", EMOJI_FONT_SIZE );
   fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
 
   // Creates a text controller.
@@ -97,7 +97,7 @@ int UtcDaliTextRenderingControllerRender(void)
 
   // Sets the text.
   controller->SetMarkupProcessorEnabled( true );
-  controller->SetText( "<font family='TizenSansRegular'>Hello world </font><font family='TizenColorEmoji'>\xF0\x9F\x98\x81</font>" );
+  controller->SetText( "<font family='TizenSansRegular'>Hello world </font><font family='BreezeColorEmoji'>\xF0\x9F\x98\x81</font>" );
 
   // Creates the text's model and relais-out the text.
   const Size relayoutSize( 120.f, 60.f );
@@ -116,7 +116,7 @@ int UtcDaliTextRenderingControllerRender(void)
   DALI_TEST_EQUALS( Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION );
 
   // Changes vertical alignment.
-  controller->SetVerticalAlignment( Layout::VERTICAL_ALIGN_CENTER );
+  controller->SetVerticalAlignment( Text::VerticalAlignment::CENTER );
   controller->Relayout( relayoutSize );
 
   // Renders the text and creates the final bitmap.
@@ -127,7 +127,7 @@ int UtcDaliTextRenderingControllerRender(void)
   DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION );
   DALI_TEST_EQUALS( Pixel::RGBA8888, bitmap.GetPixelFormat(), TEST_LOCATION );
 
-  controller->SetVerticalAlignment( Layout::VERTICAL_ALIGN_BOTTOM );
+  controller->SetVerticalAlignment( Text::VerticalAlignment::BOTTOM );
   controller->Relayout( relayoutSize );
 
   // Renders the text and creates the final bitmap.