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-TextEditor.cpp;h=8e3e0cf05e392b918683f92cbdc00e9e661e682e;hp=809b07b8ce0fc98fcb7edeb38a99b17c8ad90497;hb=7bc9bb47cb9c552982e9144b202861190eeadc96;hpb=93c1881a3d13228479ebb96fd6bbdbf1984c2cff diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp index 809b07b..8e3e0cf 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp @@ -17,12 +17,11 @@ #include #include -#include +#include #include #include #include #include -#include ///< @todo to be removed when text-editor is added to the dali-toolkit.h using namespace Dali; using namespace Toolkit; @@ -71,6 +70,17 @@ const char* const PROPERTY_NAME_INPUT_FONT_FAMILY = "inputFon const char* const PROPERTY_NAME_INPUT_FONT_STYLE = "inputFontStyle"; const char* const PROPERTY_NAME_INPUT_POINT_SIZE = "inputPointSize"; +const char* const PROPERTY_NAME_LINE_SPACING = "lineSpacing"; +const char* const PROPERTY_NAME_INPUT_LINE_SPACING = "inputLineSpacing"; +const char* const PROPERTY_NAME_UNDERLINE = "underline"; +const char* const PROPERTY_NAME_INPUT_UNDERLINE = "inputUnderline"; +const char* const PROPERTY_NAME_SHADOW = "shadow"; +const char* const PROPERTY_NAME_INPUT_SHADOW = "inputShadow"; +const char* const PROPERTY_NAME_EMBOSS = "emboss"; +const char* const PROPERTY_NAME_INPUT_EMBOSS = "inputEmboss"; +const char* const PROPERTY_NAME_OUTLINE = "outline"; +const char* const PROPERTY_NAME_INPUT_OUTLINE = "inputOutline"; + const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND; const Dali::Vector4 LIGHT_BLUE( 0.75f, 0.96f, 1.f, 1.f ); // The text highlight color. @@ -180,7 +190,7 @@ int UtcDaliToolkitTextEditorCopyConstructorP(void) TextEditor copy( textEditor ); DALI_TEST_CHECK( copy ); - DALI_TEST_CHECK( copy.GetProperty( TextLabel::Property::TEXT ) == textEditor.GetProperty( TextLabel::Property::TEXT ) ); + DALI_TEST_CHECK( copy.GetProperty( TextEditor::Property::TEXT ) == textEditor.GetProperty( TextEditor::Property::TEXT ) ); END_TEST; } @@ -245,6 +255,18 @@ int UtcDaliTextEditorGetPropertyP(void) DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_FONT_FAMILY ) == TextEditor::Property::INPUT_FONT_FAMILY ); DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_FONT_STYLE ) == TextEditor::Property::INPUT_FONT_STYLE ); DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_POINT_SIZE ) == TextEditor::Property::INPUT_POINT_SIZE ); + + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_LINE_SPACING ) == TextEditor::Property::LINE_SPACING ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_LINE_SPACING ) == TextEditor::Property::INPUT_LINE_SPACING ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_UNDERLINE ) == TextEditor::Property::UNDERLINE ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_UNDERLINE ) == TextEditor::Property::INPUT_UNDERLINE ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SHADOW ) == TextEditor::Property::SHADOW ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_SHADOW ) == TextEditor::Property::INPUT_SHADOW ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_EMBOSS ) == TextEditor::Property::EMBOSS ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_EMBOSS ) == TextEditor::Property::INPUT_EMBOSS ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_OUTLINE ) == TextEditor::Property::OUTLINE ); + DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_INPUT_OUTLINE ) == TextEditor::Property::INPUT_OUTLINE ); + END_TEST; } @@ -362,6 +384,48 @@ int UtcDaliTextEditorSetPropertyP(void) editor.SetProperty( TextEditor::Property::INPUT_POINT_SIZE, 12.f ); DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::INPUT_POINT_SIZE ), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + // Check the line spacing property + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::LINE_SPACING ), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + editor.SetProperty( TextEditor::Property::LINE_SPACING, 10.f ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::LINE_SPACING ), 10.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + + // Check the input line spacing property + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::INPUT_LINE_SPACING ), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + editor.SetProperty( TextEditor::Property::INPUT_LINE_SPACING, 20.f ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::INPUT_LINE_SPACING ), 20.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + + // Check the underline property + editor.SetProperty( TextEditor::Property::UNDERLINE, "Underline properties" ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::UNDERLINE ), std::string("Underline properties"), TEST_LOCATION ); + + // Check the input underline property + editor.SetProperty( TextEditor::Property::INPUT_UNDERLINE, "Underline input properties" ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::INPUT_UNDERLINE ), std::string("Underline input properties"), TEST_LOCATION ); + + // Check the shadow property + editor.SetProperty( TextEditor::Property::SHADOW, "Shadow properties" ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::SHADOW ), std::string("Shadow properties"), TEST_LOCATION ); + + // Check the input shadow property + editor.SetProperty( TextEditor::Property::INPUT_SHADOW, "Shadow input properties" ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::INPUT_SHADOW ), std::string("Shadow input properties"), TEST_LOCATION ); + + // Check the emboss property + editor.SetProperty( TextEditor::Property::EMBOSS, "Emboss properties" ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::EMBOSS ), std::string("Emboss properties"), TEST_LOCATION ); + + // Check the input emboss property + editor.SetProperty( TextEditor::Property::INPUT_EMBOSS, "Emboss input properties" ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::INPUT_EMBOSS ), std::string("Emboss input properties"), TEST_LOCATION ); + + // Check the outline property + editor.SetProperty( TextEditor::Property::OUTLINE, "Outline properties" ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::OUTLINE ), std::string("Outline properties"), TEST_LOCATION ); + + // Check the input outline property + editor.SetProperty( TextEditor::Property::INPUT_OUTLINE, "Outline input properties" ); + DALI_TEST_EQUALS( editor.GetProperty( TextEditor::Property::INPUT_OUTLINE ), std::string("Outline input properties"), TEST_LOCATION ); + END_TEST; } @@ -533,17 +597,14 @@ int utcDaliTextEditorEvent02(void) application.SendNotification(); application.Render(); - // Check there are the expected number of children ( active layer, offscreen root actor, and the offscreen image actor - DALI_TEST_EQUALS( editor.GetChildCount(), 3u, TEST_LOCATION ); + // Check there are the expected number of children ( offscreen root actor, and the offscreen image view + DALI_TEST_EQUALS( editor.GetChildCount(), 2u, TEST_LOCATION ); - Actor layer = editor.GetChildAt( 0u ); - DALI_TEST_CHECK( layer.IsLayer() ); - - Actor offscreenRoot = editor.GetChildAt( 1u ); + Actor offscreenRoot = editor.GetChildAt( 0u ); DALI_TEST_CHECK( offscreenRoot.IsLayer() ); DALI_TEST_EQUALS( offscreenRoot.GetChildCount(), 1u, TEST_LOCATION ); // The camera actor. - Actor offscreenImage = editor.GetChildAt( 2u ); + Actor offscreenImage = editor.GetChildAt( 1u ); DALI_TEST_CHECK( offscreenImage ); // Create a tap event to touch the text editor. @@ -554,6 +615,9 @@ int utcDaliTextEditorEvent02(void) application.SendNotification(); application.Render(); + Actor layer = editor.GetChildAt( 2u ); + DALI_TEST_CHECK( layer.IsLayer() ); + DALI_TEST_EQUALS( layer.GetChildCount(), 1u, TEST_LOCATION ); // The cursor. DALI_TEST_EQUALS( offscreenRoot.GetChildCount(), 1u, TEST_LOCATION ); // The camera actor. @@ -692,7 +756,7 @@ int utcDaliTextEditorEvent03(void) application.Render(); // The offscreen root actor should have three actors: the camera, a renderer and the highlight actor. - Actor offscreenRoot = editor.GetChildAt( 1u ); + Actor offscreenRoot = editor.GetChildAt( 0u ); DALI_TEST_CHECK( offscreenRoot.IsLayer() ); CameraActor camera = CameraActor::DownCast( offscreenRoot.GetChildAt( 0u ) );