From 1a1dc01690d6b218743ce6a3e1acc63699bc171a Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Fri, 3 Mar 2017 17:38:34 +0000 Subject: [PATCH] Text Selection Popup and Radio Button fix and tests uses Button::Properties Button tests now use Properties and deprecated API separated to bottom of files. Radio button dead code removed. Text Selection popup doesn't use deprecated API Change-Id: Icd8b2fa422031a7e366bf211e0def0c8182532a5 --- .../src/dali-toolkit/utc-Dali-Button.cpp | 568 ++++----------------- .../src/dali-toolkit/utc-Dali-CheckBoxButton.cpp | 100 +++- .../src/dali-toolkit/utc-Dali-PushButton.cpp | 352 ++++++++++--- .../src/dali-toolkit/utc-Dali-RadioButton.cpp | 104 ++-- .../controls/buttons/radio-button-impl.cpp | 8 +- .../text-controls/text-selection-popup-impl.cpp | 6 +- 6 files changed, 542 insertions(+), 596 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp index 244f667..79d5cef 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp @@ -47,8 +47,6 @@ void utc_dali_toolkit_button_cleanup(void) namespace { -static const char* TEST_IMAGE_ONE = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; - static bool gIsCalledButtonCallback = false; const int RENDER_FRAME_INTERVAL = 16; @@ -207,27 +205,29 @@ int UtcDaliButtonDownCastN(void) END_TEST; } -int UtcDaliButtonSetDisabledP(void) +int UtcDaliButtonDisabledPropertyP(void) { ToolkitTestApplication application; Button button = PushButton::New(); - button.SetDisabled( true ); - DALI_TEST_CHECK( button.IsDisabled() ); + button.SetProperty( button.GetPropertyIndex("disabled"), true ); - button.SetDisabled( false ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("disabled")), true, TEST_LOCATION ); - DALI_TEST_CHECK( !button.IsDisabled() ); + button.SetProperty( button.GetPropertyIndex("disabled"), false ); - button.SetDisabled( true ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("disabled")), false, TEST_LOCATION ); - DALI_TEST_CHECK( button.IsDisabled() ); + button.SetProperty( button.GetPropertyIndex("disabled"), true ); - button.SetDisabled( false ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("disabled")), true, TEST_LOCATION ); + + button.SetProperty( button.GetPropertyIndex("disabled"), false ); + + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("disabled")), false, TEST_LOCATION ); - DALI_TEST_CHECK( !button.IsDisabled() ); END_TEST; } @@ -311,23 +311,23 @@ int UtcDaliButtonIsDisabledP(void) END_TEST; } -int UtcDaliButtonSetAutoRepeatingP(void) +int UtcDaliButtonAutoRepeatingPropertyP(void) { ToolkitTestApplication application; Button button = PushButton::New(); - button.SetAutoRepeating( true ); + button.SetProperty( button.GetPropertyIndex("autoRepeating"), true ); - DALI_TEST_CHECK( button.IsAutoRepeating() ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION ); - button.SetAutoRepeating( false ); + button.SetProperty( button.GetPropertyIndex("autoRepeating"), false ); - DALI_TEST_CHECK( !button.IsAutoRepeating() ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION ); - button.SetAutoRepeating( true ); + button.SetProperty( button.GetPropertyIndex("autoRepeating"), true ); - DALI_TEST_CHECK( button.IsAutoRepeating() ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION ); button.SetAutoRepeating( false ); @@ -411,68 +411,69 @@ int UtcDaliButtonAutoRepeatingP(void) END_TEST; } -int UtcDaliButtonSetInitialAutoRepeatingDelayP(void) +int UtcDaliButtonInitialAutoRepeatingDelayPropertyP(void) { ToolkitTestApplication application; Button button = PushButton::New(); - button.SetInitialAutoRepeatingDelay( 0.5f ); + button.SetProperty( button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.5f ); - DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.5f, TEST_LOCATION ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.5f, TEST_LOCATION ); - button.SetInitialAutoRepeatingDelay( 0.2f ); + button.SetProperty( button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.2f ); + + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.2f, TEST_LOCATION ); - DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.2f, TEST_LOCATION ); END_TEST; } -int UtcDaliButtonSetNextAutoRepeatingDelayP(void) +int UtcDaliButtonNextAutoRepeatingDelayPropertyP(void) { ToolkitTestApplication application; Button button = PushButton::New(); - button.SetNextAutoRepeatingDelay( 0.5f ); + button.SetProperty( button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.5f ); - DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.5f, TEST_LOCATION ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.5f, TEST_LOCATION ); - button.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, 0.2f ); + button.SetProperty( button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.2f ); - DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.2f, TEST_LOCATION ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.2f, TEST_LOCATION ); END_TEST; } -int UtcDaliButtonSetTogglableButtonP(void) +int UtcDaliButtonTogglableButtonPropertyP(void) { ToolkitTestApplication application; Button button = PushButton::New(); - button.SetTogglableButton( true ); + button.SetProperty( button.GetPropertyIndex("togglable"), true ); - DALI_TEST_CHECK( button.IsTogglableButton() ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("togglable")), true, TEST_LOCATION ); - button.SetTogglableButton( false ); + button.SetProperty( button.GetPropertyIndex("togglable"), false ); - DALI_TEST_CHECK( !button.IsTogglableButton() ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("togglable")), false, TEST_LOCATION ); END_TEST; } -int UtcDaliButtonSetSelectedP(void) +int UtcDaliButtonSelectedPropertyP(void) { ToolkitTestApplication application; Button button = PushButton::New(); - button.SetTogglableButton( true ); + button.SetProperty( button.GetPropertyIndex("togglable"), true ); - button.SetSelected( true ); + button.SetProperty( button.GetPropertyIndex("selected"), true ); - DALI_TEST_CHECK( button.IsSelected() ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("selected")), true, TEST_LOCATION ); - button.SetSelected( false ); + button.SetProperty( button.GetPropertyIndex("selected"), false ); - DALI_TEST_CHECK( !button.IsSelected() ); + DALI_TEST_EQUALS( button.GetProperty( button.GetPropertyIndex("selected")), false, TEST_LOCATION ); END_TEST; } @@ -595,48 +596,6 @@ int UtcDaliButtonSetLabelPropertyP(void) END_TEST; } -int UtcDaliButtonSetUnselectedImageP(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSetUnselectedImageP"); - - PushButton pushButton = PushButton::New(); - Stage::GetCurrent().Add( pushButton ); - - application.SendNotification(); - application.Render(); - - pushButton.SetUnselectedImage( "Image.jpg" ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( pushButton ); - - END_TEST; -} - -int UtcDaliButtonSetSelectedImageP(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSetButtonImage"); - - PushButton pushButton = PushButton::New(); - Stage::GetCurrent().Add( pushButton ); - - application.SendNotification(); - application.Render(); - - pushButton.SetSelectedImage( "Image.jpg" ); - - application.SendNotification(); - application.Render(); - - DALI_TEST_CHECK( pushButton ); - - END_TEST; -} - int UtcDaliButtonPressedSignalP(void) { ToolkitTestApplication application; @@ -843,7 +802,8 @@ int UtcDaliButtonStateChangedSignalP(void) tet_infoline(" UtcDaliButtonStateChangedSignalP"); Button button = PushButton::New(); - button.SetTogglableButton( true ); + + button.SetProperty( Button::Property::TOGGLABLE, true); Stage::GetCurrent().Add( button ); @@ -857,7 +817,7 @@ int UtcDaliButtonStateChangedSignalP(void) button.ConnectSignal( testTracker, "stateChanged", CallbackFunctor(&stateChangedSignal) ); gIsCalledButtonCallback = false; - button.SetSelected( true ); + button.SetProperty( Button::Property::SELECTED, true); DALI_TEST_CHECK( gIsCalledButtonCallback ); DALI_TEST_CHECK( stateChangedSignal ); @@ -865,8 +825,7 @@ int UtcDaliButtonStateChangedSignalP(void) gIsCalledButtonCallback = false; stateChangedSignal = false; - button.SetSelected( false ); - + button.SetProperty( Button::Property::SELECTED, false); DALI_TEST_CHECK( gIsCalledButtonCallback ); DALI_TEST_CHECK( stateChangedSignal ); END_TEST; @@ -880,469 +839,126 @@ int UtcDaliButtonSetProperty(void) PushButton pushButton = PushButton::New(); pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), false); - DALI_TEST_CHECK( false == pushButton.IsDisabled() ); - - pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true); - DALI_TEST_CHECK( true == pushButton.IsDisabled() ); - - END_TEST; -} - -int UtcDaliButtonSize(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSize"); - - // First an image is set, then SetSize is called. - PushButton pushButton = PushButton::New(); - Stage::GetCurrent().Add( pushButton ); - - pushButton.SetBackgroundImage( "Image.jpg" ); - pushButton.SetSize( 10.f, 10.f ); - - application.SendNotification(); - application.Render(); - - Vector3 size = pushButton.GetCurrentSize(); - - DALI_TEST_EQUALS( size.width, 10.f, TEST_LOCATION ); - DALI_TEST_EQUALS( size.height, 10.f, TEST_LOCATION ); - END_TEST; -} - -int UtcDaliButtonSetSelectedBackgroundImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetSelectedBackgroundImage( "TestImage.jpg"); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - -int UtcDaliButtonSetSelectedBackgroundImageN(void) -{ - ToolkitTestApplication application; - - PushButton button; - - try - { - button.SetSelectedBackgroundImage( "TestImage.jpg"); - DALI_TEST_CHECK( false ); - } - catch(...) - { - DALI_TEST_CHECK( true ); - } - - END_TEST; -} - -int UtcDaliButtonSetDisabledImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetDisabledImage( "TestImage.jpg"); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - -int UtcDaliButtonSetDisabledImageN(void) -{ - ToolkitTestApplication application; - - PushButton button; - - try - { - button.SetDisabledImage( "TestImage.jpg"); - DALI_TEST_CHECK( false ); - } - catch(...) - { - DALI_TEST_CHECK( true ); - } - - END_TEST; -} - -int UtcDaliButtonSetDisabledSelectedImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetDisabledSelectedImage( "TestImage.jpg"); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - -int UtcDaliButtonSetDisabledSelectedImageN(void) -{ - ToolkitTestApplication application; - - PushButton button; - - try - { - button.SetDisabledSelectedImage( "TestImage.jpg"); - DALI_TEST_CHECK( false ); - } - catch(...) - { - DALI_TEST_CHECK( true ); - } - - END_TEST; -} -int UtcDaliButtonSetLabeActorlP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); + DALI_TEST_EQUALS( pushButton.GetProperty( pushButton.GetPropertyIndex("disabled")), false, TEST_LOCATION ); - try - { - button.SetLabel( TextLabel::New("Hello") ); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } + pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true); + DALI_TEST_EQUALS( pushButton.GetProperty( pushButton.GetPropertyIndex("disabled")), true, TEST_LOCATION ); END_TEST; } -int UtcDaliButtonSetLabelN(void) -{ - ToolkitTestApplication application; - - PushButton button; - - try - { - button.SetLabel( TextLabel::New("Hello") ); - DALI_TEST_CHECK( false ); - } - catch(...) - { - DALI_TEST_CHECK( true ); - } +// Deprecated API Tests - END_TEST; -} - -int UtcDaliButtonSetButtonImageP(void) +int UtcDaliButtonSetDisabledP(void) { ToolkitTestApplication application; - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE ); - button.SetButtonImage( image1 ); - - Property::Value value = button.GetProperty(Button::Property::UNSELECTED_STATE_IMAGE ); - DALI_TEST_CHECK( value.Get() == TEST_IMAGE_ONE ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - std::string imageUrl; - - Dali::Actor actor = button.GetButtonImage(); + Button button = PushButton::New(); - Toolkit::ImageView imageView = Toolkit::ImageView ::DownCast( actor ); + button.SetDisabled( true ); - tet_infoline(" UtcDaliButtonSetButtonImageP Ensure an ImageView is returned\n"); - DALI_TEST_CHECK ( imageView ) + DALI_TEST_CHECK( button.IsDisabled() ); - END_TEST; -} + button.SetDisabled( false ); -int UtcDaliButtonSetButtonImageN(void) -{ - ToolkitTestApplication application; + DALI_TEST_CHECK( !button.IsDisabled() ); - PushButton button; + button.SetDisabled( true ); - try - { - ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE ); - button.SetButtonImage( image1 ); + DALI_TEST_CHECK( button.IsDisabled() ); - DALI_TEST_CHECK( false ); - } - catch(...) - { - DALI_TEST_CHECK( true ); - } + button.SetDisabled( false ); + DALI_TEST_CHECK( !button.IsDisabled() ); END_TEST; } -int UtcDaliButtonSetSelectedImageWithImageP(void) +int UtcDaliButtonSetAutoRepeatingP(void) { ToolkitTestApplication application; - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE ); - - try - { - button.SetSelectedImage( image1 ); - Property::Value value = button.GetProperty( Button::Property::SELECTED_STATE_IMAGE ); - DALI_TEST_CHECK( value.Get() == TEST_IMAGE_ONE ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - std::string imageUrl; + Button button = PushButton::New(); - Dali::Actor actor = button.GetSelectedImage(); + button.SetAutoRepeating( true ); - Toolkit::ImageView imageView = Toolkit::ImageView::DownCast( actor ); + DALI_TEST_CHECK( button.IsAutoRepeating() ); - tet_infoline(" UtcDaliButtonSetSelectedImageWithImageP Ensure an ImageView is returned\n"); + button.SetAutoRepeating( false ); - END_TEST; -} + DALI_TEST_CHECK( !button.IsAutoRepeating() ); -int UtcDaliButtonSetSelectedImageWithImageN(void) -{ - ToolkitTestApplication application; + button.SetAutoRepeating( true ); - PushButton button; + DALI_TEST_CHECK( button.IsAutoRepeating() ); - try - { - button.SetSelectedImage( CreateBufferImage( 10, 10, Color::WHITE ) ); - DALI_TEST_CHECK( false ); - } - catch(...) - { - DALI_TEST_CHECK( true ); - } + button.SetAutoRepeating( false ); + DALI_TEST_CHECK( !button.IsAutoRepeating() ); END_TEST; } -int UtcDaliButtonSetSelectedColorP(void) +int UtcDaliButtonSetInitialAutoRepeatingDelayP(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSetSelectedColorP"); - PushButton pushButton = PushButton::New(); - Stage::GetCurrent().Add( pushButton ); - - application.SendNotification(); - application.Render(); - - const Vector4 SET_COLOR = Color::BLUE; - - pushButton.SetSize( Vector2( 20.0f, 20.0f ) ); - pushButton.SetProperty( Button::Property::SELECTED_COLOR, SET_COLOR ); + Button button = PushButton::New(); - application.SendNotification(); - application.Render(); + button.SetInitialAutoRepeatingDelay( 0.5f ); - Vector4 color = pushButton.GetProperty( Button::Property::SELECTED_COLOR ); + DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.5f, TEST_LOCATION ); - DALI_TEST_EQUALS( color, SET_COLOR, TEST_LOCATION ); + button.SetInitialAutoRepeatingDelay( 0.2f ); + DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.2f, TEST_LOCATION ); END_TEST; } -int UtcDaliButtonSetUnSelectedColorP(void) +int UtcDaliButtonSetNextAutoRepeatingDelayP(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSetUnSelectedColorP"); - - PushButton pushButton = PushButton::New(); - Stage::GetCurrent().Add( pushButton ); - - application.SendNotification(); - application.Render(); - const Vector4 SET_COLOR = Color::BLUE; - - pushButton.SetSize( Vector2( 20.0f, 20.0f ) ); - pushButton.SetProperty( Button::Property::UNSELECTED_COLOR, SET_COLOR ); + Button button = PushButton::New(); - application.SendNotification(); - application.Render(); + button.SetNextAutoRepeatingDelay( 0.5f ); - Vector4 color = pushButton.GetProperty( Button::Property::UNSELECTED_COLOR ); + DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.5f, TEST_LOCATION ); - DALI_TEST_EQUALS( color, SET_COLOR, TEST_LOCATION ); + button.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, 0.2f ); + DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.2f, TEST_LOCATION ); END_TEST; } -int UtcDaliButtonResetSelectedColorP(void) +int UtcDaliButtonSetTogglableButtonP(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSetSelectedColorP"); - - PushButton pushButton = PushButton::New(); - Stage::GetCurrent().Add( pushButton ); - - application.SendNotification(); - application.Render(); - - const Vector4 FIRST_COLOR = Color::BLUE; - const Vector4 SECOND_COLOR = Color::BLUE; - - pushButton.SetSize( Vector2( 20.0f, 20.0f ) ); - pushButton.SetProperty( Button::Property::SELECTED_COLOR, FIRST_COLOR ); - application.SendNotification(); - application.Render(); - - Vector4 color = pushButton.GetProperty( Button::Property::SELECTED_COLOR ); - - DALI_TEST_EQUALS( color, FIRST_COLOR, TEST_LOCATION ); - - pushButton.SetProperty( Button::Property::SELECTED_COLOR, SECOND_COLOR ); + Button button = PushButton::New(); - application.SendNotification(); - application.Render(); + button.SetTogglableButton( true ); - color = pushButton.GetProperty( Button::Property::SELECTED_COLOR ); + DALI_TEST_CHECK( button.IsTogglableButton() ); - DALI_TEST_EQUALS( color, SECOND_COLOR, TEST_LOCATION ); + button.SetTogglableButton( false ); + DALI_TEST_CHECK( !button.IsTogglableButton() ); END_TEST; } -int UtcDaliButtonSetImagesWithDeprecatedProperties(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSetImagesWithDeprecatedProperties"); - - PushButton pushButton = PushButton::New(); - - Stage::GetCurrent().Add( pushButton ); - - Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - - DALI_TEST_EQUALS( pushButton.GetRendererCount(), 0, TEST_LOCATION ); - - pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_STATE_IMAGE, propertyMap ); - application.SendNotification(); - application.Render(); - DALI_TEST_EQUALS( pushButton.GetRendererCount(), 1, TEST_LOCATION ); - - tet_infoline(" Set state to selected and provide SELECTED visual"); - pushButton.SetProperty( Toolkit::Button::Property::SELECTED_STATE_IMAGE, propertyMap ); - pushButton.SetProperty( Toolkit::Button::Property::SELECTED, true ); - application.SendNotification(); - application.Render(); - DALI_TEST_EQUALS( pushButton.GetRendererCount(), 1, TEST_LOCATION ); - - tet_infoline(" Set state to selected, disabled and provide DISABLED_STATE_IMAGE visual"); - pushButton.SetProperty( Toolkit::Button::Property::SELECTED, false ); - pushButton.SetProperty( Toolkit::Button::Property::DISABLED, true ); - pushButton.SetProperty( Toolkit::Button::Property::DISABLED_STATE_IMAGE, propertyMap ); - application.SendNotification(); - application.Render(); - DALI_TEST_EQUALS( pushButton.GetRendererCount(), 1, TEST_LOCATION ); - -END_TEST; -} - -int UtcDaliButtonSetGetDepreciatedPropertiesWithURL(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSetGetDepreciatedPropertiesWithURL"); - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - tet_infoline(" Set state to selected, disabled and provide DISABLED_STATE_IMAGE visual"); - button.SetProperty( Toolkit::Button::Property::DISABLED, true ); - button.SetProperty( Toolkit::Button::Property::DISABLED_STATE_IMAGE, TEST_IMAGE_ONE ); - - Property::Value value = button.GetProperty(Button::Property::DISABLED_STATE_IMAGE ); - DALI_TEST_EQUALS( value.Get(), TEST_IMAGE_ONE, TEST_LOCATION ); - -END_TEST; -} - -int UtcDaliButtonSetLabelTextDeprecatedPropertyP(void) +int UtcDaliButtonSetSelectedP(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliButtonSetLabelTextDeprecatedPropertyP"); - - const std::string TEST_LABEL1 = "test label one"; - const std::string TEST_LABEL2 = "test label two"; Button button = PushButton::New(); + button.SetTogglableButton( true ); - button.SetProperty( Toolkit::Button::Property::LABEL, - Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) - .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) - ); - - button.SetProperty( Button::Property::LABEL_TEXT, TEST_LABEL1 ); - - std::string labelText = button.GetProperty( Button::Property::LABEL_TEXT ); - - DALI_TEST_EQUALS( labelText, TEST_LABEL1, TEST_LOCATION ); - - Property::Map propertyMap; - propertyMap.Insert( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ); - propertyMap.Insert( Toolkit::TextVisual::Property::TEXT, TEST_LABEL2 ); - propertyMap.Insert( Toolkit::TextVisual::Property::TEXT_COLOR, Color::BLUE ); - propertyMap.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ); - button.SetProperty( Button::Property::LABEL, propertyMap ); + button.SetSelected( true ); - labelText = button.GetProperty( Button::Property::LABEL_TEXT ); + DALI_TEST_CHECK( button.IsSelected() ); - DALI_TEST_EQUALS( labelText, TEST_LABEL2, TEST_LOCATION ); + button.SetSelected( false ); + DALI_TEST_CHECK( !button.IsSelected() ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp index 1606d71..443dd30 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp @@ -34,13 +34,29 @@ namespace static bool gCheckBoxButtonState = false; bool CheckBoxButtonClicked( Button button ) { - gCheckBoxButtonState = button.IsSelected(); + gCheckBoxButtonState = button.GetProperty(button.GetPropertyIndex("selected")) ; return true; } static const char* TEST_IMAGE_ONE = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; const Vector2 TEST_IMAGE_SIZE = Vector2( 66.0f, 66.0f ); +static std::string GetButtonText( Button button ) +{ + Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL ); + + Property::Map *labelProperty = value.GetMap(); + + std::string textLabel; + + if ( labelProperty ) + { + Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT ); + value->Get( textLabel ); + } + + return textLabel; +} } // namespace @@ -129,7 +145,7 @@ int UtcDaliCheckBoxButtonDownCastN(void) END_TEST; } -int UtcDaliCheckBoxButtonSetGetSelected(void) +int UtcDaliCheckBoxButtonSelectedPropertyP(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliCheckBoxButtonSetGetSelected"); @@ -140,19 +156,19 @@ int UtcDaliCheckBoxButtonSetGetSelected(void) // global var used to check if CheckBoxButtonClicked is called; gCheckBoxButtonState = false; - checkBoxButton.SetSelected( true ); + checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), true ); - DALI_TEST_CHECK( checkBoxButton.IsSelected() ); + DALI_TEST_EQUALS( checkBoxButton.GetProperty(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION ); DALI_TEST_CHECK( gCheckBoxButtonState ); - checkBoxButton.SetSelected( false ); + checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), false ); - DALI_TEST_CHECK( !checkBoxButton.IsSelected() ); + DALI_TEST_EQUALS( checkBoxButton.GetProperty(checkBoxButton.GetPropertyIndex("selected")), false, TEST_LOCATION ); DALI_TEST_CHECK( !gCheckBoxButtonState ); - checkBoxButton.SetSelected( true ); + checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("selected"), true ); - DALI_TEST_CHECK( checkBoxButton.IsSelected() ); + DALI_TEST_EQUALS( checkBoxButton.GetProperty(checkBoxButton.GetPropertyIndex("selected")), true, TEST_LOCATION ); DALI_TEST_CHECK( gCheckBoxButtonState ); END_TEST; } @@ -171,11 +187,11 @@ int UtcDaliCheckBoxSetLabelP(void) checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap ); - DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GerProperty once that code is implemented + DALI_TEST_EQUALS( GetButtonText( checkBox ) , "activate", TEST_LOCATION ); END_TEST; } -int UtcDaliCheckBoxSetLabelDisabledP(void) +int UtcDaliCheckBoxSetDisabledPropertyP(void) { TestApplication application; @@ -183,7 +199,7 @@ int UtcDaliCheckBoxSetLabelDisabledP(void) Stage::GetCurrent().Add( checkBox ); checkBox.SetSize( Vector2( 20.0f, 20.0f ) ); - checkBox.SetDisabledBackgroundImage( "Image.jpg" ); + checkBox.SetProperty(checkBox.GetPropertyIndex("disabledUnselectedBackgroundVisual"), "Image.jpg" ); application.SendNotification(); application.Render(); @@ -197,8 +213,8 @@ int UtcDaliCheckBoxSetLabelDisabledP(void) checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true); checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap ); - DALI_TEST_CHECK( checkBox.GetProperty(checkBox.GetPropertyIndex("disabled")) ); - DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); // Change to use GetProperty once that code is implemented + DALI_TEST_EQUALS( checkBox.GetProperty(checkBox.GetPropertyIndex("disabled")), true, TEST_LOCATION ); + DALI_TEST_EQUALS( GetButtonText( checkBox ) , "activate", TEST_LOCATION ); END_TEST; } @@ -315,3 +331,61 @@ int UtcDaliCheckBoxSetForegroundPadding(void) END_TEST; } + +// Deprecated API Tests + +int UtcDaliCheckBoxButtonSetGetSelected(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliCheckBoxButtonSetGetSelected"); + + CheckBoxButton checkBoxButton = CheckBoxButton::New(); + checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked ); + + // global var used to check if CheckBoxButtonClicked is called; + gCheckBoxButtonState = false; + + checkBoxButton.SetSelected( true ); + + DALI_TEST_CHECK( checkBoxButton.IsSelected() ); + DALI_TEST_CHECK( gCheckBoxButtonState ); + + checkBoxButton.SetSelected( false ); + + DALI_TEST_CHECK( !checkBoxButton.IsSelected() ); + DALI_TEST_CHECK( !gCheckBoxButtonState ); + + checkBoxButton.SetSelected( true ); + + DALI_TEST_CHECK( checkBoxButton.IsSelected() ); + DALI_TEST_CHECK( gCheckBoxButtonState ); + END_TEST; +} + +int UtcDaliCheckBoxSetLabelDisabledP(void) +{ + TestApplication application; + + CheckBoxButton checkBox = CheckBoxButton::New(); + Stage::GetCurrent().Add( checkBox ); + + checkBox.SetSize( Vector2( 20.0f, 20.0f ) ); + checkBox.SetDisabledBackgroundImage( "Image.jpg" ); + + application.SendNotification(); + application.Render(); + + Property::Map propertyMap; + + propertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + .Add( Toolkit::TextVisual::Property::TEXT, "activate" ) + .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ); + + checkBox.SetProperty(checkBox.GetPropertyIndex("disabled"), true); + checkBox.SetProperty( checkBox.GetPropertyIndex("label"), propertyMap ); + + DALI_TEST_CHECK( checkBox.GetProperty(checkBox.GetPropertyIndex("disabled")) ); + DALI_TEST_EQUALS( checkBox.GetLabelText(), "activate", TEST_LOCATION ); + + END_TEST; +} \ No newline at end of file diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp index 7ff4e3a..421083f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp @@ -54,7 +54,7 @@ static const Size BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS = Size( 100, 100 ); static bool gPushButtonSelectedState = false; bool PushButtonSelected( Button button ) { - gPushButtonSelectedState = button.IsSelected(); + gPushButtonSelectedState = button.GetProperty(button.GetPropertyIndex("selected") ); return true; } @@ -146,6 +146,23 @@ void SetupButtonForTestTouchEvents( ToolkitTestApplication& application, Button& } } +static std::string GetButtonText( Button button ) +{ + Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL ); + + Property::Map *labelProperty = value.GetMap(); + + std::string textLabel; + + if ( labelProperty ) + { + Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT ); + value->Get( textLabel ); + } + + return textLabel; +} + } //namespace int UtcDaliPushButtonConstructorP(void) @@ -223,25 +240,23 @@ int UtcDaliPushButtonDownCastN(void) END_TEST; } -int UtcDaliPushButtonSetGetAutoRepeating(void) +int UtcDaliPushButtonAutoRepeatingProperty(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliPushButtonSetGetAutoRepeating"); PushButton pushButton = PushButton::New(); - pushButton.SetAutoRepeating( true ); + pushButton.SetProperty( pushButton.GetPropertyIndex("autoRepeating"), true ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION ); - DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); + pushButton.SetProperty( pushButton.GetPropertyIndex("autoRepeating"), false ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION ); - pushButton.SetAutoRepeating( false ); + pushButton.SetProperty( pushButton.GetPropertyIndex("autoRepeating"), true ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION ); - DALI_TEST_CHECK( !pushButton.IsAutoRepeating() ); - - pushButton.SetAutoRepeating( true ); - - DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); - END_TEST; + END_TEST; } int UtcDaliPushButtonSetAutoRepeating(void) @@ -267,122 +282,120 @@ int UtcDaliPushButtonSetAutoRepeating(void) END_TEST; } -int UtcDaliPushButtonSetGetTogglableButton(void) +int UtcDaliPushButtonTogglableProperty(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliPushButtonSetGetTogglableButton"); PushButton pushButton = PushButton::New(); - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION ); - DALI_TEST_CHECK( pushButton.IsTogglableButton() ); + pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), false ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("togglable")), false, TEST_LOCATION ); - pushButton.SetTogglableButton( false ); - - DALI_TEST_CHECK( !pushButton.IsTogglableButton() ); - - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION ); - DALI_TEST_CHECK( pushButton.IsTogglableButton() ); END_TEST; } -int UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton(void) +int UtcDaliPushButtonAutoRepeatingPropertyAndTogglableButton(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton"); PushButton pushButton = PushButton::New(); - pushButton.SetAutoRepeating( true ); - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, true ); + pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true ); - DALI_TEST_CHECK( pushButton.IsTogglableButton() ); - DALI_TEST_CHECK( !pushButton.IsAutoRepeating() ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("togglable")), true, TEST_LOCATION ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION ); - pushButton.SetTogglableButton( true ); - pushButton.SetAutoRepeating( true ); + pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true ); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, true ); - DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); - DALI_TEST_CHECK( !pushButton.IsTogglableButton() ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION ); + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("togglable")), false, TEST_LOCATION ); END_TEST; } -int UtcDaliPushButtonSetGetSelected01(void) +int UtcDaliPushButtonSelectedProperty01(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliPushButtonSetGetSelected01"); PushButton pushButton = PushButton::New(); - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), true ); + pushButton.StateChangedSignal().Connect( &PushButtonSelected ); gPushButtonSelectedState = false; - pushButton.SetSelected( true ); + pushButton.SetProperty( Button::Property::SELECTED, true ); - DALI_TEST_CHECK( pushButton.IsSelected() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::SELECTED ), true , TEST_LOCATION ); DALI_TEST_CHECK( gPushButtonSelectedState ); - pushButton.SetSelected( false ); + pushButton.SetProperty( Button::Property::SELECTED, false ); - DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::SELECTED ), false , TEST_LOCATION ); DALI_TEST_CHECK( !gPushButtonSelectedState ); - pushButton.SetSelected( true ); + pushButton.SetProperty( Button::Property::SELECTED, true ); - DALI_TEST_CHECK( pushButton.IsSelected() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::SELECTED ), true , TEST_LOCATION ); DALI_TEST_CHECK( gPushButtonSelectedState ); END_TEST; } -int UtcDaliPushButtonSetGetSelected02(void) +int UtcDaliPushButtonSelectedProperty02(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliPushButtonSetGetSelected02"); PushButton pushButton = PushButton::New(); - pushButton.SetTogglableButton( false ); + pushButton.SetProperty( pushButton.GetPropertyIndex("togglable"), false ); pushButton.StateChangedSignal().Connect( &PushButtonSelected ); gPushButtonSelectedState = false; - pushButton.SetSelected( true ); + pushButton.SetProperty( Button::Property::SELECTED, true ); - DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::SELECTED ), false , TEST_LOCATION ); DALI_TEST_CHECK( !gPushButtonSelectedState ); - pushButton.SetSelected( false ); + pushButton.SetProperty( Button::Property::SELECTED, false ); - DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::SELECTED ), false , TEST_LOCATION ); DALI_TEST_CHECK( !gPushButtonSelectedState ); - pushButton.SetSelected( true ); + pushButton.SetProperty( Button::Property::SELECTED, true ); - DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::SELECTED ), false , TEST_LOCATION ); DALI_TEST_CHECK( !gPushButtonSelectedState ); END_TEST; } -int UtcDaliPushButtonSetGetAutorepeatingDelayValues01(void) +int UtcDaliPushButtonAutorepeatingDelayPropertyValues01(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliPushButtonSetGetAutorepeatingDelayValues01"); PushButton pushButton = PushButton::New(); - pushButton.SetAutoRepeating( true ); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, true ); - pushButton.SetInitialAutoRepeatingDelay( 1.f ); - DALI_TEST_EQUALS( pushButton.GetInitialAutoRepeatingDelay(), 1.f, TEST_LOCATION ); + pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, 1.f ); + + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("initialAutoRepeatingDelay") ), 1.f, TEST_LOCATION ); - pushButton.SetNextAutoRepeatingDelay( 1.f ); - DALI_TEST_EQUALS( pushButton.GetNextAutoRepeatingDelay(), 1.f, TEST_LOCATION ); END_TEST; } -int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void) +int UtcDaliPushButtonAutorepeatingDelayPropertyValues02(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliPushButtonSetGetAutorepeatingDelayValues02"); @@ -392,11 +405,11 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void) bool assert1( false ); bool assert2( false ); - pushButton.SetAutoRepeating( true ); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, true ); try { - pushButton.SetInitialAutoRepeatingDelay( -1.f ); + pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, -1.f ); } catch( Dali::DaliException& e ) { @@ -407,7 +420,7 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void) try { - pushButton.SetNextAutoRepeatingDelay( -1.f ); + pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, -1.f ); } catch( Dali::DaliException& e ) { @@ -420,7 +433,7 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void) END_TEST; } -int UtcDaliPushButtonSetLabelText(void) +int UtcDaliPushButtonLabelProperty(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliPushButtonSetLabelText"); @@ -429,17 +442,18 @@ int UtcDaliPushButtonSetLabelText(void) PushButton pushButton = PushButton::New(); - pushButton.SetProperty( Toolkit::Button::Property::LABEL, - Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) - .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) - ); - application.SendNotification(); application.Render(); - pushButton.SetLabelText( STR ); + pushButton.SetProperty( Toolkit::Button::Property::LABEL, + Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) + ); - DALI_TEST_EQUALS( pushButton.GetLabelText(), STR, TEST_LOCATION ); + + pushButton.SetProperty( Toolkit::Button::Property::LABEL, STR ); + + DALI_TEST_EQUALS( GetButtonText( pushButton ), STR, TEST_LOCATION ); END_TEST; } @@ -595,7 +609,7 @@ int UtcDaliPushButtonSelected(void) DALI_TEST_CHECK( !gPushButtonSelectedState ); // Set togglable property. - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( Button::Property::TOGGLABLE, true ); // Test2. Touch point down and up inside the button twice. gPushButtonSelectedState = false; @@ -652,7 +666,8 @@ int UtcDaliPushButtonSelected(void) // Test5. Touch point down outside and up inside the button. // Start in unselected state pushButton.SetProperty( Button::Property::SELECTED, false ); - DALI_TEST_CHECK( !pushButton.IsSelected()); + + DALI_TEST_EQUALS( pushButton.GetProperty(pushButton.GetPropertyIndex("selected") ),false , TEST_LOCATION ); gPushButtonSelectedState = false; event = Dali::Integration::TouchEvent(); @@ -749,7 +764,7 @@ int UtcDaliPushButtonPaddingLayout(void) DALI_TEST_EQUALS( size, Vector2::ZERO, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); // Check label only padding - pushButton.SetLabelText( "Label" ); + pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Label" ); application.SendNotification(); application.Render(); @@ -813,7 +828,8 @@ int UtcDaliPushButtonPaddingLayout(void) DALI_TEST_EQUALS( size, expectedIconAndPaddingSize, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); // Now test padding for both label and icon simultaneously. - pushButton.SetLabelText( "Label" ); + pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Label" ); + application.SendNotification(); application.Render(); @@ -881,7 +897,7 @@ int UtcDaliPushButtonAlignmentLayout(void) Stage::GetCurrent().Add( pushButton ); // Add a label and get size of control - pushButton.SetLabelText( "Label" ); + pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Label" ); application.SendNotification(); application.Render(); @@ -1303,3 +1319,203 @@ int UtcDaliPushButtonToggleSignalP(void) END_TEST; } + +// Deprecated API Tests + +int UtcDaliPushButtonSetGetAutoRepeating(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliPushButtonSetGetAutoRepeating"); + + PushButton pushButton = PushButton::New(); + + pushButton.SetAutoRepeating( true ); + + DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); + + pushButton.SetAutoRepeating( false ); + + DALI_TEST_CHECK( !pushButton.IsAutoRepeating() ); + + pushButton.SetAutoRepeating( true ); + + DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); + END_TEST; +} + +int UtcDaliPushButtonSetGetTogglableButton(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliPushButtonSetGetTogglableButton"); + + PushButton pushButton = PushButton::New(); + + pushButton.SetTogglableButton( true ); + + DALI_TEST_CHECK( pushButton.IsTogglableButton() ); + + pushButton.SetTogglableButton( false ); + + DALI_TEST_CHECK( !pushButton.IsTogglableButton() ); + + pushButton.SetTogglableButton( true ); + + DALI_TEST_CHECK( pushButton.IsTogglableButton() ); + END_TEST; +} + +int UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton"); + + PushButton pushButton = PushButton::New(); + + pushButton.SetAutoRepeating( true ); + pushButton.SetTogglableButton( true ); + + DALI_TEST_CHECK( pushButton.IsTogglableButton() ); + DALI_TEST_CHECK( !pushButton.IsAutoRepeating() ); + + pushButton.SetTogglableButton( true ); + pushButton.SetAutoRepeating( true ); + + DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); + DALI_TEST_CHECK( !pushButton.IsTogglableButton() ); + END_TEST; +} + +int UtcDaliPushButtonSetGetSelected01(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliPushButtonSetGetSelected01"); + + PushButton pushButton = PushButton::New(); + + pushButton.SetTogglableButton( true ); + pushButton.StateChangedSignal().Connect( &PushButtonSelected ); + + gPushButtonSelectedState = false; + pushButton.SetSelected( true ); + + DALI_TEST_CHECK( pushButton.IsSelected() ); + DALI_TEST_CHECK( gPushButtonSelectedState ); + + pushButton.SetSelected( false ); + + DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); + + pushButton.SetSelected( true ); + + DALI_TEST_CHECK( pushButton.IsSelected() ); + DALI_TEST_CHECK( gPushButtonSelectedState ); + END_TEST; +} + +int UtcDaliPushButtonSetGetSelected02(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliPushButtonSetGetSelected02"); + + PushButton pushButton = PushButton::New(); + + pushButton.SetTogglableButton( false ); + pushButton.StateChangedSignal().Connect( &PushButtonSelected ); + + gPushButtonSelectedState = false; + pushButton.SetSelected( true ); + + DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); + + pushButton.SetSelected( false ); + + DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); + + pushButton.SetSelected( true ); + + DALI_TEST_CHECK( !pushButton.IsSelected() ); + DALI_TEST_CHECK( !gPushButtonSelectedState ); + END_TEST; +} + +int UtcDaliPushButtonSetGetAutorepeatingDelayValues01(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliPushButtonSetGetAutorepeatingDelayValues01"); + + PushButton pushButton = PushButton::New(); + + pushButton.SetAutoRepeating( true ); + + pushButton.SetInitialAutoRepeatingDelay( 1.f ); + DALI_TEST_EQUALS( pushButton.GetInitialAutoRepeatingDelay(), 1.f, TEST_LOCATION ); + + pushButton.SetNextAutoRepeatingDelay( 1.f ); + DALI_TEST_EQUALS( pushButton.GetNextAutoRepeatingDelay(), 1.f, TEST_LOCATION ); + END_TEST; +} + +int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliPushButtonSetGetAutorepeatingDelayValues02"); + + PushButton pushButton = PushButton::New(); + + bool assert1( false ); + bool assert2( false ); + + pushButton.SetAutoRepeating( true ); + + try + { + pushButton.SetInitialAutoRepeatingDelay( -1.f ); + } + catch( Dali::DaliException& e ) + { + DALI_TEST_PRINT_ASSERT( e ); + DALI_TEST_EQUALS(e.condition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION); + assert1 = true; + } + + try + { + pushButton.SetNextAutoRepeatingDelay( -1.f ); + } + catch( Dali::DaliException& e ) + { + DALI_TEST_PRINT_ASSERT( e ); + DALI_TEST_EQUALS(e.condition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION); + assert2 = true; + } + + DALI_TEST_CHECK( assert1 && assert2 ); + END_TEST; +} + +int UtcDaliPushButtonSetLabelText(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliPushButtonSetLabelText"); + + const std::string STR( "Hola!" ); + + PushButton pushButton = PushButton::New(); + + pushButton.SetProperty( Toolkit::Button::Property::LABEL, + Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) + ); + + application.SendNotification(); + application.Render(); + + pushButton.SetLabelText( STR ); + + DALI_TEST_EQUALS( pushButton.GetLabelText(), STR, TEST_LOCATION ); + + END_TEST; +} diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp index 24b4964..85cced6 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp @@ -47,6 +47,23 @@ static void TestCallback(BaseHandle handle) gObjectCreatedCallBackCalled = true; } +static std::string GetButtonText( Button button ) +{ + Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL ); + + Property::Map *labelProperty = value.GetMap(); + + std::string textLabel; + + if ( labelProperty ) + { + Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT ); + value->Get( textLabel ); + } + + return textLabel; +} + } int UtcDaliRadioButtonConstructorP(void) @@ -138,11 +155,11 @@ int UtcDaliRadioButtonDownCast(void) END_TEST; } -int UtcDaliRadioButtonLabelActor(void) +int UtcDaliRadioButtonLabelProperty(void) { ToolkitTestApplication application; - std::string labelText = "test actor 1"; + const std::string labelText = "test actor 1"; RadioButton radioButton = RadioButton::New(); @@ -151,37 +168,14 @@ int UtcDaliRadioButtonLabelActor(void) .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) ); - radioButton.SetLabelText( labelText ); + radioButton.SetProperty( Toolkit::Button::Property::LABEL, labelText ); + DALI_TEST_EQUALS( GetButtonText( radioButton ), labelText, TEST_LOCATION ); - DALI_TEST_EQUALS( radioButton.GetLabelText(), labelText, TEST_LOCATION ); std::string labelText2 = "test actor 2"; - radioButton.SetLabelText( labelText2 ); - DALI_TEST_EQUALS( radioButton.GetLabelText(), labelText2, TEST_LOCATION ); - - END_TEST; -} + radioButton.SetProperty( Toolkit::Button::Property::LABEL, labelText2 ); -int UtcDaliRadioButtonSelected(void) -{ - ToolkitTestApplication application; - - RadioButton radioButton = RadioButton::New(); - - // Default selected - DALI_TEST_CHECK( radioButton.IsSelected() == false ); - - // False - radioButton.SetSelected( false ); - DALI_TEST_CHECK( radioButton.IsSelected() == false ); - - // True - radioButton.SetSelected( true ); - DALI_TEST_CHECK( radioButton.IsSelected() == true ); - - // False - radioButton.SetSelected( false ); - DALI_TEST_CHECK( radioButton.IsSelected() == false ); + DALI_TEST_EQUALS( GetButtonText( radioButton ), labelText2, TEST_LOCATION ); END_TEST; } @@ -343,3 +337,55 @@ int UtcDaliRadioButtonSelectedProperty(void) END_TEST; } + + +// Deprecated API Tests + +int UtcDaliRadioButtonLabelActor(void) +{ + ToolkitTestApplication application; + + std::string labelText = "test actor 1"; + + RadioButton radioButton = RadioButton::New(); + + radioButton.SetProperty( Toolkit::Button::Property::LABEL, + Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) + ); + + radioButton.SetLabelText( labelText ); + + DALI_TEST_EQUALS( radioButton.GetLabelText(), labelText, TEST_LOCATION ); + + std::string labelText2 = "test actor 2"; + radioButton.SetLabelText( labelText2 ); + DALI_TEST_EQUALS( radioButton.GetLabelText(), labelText2, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliRadioButtonSelected(void) +{ + ToolkitTestApplication application; + + RadioButton radioButton = RadioButton::New(); + + // Default selected + DALI_TEST_CHECK( radioButton.IsSelected() == false ); + + // False + radioButton.SetSelected( false ); + DALI_TEST_CHECK( radioButton.IsSelected() == false ); + + // True + radioButton.SetSelected( true ); + DALI_TEST_CHECK( radioButton.IsSelected() == true ); + + // False + radioButton.SetSelected( false ); + DALI_TEST_CHECK( radioButton.IsSelected() == false ); + + END_TEST; +} + diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp index e54ad82..bbd151a 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp @@ -81,13 +81,7 @@ void RadioButton::OnInitialize() bool RadioButton::OnToggleReleased() { // Radio button overrides toggle release (button up) as doesn't allow un-selection to be performed on it directly. - bool stateChanged = false; - if( !IsSelected() ) - { - Button::SetSelected( true ); // Set button to selected as previously unselected - stateChanged = true; - } - return stateChanged; + return false; } void RadioButton::OnStateChange( State newState ) diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index 6d95ac2..6ea83c0 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -32,6 +32,7 @@ // INTERNAL INCLUDES #include +#include #include #include #include @@ -672,7 +673,6 @@ std::string TextSelectionPopup::GetPressedImage() const Toolkit::PushButton option = Toolkit::PushButton::New(); option.SetName( button.name ); - option.SetAnimationTime( 0.0f ); option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); switch( button.id ) @@ -736,11 +736,11 @@ std::string TextSelectionPopup::GetPressedImage() const } // 3. Set the normal option image (blank / Transparent). - option.SetUnselectedImage( "" ); + option.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, "" ); // 4. Set the pressed option image. // The image can be blank, the color can be used regardless. - option.SetSelectedImage( mPressedImage ); + option.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, mPressedImage ); option.SetProperty( Toolkit::Button::Property::SELECTED_COLOR, mPressedColor ); option.SetProperty( Toolkit::Control::Property::STYLE_NAME, TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME ); -- 2.7.4