X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Controller.cpp;h=b1afd347fc2801bed3ce082f6b3bbdd6ea4c663a;hb=77af66aef5b24b239f271ef76bd7f21ea103f91c;hp=5db928d03ace1fd359b088808e1883a74b2fa51b;hpb=cb3691d010da3297946e5b92bcd1a43c38d414fe;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 5db928d..b1afd34 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) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -425,7 +425,7 @@ int UtcDaliTextControllerTextPopupButtonTouched(void)
                                                                                                             TextSelectionPopup::CLIPBOARD );
 
   textPopup.EnableButtons( buttonsToEnable );
-  Stage::GetCurrent().Add( textPopup );
+  application.GetScene().Add( textPopup );
   textPopup.ShowPopup();
 
   // Render and notify
@@ -663,7 +663,7 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void)
   tet_infoline(" UtcDaliTextControllerSetGetLineSpacingProperty");
   ToolkitTestApplication application;
 
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
 
   // single line text
   const std::string textSingle("A Quick Brown Fox Jumps Over The Lazy Dog");
@@ -679,8 +679,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void)
   // single line, line spacing = 0px
   {
     const float EXPECTED_SPACING = 0.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 342.0f, 19.0f);
-    const Vector3 EXPECTED_NATURAL_SIZE( 342.0f, 20.0f, 0.0f );
+    const Vector2 EXPECTED_LAYOUT_SIZE( 360.0f, 19.0f);
+    const Vector3 EXPECTED_NATURAL_SIZE( 360.0f, 20.0f, 0.0f );
 
     controller->SetText(textSingle);
     controller->Relayout(size);
@@ -698,8 +698,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void)
   // single line, line spacing = 20px
   {
     const float EXPECTED_SPACING = 20.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 342.0f, 19.0f );
-    const Vector3 EXPECTED_NATURAL_SIZE( 342.0f, 40.0f, 0.0f );
+    const Vector2 EXPECTED_LAYOUT_SIZE( 360.0f, 19.0f );
+    const Vector3 EXPECTED_NATURAL_SIZE( 360.0f, 40.0f, 0.0f );
 
     controller->SetText(textSingle);
     controller->Relayout(size);
@@ -718,8 +718,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void)
   // multi-line, line spacing = 0px
   {
     const float EXPECTED_SPACING = 0.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 332.0f, 39.0f );
-    const Vector3 EXPECTED_NATURAL_SIZE( 118.0f, 58.0f, 0.0f );
+    const Vector2 EXPECTED_LAYOUT_SIZE( 350.0f, 39.0f );
+    const Vector3 EXPECTED_NATURAL_SIZE( 124.0f, 58.0f, 0.0f );
 
     controller->SetText(textMulti);
     controller->Relayout(size);
@@ -738,8 +738,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void)
   // multi-line, line spacing = 20px
   {
     const float EXPECTED_SPACING = 20.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 118.0f, 57.0f );
-    const Vector3 EXPECTED_NATURAL_SIZE( 118.0f, 118.0f, 0.0f );
+    const Vector2 EXPECTED_LAYOUT_SIZE( 124.0f, 57.0f );
+    const Vector3 EXPECTED_NATURAL_SIZE( 124.0f, 118.0f, 0.0f );
 
     controller->SetText(textMulti);
     controller->Relayout(size);
@@ -758,8 +758,8 @@ int UtcDaliTextControllerSetGetLineSpacingProperty(void)
   // multi-line, line spacing = 30px
   {
     const float EXPECTED_SPACING = 30.0f;
-    const Vector2 EXPECTED_LAYOUT_SIZE( 118.0f, 117.0f );
-    const Vector3 EXPECTED_NATURAL_SIZE( 118.0f, 148.0f, 0.0f );
+    const Vector2 EXPECTED_LAYOUT_SIZE( 124.0f, 117.0f );
+    const Vector3 EXPECTED_NATURAL_SIZE( 124.0f, 148.0f, 0.0f );
 
     controller->SetText(textMulti);
     controller->Relayout(size);
@@ -804,7 +804,7 @@ int UtcDaliTextControllerCheckBufferIndices(void)
   mImpl.mOperationsPending = Controller::ALL_OPERATIONS;
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -855,7 +855,7 @@ int UtcDaliTextControllerCheckInputColorChanged(void)
   DALI_TEST_EQUALS( Controller::COLOR, static_cast<Controller::OperationsMask>( mImpl.mOperationsPending & Controller::COLOR ), TEST_LOCATION );
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -904,7 +904,7 @@ int UtcDaliTextControllerCheckInputFontFamilyChanged(void)
                     TEST_LOCATION );
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -953,7 +953,7 @@ int UtcDaliTextControllerCheckInputFontWeightChanged(void)
                     TEST_LOCATION );
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -1002,7 +1002,7 @@ int UtcDaliTextControllerCheckInputFontWidthChanged(void)
                     TEST_LOCATION );
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -1051,7 +1051,7 @@ int UtcDaliTextControllerCheckInputFontSlantChanged(void)
                     TEST_LOCATION );
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -1100,7 +1100,7 @@ int UtcDaliTextControllerCheckInputFontPointSizeChanged(void)
                     TEST_LOCATION );
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   tet_result(TET_PASS);
@@ -1127,7 +1127,7 @@ int UtcDaliTextControllerSelectEvent(void)
   controller->SelectEvent( 0.f, 0.f, SelectionType::INTERACTIVE );
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   // Get the implementation of the text controller
@@ -1185,7 +1185,7 @@ int UtcDaliTextControllerRemoveTextChangeEventData(void)
   DALI_TEST_EQUALS( EventData::EDITING, mImpl.mEventData->mState, TEST_LOCATION );
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout( size );
 
   tet_result(TET_PASS);
@@ -1213,7 +1213,7 @@ int UtcDaliTextControllerCheckInputFontPointSizeUpdated(void)
   application.Render();
 
   // Perform a relayout
-  const Size size( Dali::Stage::GetCurrent().GetSize() );
+  const Size size( application.GetScene().GetSize() );
   controller->Relayout(size);
 
   // simulate a key event.