X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Controller.cpp;h=53b45f2c168bfc3f10a018a3901fbf9ed5d247d4;hb=020b07151378db83ab8e12eb3e2d51db0ed69996;hp=c89a025e4fcf8b18a0ca02332e8045ce2a622ea0;hpb=63f686ca7536fd1f010278d4896407476ccc4e52;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp index c89a025..53b45f2 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -25,10 +25,10 @@ #include #include #include -#include +#include +#include #include #include -#include using namespace Dali; using namespace Toolkit; @@ -722,8 +722,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void) // single line, line spacing = 0px { const float EXPECTED_SPACING = 0.0f; - const Vector2 EXPECTED_LAYOUT_SIZE( 360.0f, 19.0f); - const Vector3 EXPECTED_NATURAL_SIZE( 360.0f, 20.0f, 0.0f ); + const Vector2 EXPECTED_LAYOUT_SIZE( 349.0f, 19.0f); + const Vector3 EXPECTED_NATURAL_SIZE( 350.0f, 20.0f, 0.0f ); controller->SetText(textSingle); controller->Relayout(size); @@ -741,8 +741,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void) // single line, line spacing = 20px { const float EXPECTED_SPACING = 20.0f; - const Vector2 EXPECTED_LAYOUT_SIZE( 360.0f, 19.0f ); - const Vector3 EXPECTED_NATURAL_SIZE( 360.0f, 40.0f, 0.0f ); + const Vector2 EXPECTED_LAYOUT_SIZE( 349.0f, 19.0f ); + const Vector3 EXPECTED_NATURAL_SIZE( 350.0f, 40.0f, 0.0f ); controller->SetText(textSingle); controller->Relayout(size); @@ -761,8 +761,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void) // multi-line, line spacing = 0px { const float EXPECTED_SPACING = 0.0f; - const Vector2 EXPECTED_LAYOUT_SIZE( 350.0f, 39.0f ); - const Vector3 EXPECTED_NATURAL_SIZE( 124.0f, 58.0f, 0.0f ); + const Vector2 EXPECTED_LAYOUT_SIZE( 339.0f, 39.0f ); + const Vector3 EXPECTED_NATURAL_SIZE( 122.0f, 58.0f, 0.0f ); controller->SetText(textMulti); controller->Relayout(size); @@ -781,8 +781,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void) // multi-line, line spacing = 20px { const float EXPECTED_SPACING = 20.0f; - const Vector2 EXPECTED_LAYOUT_SIZE( 124.0f, 57.0f ); - const Vector3 EXPECTED_NATURAL_SIZE( 124.0f, 118.0f, 0.0f ); + const Vector2 EXPECTED_LAYOUT_SIZE( 121.0f, 57.0f ); + const Vector3 EXPECTED_NATURAL_SIZE( 122.0f, 118.0f, 0.0f ); controller->SetText(textMulti); controller->Relayout(size); @@ -801,8 +801,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void) // multi-line, line spacing = 30px { const float EXPECTED_SPACING = 30.0f; - const Vector2 EXPECTED_LAYOUT_SIZE( 124.0f, 117.0f ); - const Vector3 EXPECTED_NATURAL_SIZE( 124.0f, 148.0f, 0.0f ); + const Vector2 EXPECTED_LAYOUT_SIZE( 121.0f, 117.0f ); + const Vector3 EXPECTED_NATURAL_SIZE( 122.0f, 148.0f, 0.0f ); controller->SetText(textMulti); controller->Relayout(size);