X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Typesetter.cpp;h=44136a70abe39ba28a5efabcf82caf45d6340161;hb=4ea37f8863638b8ed605b7135797ce4597e00210;hp=14f352c26b63bf90e41ab0165a915104ec2e2e5a;hpb=2ef1ec2dc06370b206f95db44c0a59259ce2f7d1;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 14f352c..44136a7 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 @@ -27,6 +27,7 @@ #include #include #include +#include using namespace Dali; using namespace Toolkit; @@ -108,7 +109,7 @@ int UtcDaliTextRenderingControllerRender(void) DALI_TEST_CHECK( renderingController ); // Renders the text and creates the final bitmap. - PixelData bitmap = renderingController->Render( relayoutSize ); + PixelData bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT ); DALI_TEST_CHECK( bitmap ); DALI_TEST_EQUALS( 120u, bitmap.GetWidth(), TEST_LOCATION ); @@ -120,7 +121,7 @@ int UtcDaliTextRenderingControllerRender(void) controller->Relayout( relayoutSize ); // Renders the text and creates the final bitmap. - bitmap = renderingController->Render( relayoutSize ); + bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT ); DALI_TEST_CHECK( bitmap ); DALI_TEST_EQUALS( 120u, bitmap.GetWidth(), TEST_LOCATION ); @@ -131,7 +132,7 @@ int UtcDaliTextRenderingControllerRender(void) controller->Relayout( relayoutSize ); // Renders the text and creates the final bitmap. - bitmap = renderingController->Render( relayoutSize ); + bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT ); DALI_TEST_CHECK( bitmap ); DALI_TEST_EQUALS( 120u, bitmap.GetWidth(), TEST_LOCATION ); @@ -166,32 +167,32 @@ int UtcDaliTextTypesetterVerticalLineAlignment(void) DALI_TEST_CHECK( renderingController ); { - controller->SetVerticalLineAlignment(Dali::Toolkit::DevelText::VerticalLineAlignment::TOP); - controller->Relayout(relayoutSize); + controller->SetVerticalLineAlignment( Dali::Toolkit::DevelText::VerticalLineAlignment::TOP ); + controller->Relayout( relayoutSize ); // Renders the text and creates the final bitmap. - auto bitmap = renderingController->Render(relayoutSize); + auto bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT ); DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION ); } { - controller->SetVerticalLineAlignment(Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE); - controller->Relayout(relayoutSize); + controller->SetVerticalLineAlignment( Dali::Toolkit::DevelText::VerticalLineAlignment::MIDDLE ); + controller->Relayout( relayoutSize ); // Renders the text and creates the final bitmap. - auto bitmap = renderingController->Render(relayoutSize); + auto bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT ); DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION ); } { - controller->SetVerticalLineAlignment(Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM); - controller->Relayout(relayoutSize); + controller->SetVerticalLineAlignment( Dali::Toolkit::DevelText::VerticalLineAlignment::BOTTOM ); + controller->Relayout( relayoutSize ); // Renders the text and creates the final bitmap. - auto bitmap = renderingController->Render(relayoutSize); + auto bitmap = renderingController->Render( relayoutSize, Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT ); DALI_TEST_EQUALS( 60u, bitmap.GetHeight(), TEST_LOCATION ); } tet_result(TET_PASS); END_TEST; -} \ No newline at end of file +}