X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-TextLabel.cpp;h=21b3c8badb41376e63085447c58384cb555b945d;hp=d3a3b60dbfa33d96b088b082017adf39da04bee5;hb=2c8cb08997d878a5b08939cae7c109e4e7e1ede1;hpb=6a23335f5f519910533bbeefd0d627d6d071c7a8 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp index d3a3b60..21b3c8b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp @@ -177,8 +177,8 @@ int UtcDaliToolkitTextLabelSetPropertyP(void) DALI_TEST_EQUALS( label.GetProperty( TextLabel::Property::UNDERLINE_COLOR ), Color::BLACK, TEST_LOCATION ); DALI_TEST_EQUALS( label.GetProperty( TextLabel::Property::UNDERLINE_HEIGHT ), 0.0f, TEST_LOCATION ); - label.SetProperty( TextLabel::Property::RENDERING_BACKEND, Text::RENDERING_BASIC ); - DALI_TEST_EQUALS( label.GetProperty( TextLabel::Property::RENDERING_BACKEND ), Text::RENDERING_BASIC, TEST_LOCATION ); + label.SetProperty( TextLabel::Property::RENDERING_BACKEND, Text::RENDERING_SHARED_ATLAS ); + DALI_TEST_EQUALS( label.GetProperty( TextLabel::Property::RENDERING_BACKEND ), Text::RENDERING_SHARED_ATLAS, TEST_LOCATION ); // Check that text can be correctly reset label.SetProperty( TextLabel::Property::TEXT, "Setting Text" ); @@ -229,32 +229,6 @@ int UtcDaliToolkitTextLabelSetPropertyP(void) END_TEST; } -int UtcDaliToolkitTextlabelBasicRenderP(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliToolkitTextLabelBasicRenderP"); - TextLabel label = TextLabel::New("Test Text"); - DALI_TEST_CHECK( label ); - - Stage::GetCurrent().Add( label ); - - label.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "BEGIN" ); - label.SetProperty( TextLabel::Property::MULTI_LINE, true ); - - try - { - // Render some text with the basic backend - label.SetProperty( TextLabel::Property::RENDERING_BACKEND, Text::RENDERING_BASIC ); - application.SendNotification(); - application.Render(); - } - catch( ... ) - { - tet_result(TET_FAIL); - } - END_TEST; -} - int UtcDaliToolkitTextlabelAtlasRenderP(void) { ToolkitTestApplication application; @@ -262,6 +236,11 @@ int UtcDaliToolkitTextlabelAtlasRenderP(void) TextLabel label = TextLabel::New("Test Text"); DALI_TEST_CHECK( label ); + // Avoid a crash when core load gl resources. + application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); + + Stage::GetCurrent().Add( label ); + // Turn on all the effects label.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); label.SetProperty( TextLabel::Property::MULTI_LINE, true ); @@ -281,6 +260,7 @@ int UtcDaliToolkitTextlabelAtlasRenderP(void) { tet_result(TET_FAIL); } + END_TEST; } @@ -297,7 +277,8 @@ int UtcDaliToolkitTextLabelLanguagesP(void) "բարեւ աշխարհը, მსოფლიოში, 안녕하세요, 你好世界, ひらがな, カタカナ, " "ওহে বিশ্ব, မင်္ဂလာပါကမ္ဘာလောက, हैलो वर्ल्ड, હેલો વર્લ્ડ, ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ ਦੁਨਿਆ, ಹಲೋ ವರ್ಲ್ಡ್, " "ഹലോ വേൾഡ്, ଓଡ଼ିଆ, හෙලෝ වර්ල්ඩ්, ஹலோ உலகம், హలో వరల్డ్, " - "ສະບາຍດີໂລກ, สวัสดีโลก, ជំរាបសួរពិភពលោក." ); + "ສະບາຍດີໂລກ, สวัสดีโลก, ជំរាបសួរពិភពលោក, " + "\xF0\x9F\x98\x81 \xF0\x9F\x98\x82 \xF0\x9F\x98\x83 \xF0\x9F\x98\x84." ); // these characters on the last line are emojis. label.SetProperty( TextLabel::Property::TEXT, scripts ); DALI_TEST_EQUALS( label.GetProperty( TextLabel::Property::TEXT ), scripts, TEST_LOCATION );