X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Controller.cpp;h=92be47935d5bdee6349d17f6874ec30d45921750;hb=fedd5ae8da46cd798f730fd07c942df853e055dd;hp=ad3660749012600012f729325dc6dcc33ff85a22;hpb=a9e879edf14d08f54adf5f712fb2a1c04e8bfc24;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 old mode 100644 new mode 100755 index ad36607..92be479 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp @@ -35,7 +35,6 @@ using namespace Text; namespace { -const char* const OPTION_SELECT_WORD("option-select_word"); // "Select Word" popup option. const char* const OPTION_SELECT_ALL("option-select_all"); // "Select All" popup option. const char* const OPTION_CUT("optionCut"); // "Cut" popup option. const char* const OPTION_COPY("optionCopy"); // "Copy" popup option. @@ -146,9 +145,9 @@ int UtcDaliTextControllerEnableCursorBlinking(void) // Creates a decorator. Text::DecoratorPtr decorator = Text::Decorator::New( *controller, *controller ); - + InputMethodContext inputMethodContext = InputMethodContext::New(); // Enables the text input. - controller->EnableTextInput( decorator ); + controller->EnableTextInput( decorator, inputMethodContext ); // Enables the cursor blink. controller->SetEnableCursorBlink( true ); @@ -173,7 +172,7 @@ int UtcDaliTextControllerImfEvent(void) ControllerPtr controller = Controller::New(); std::string text; - ImfManager::ImfEventData imfEvent; + InputMethodContext::EventData imfEvent; DALI_TEST_CHECK( controller ); @@ -182,41 +181,39 @@ int UtcDaliTextControllerImfEvent(void) Text::DecoratorPtr decorator = Text::Decorator::New( *controller, *controller ); + InputMethodContext inputMethodContext = InputMethodContext::New(); // Enables the text input. - controller->EnableTextInput( decorator ); + controller->EnableTextInput( decorator, inputMethodContext ); // Set the placeholder text. controller->SetPlaceholderText( Controller::PLACEHOLDER_TYPE_INACTIVE, "Hello Dali" ); - // Creates an ImfManager. - ImfManager imfManager = ImfManager::Get(); - // For coverage. - imfEvent = ImfManager::ImfEventData( ImfManager::GETSURROUNDING, "", 0, 0 ); - controller->OnImfEvent( imfManager, imfEvent ); + imfEvent = InputMethodContext::EventData( InputMethodContext::GET_SURROUNDING, "", 0, 0 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); // Send VOID event. - imfEvent = ImfManager::ImfEventData( ImfManager::VOID, "", 0, 0 ); - controller->OnImfEvent( imfManager, imfEvent ); + imfEvent = InputMethodContext::EventData( InputMethodContext::VOID, "", 0, 0 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); controller->GetText( text ); DALI_TEST_CHECK( text.empty() ); - imfEvent = ImfManager::ImfEventData( ImfManager::COMMIT, "Hello ", 0, 6 ); - controller->OnImfEvent( imfManager, imfEvent ); + imfEvent = InputMethodContext::EventData( InputMethodContext::COMMIT, "Hello ", 0, 6 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); controller->GetNaturalSize(); // Check 'Delete All' key which means the input panel send a big range - imfEvent = ImfManager::ImfEventData( ImfManager::DELETESURROUNDING, "", -100, 100 ); - controller->OnImfEvent( imfManager, imfEvent ); + imfEvent = InputMethodContext::EventData( InputMethodContext::DELETE_SURROUNDING, "", -100, 100 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); controller->GetNaturalSize(); controller->GetText( text ); DALI_TEST_EQUALS( "", text, TEST_LOCATION ); // Send COMMIT event. - imfEvent = ImfManager::ImfEventData( ImfManager::COMMIT, "Hello ", 0, 6 ); - controller->OnImfEvent( imfManager, imfEvent ); + imfEvent = InputMethodContext::EventData( InputMethodContext::COMMIT, "Hello ", 0, 6 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); // Force to update the model. controller->GetNaturalSize(); @@ -224,9 +221,9 @@ int UtcDaliTextControllerImfEvent(void) controller->GetText( text ); DALI_TEST_EQUALS( "Hello ", text, TEST_LOCATION ); - // Send PREEDIT event - imfEvent = ImfManager::ImfEventData( ImfManager::PREEDIT, "w", 6, 1 ); - controller->OnImfEvent( imfManager, imfEvent ); + // Send PRE_EDIT event + imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "w", 6, 1 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); // Force to update the model. controller->GetNaturalSize(); @@ -234,9 +231,9 @@ int UtcDaliTextControllerImfEvent(void) controller->GetText( text ); DALI_TEST_EQUALS( "Hello w", text, TEST_LOCATION ); - // Send DELETESURROUNDING event - imfEvent = ImfManager::ImfEventData( ImfManager::DELETESURROUNDING, "", -1, 1 ); - controller->OnImfEvent( imfManager, imfEvent ); + // Send DELETE_SURROUNDING event + imfEvent = InputMethodContext::EventData( InputMethodContext::DELETE_SURROUNDING, "", -1, 1 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); // Force to update the model. controller->GetNaturalSize(); @@ -244,9 +241,9 @@ int UtcDaliTextControllerImfEvent(void) controller->GetText( text ); DALI_TEST_EQUALS( "Hello ", text, TEST_LOCATION ); - // Send PREEDIT event - imfEvent = ImfManager::ImfEventData( ImfManager::PREEDIT, "wo", 6, 2 ); - controller->OnImfEvent( imfManager, imfEvent ); + // Send PRE_EDIT event + imfEvent = InputMethodContext::EventData( InputMethodContext::PRE_EDIT, "wo", 6, 2 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); // Force to update the model. controller->GetNaturalSize(); @@ -254,16 +251,16 @@ int UtcDaliTextControllerImfEvent(void) controller->GetText( text ); DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION ); - // Send GETSURROUNDING event - imfEvent = ImfManager::ImfEventData( ImfManager::GETSURROUNDING, "", 0, 0 ); - controller->OnImfEvent( imfManager, imfEvent ); + // Send GET_SURROUNDING event + imfEvent = InputMethodContext::EventData( InputMethodContext::GET_SURROUNDING, "", 0, 0 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); controller->GetText( text ); DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION ); - // Send PRIVATECOMMAND event - imfEvent = ImfManager::ImfEventData( ImfManager::PRIVATECOMMAND, "", 0, 0 ); - controller->OnImfEvent( imfManager, imfEvent ); + // Send PRIVATE_COMMAND event + imfEvent = InputMethodContext::EventData( InputMethodContext::PRIVATE_COMMAND, "", 0, 0 ); + controller->OnInputMethodContextEvent( inputMethodContext, imfEvent ); controller->GetText( text ); DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION ); @@ -291,8 +288,9 @@ int UtcDaliTextControllerTextPopupButtonTouched(void) Text::DecoratorPtr decorator = Text::Decorator::New( *controller, *controller ); + InputMethodContext inputMethodContext = InputMethodContext::New(); // Enables the text input. - controller->EnableTextInput( decorator ); + controller->EnableTextInput( decorator, inputMethodContext ); // Creates the text's popup. TextSelectionPopupCallbackInterface& callbackInterface = *controller; @@ -479,8 +477,9 @@ int UtcDaliTextControllerSetGetCheckProperty(void) // Creates a decorator. Text::DecoratorPtr decorator = Text::Decorator::New( *controller, *controller ); + InputMethodContext inputMethodContext = InputMethodContext::New(); // Enables the text input. - controller->EnableTextInput( decorator ); + controller->EnableTextInput( decorator, inputMethodContext ); DALI_TEST_CHECK( !controller->IsInputModePassword() ); @@ -523,8 +522,9 @@ int UtcDaliTextControllerSetGetTapLongPressAction(void) // Creates a decorator. Text::DecoratorPtr decorator = Text::Decorator::New( *controller, *controller ); + InputMethodContext inputMethodContext = InputMethodContext::New(); // Enables the text input. - controller->EnableTextInput( decorator ); + controller->EnableTextInput( decorator, inputMethodContext ); DALI_TEST_EQUALS( Controller::NoTextTap::NO_ACTION, controller->GetNoTextDoubleTapAction(), TEST_LOCATION ); controller->SetNoTextDoubleTapAction( Controller::NoTextTap::HIGHLIGHT );