Merge "fix wrong behaviour of SelectWholeText()" into devel/master

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit-internal / utc-Dali-Text-Controller.cpp

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 024942f..c89a025 100755 (executable)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
@@ -412,7 +412,7 @@ int UtcDaliTextControllerImfPreeditStyleReverse(void)
   // Creates a temporary text-field to use mEditableControlInterface.
   TextField field = TextField::New();
   Toolkit::Internal::TextField& fieldImpl = GetImpl(field);
-  ControllerPtr fieldController = fieldImpl.getController();
+  ControllerPtr fieldController = fieldImpl.GetTextController();
   Controller::Impl& fieldControllerImpl = Controller::Impl::GetImplementation(*fieldController.Get());
   Controller::Impl& controllerImpl = Controller::Impl::GetImplementation(*controller.Get());
 
@@ -475,6 +475,9 @@ int UtcDaliTextControllerTextPopupButtonTouched(void)
   // Sets some text.
   controller->SetText( "Hello world" );
 
+  // When the TextSelectionPopup is active, the controller has focus.
+  controller->KeyboardFocusGainEvent();
+
   // Select the whole text.
   button = PushButton::DownCast( textPopup.FindChildByName( OPTION_SELECT_ALL ) );
   DALI_TEST_CHECK( button );