X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-PushButton.cpp;h=5913861b7723b1ae4ebb23652a71efee18e72e9e;hp=57b39a59a844f3a64ea2e8275ee652f548325576;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=c2c6ef4249c29f78bf92762137ec7b4eb7087ca6 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp index 57b39a5..5913861 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 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. @@ -27,8 +27,6 @@ #include #include -#include -#include #include @@ -135,16 +133,16 @@ Dali::Integration::Point GetPointUpOutside() // Set up the position of the button for the default test events void SetupButtonForTestTouchEvents( ToolkitTestApplication& application, Button& button, bool useDefaultImages ) { - button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - button.SetParentOrigin( ParentOrigin::TOP_LEFT ); - button.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); + button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + button.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); if ( useDefaultImages ) { const Vector2 TEST_IMAGE_SIZE = Vector2( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); TestPlatformAbstraction& platform = application.GetPlatform(); platform.SetClosestImageSize( TEST_IMAGE_SIZE ); - button.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE ); - button.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE ); + button.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE ); + button.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE ); } } @@ -169,7 +167,7 @@ static std::string GetButtonText( Button button ) int UtcDaliPushButtonConstructorP(void) { - TestApplication application; + ToolkitTestApplication application; PushButton button; @@ -179,7 +177,7 @@ int UtcDaliPushButtonConstructorP(void) int UtcDaliPushButtonCopyConstructorP(void) { - TestApplication application; + ToolkitTestApplication application; // Initialize an object, ref count == 1 PushButton button = PushButton::New(); @@ -189,9 +187,28 @@ int UtcDaliPushButtonCopyConstructorP(void) END_TEST; } +int UtcDaliPushButtonMoveConstructor(void) +{ + ToolkitTestApplication application; + + PushButton button = PushButton::New(); + DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( button.GetProperty( Button::Property::TOGGLABLE ), false , TEST_LOCATION ); + button.SetProperty( Button::Property::TOGGLABLE, true ); + DALI_TEST_EQUALS( button.GetProperty( Button::Property::TOGGLABLE ), true , TEST_LOCATION ); + + PushButton moved = std::move( button ); + DALI_TEST_CHECK( moved ); + DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( moved.GetProperty( Button::Property::TOGGLABLE ), true , TEST_LOCATION ); + DALI_TEST_CHECK( !button ); + + END_TEST; +} + int UtcDaliPushButtonAssignmentOperatorP(void) { - TestApplication application; + ToolkitTestApplication application; PushButton button = PushButton::New(); @@ -202,9 +219,29 @@ int UtcDaliPushButtonAssignmentOperatorP(void) END_TEST; } +int UtcDaliPushButtonMoveAssignment(void) +{ + ToolkitTestApplication application; + + PushButton button = PushButton::New(); + DALI_TEST_EQUALS( 1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( button.GetProperty( Button::Property::TOGGLABLE ), false , TEST_LOCATION ); + button.SetProperty( Button::Property::TOGGLABLE, true ); + DALI_TEST_EQUALS( button.GetProperty( Button::Property::TOGGLABLE ), true , TEST_LOCATION ); + + PushButton moved; + moved = std::move( button ); + DALI_TEST_CHECK( moved ); + DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION ); + DALI_TEST_EQUALS( moved.GetProperty( Button::Property::TOGGLABLE ), true , TEST_LOCATION ); + DALI_TEST_CHECK( !button ); + + END_TEST; +} + int UtcDaliPushButtonNewP(void) { - TestApplication application; + ToolkitTestApplication application; PushButton button = PushButton::New(); @@ -214,7 +251,7 @@ int UtcDaliPushButtonNewP(void) int UtcDaliPushButtonDownCastP(void) { - TestApplication application; + ToolkitTestApplication application; PushButton button = PushButton::New(); @@ -230,7 +267,7 @@ int UtcDaliPushButtonDownCastP(void) int UtcDaliPushButtonDownCastN(void) { - TestApplication application; + ToolkitTestApplication application; BaseHandle unInitializedObject; @@ -448,7 +485,7 @@ int UtcDaliPushButtonLabelProperty(void) application.Render(); pushButton.SetProperty( Toolkit::Button::Property::LABEL, - Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ) .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) ); @@ -466,12 +503,12 @@ int UtcDaliPushButtonPressed(void) tet_infoline(" UtcDaliPushButtonPressed"); PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); - pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); application.SendNotification(); application.Render(); @@ -499,12 +536,12 @@ int UtcDaliPushButtonReleased(void) tet_infoline(" UtcDaliPushButtonReleased"); PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); - pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); application.SendNotification(); application.Render(); @@ -582,12 +619,12 @@ int UtcDaliPushButtonSelected(void) tet_infoline(" UtcDaliPushButtonSelected"); PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); - pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::POSITION, BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetProperty( Actor::Property::SIZE, BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); application.SendNotification(); application.Render(); @@ -688,21 +725,6 @@ int UtcDaliPushButtonSelected(void) END_TEST; } -int UtcDaliPushButtonPropertySetIconAlignment(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliPushButtonPropertySetIconAlignment"); - - PushButton pushButton = PushButton::New(); - pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "TOP" ); - DALI_TEST_EQUALS( pushButton.GetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT ), "TOP", TEST_LOCATION ); - - pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "RIGHT" ); - DALI_TEST_EQUALS( pushButton.GetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT ), "RIGHT", TEST_LOCATION ); - - END_TEST; -} - int UtcDaliPushButtonPropertySetLabelPadding(void) { ToolkitTestApplication application; @@ -749,12 +771,12 @@ int UtcDaliPushButtonPaddingLayout(void) ImageDimensions testImageSize = Dali::GetClosestImageSize( TEST_IMAGE_ONE ); const Vector2 TEST_IMAGE_SIZE( testImageSize.GetWidth(), testImageSize.GetHeight() ); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 0.0f, 0.0f ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); application.SendNotification(); application.Render(); @@ -798,17 +820,17 @@ int UtcDaliPushButtonPaddingLayout(void) pushButton.Unparent(); pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 0.0f, 0.0f ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); - pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "RIGHT" ); - pushButton.SetProperty( Toolkit::PushButton::Property::UNSELECTED_ICON, TEST_IMAGE_ONE ); - pushButton.SetProperty( Toolkit::PushButton::Property::SELECTED_ICON, TEST_IMAGE_ONE ); + pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BEGIN" ); + pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE ); + pushButton.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE ); application.SendNotification(); application.Render(); @@ -896,12 +918,12 @@ int UtcDaliPushButtonAlignmentLayout(void) PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 0.0f, 0.0f ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); // Add a label and get size of control pushButton.SetProperty( Toolkit::Button::Property::LABEL, "Label" ); @@ -933,9 +955,9 @@ int UtcDaliPushButtonAlignmentLayout(void) ( TEST_IMAGE_SIZE.height + TEST_ICON_PADDING.w + TEST_ICON_PADDING.z ) ); // Add Icon and set its alignment - pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "RIGHT" ); - pushButton.SetProperty( Toolkit::PushButton::Property::UNSELECTED_ICON, TEST_IMAGE_ONE ); - pushButton.SetProperty( Toolkit::PushButton::Property::SELECTED_ICON, TEST_IMAGE_ONE ); + pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BEGIN" ); + pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, TEST_IMAGE_ONE ); + pushButton.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, TEST_IMAGE_ONE ); pushButton.SetProperty( Toolkit::PushButton::Property::ICON_PADDING, TEST_ICON_PADDING ); application.SendNotification(); @@ -962,7 +984,7 @@ int UtcDaliPushButtonAlignmentLayout(void) DALI_TEST_EQUALS( size.height, ( std::max( testImageWithPaddingSize.height, labelAndPaddingSize.height) ) , Math::MACHINE_EPSILON_1000, TEST_LOCATION ); // Now test left alignment matches right for size. - pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "LEFT" ); + pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END" ); application.SendNotification(); application.Render(); @@ -1003,8 +1025,8 @@ int UtcDaliPushButtonAlignmentLayout(void) * */ - tet_infoline("SetProperty on ICON_ALIGNMENT should relayout the Button"); - pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "TOP" ); + tet_infoline("SetProperty on LABEL_RELATIVE_ALIGNMENT should relayout the Button"); + pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BOTTOM" ); application.SendNotification(); application.Render(); @@ -1039,7 +1061,7 @@ int UtcDaliPushButtonAlignmentLayout(void) * +---------+ */ tet_infoline(" Test Icon BOTTOM alignment - Width grows to largest of Icon or label (plus padding)"); - pushButton.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "BOTTOM" ); + pushButton.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "TOP" ); application.SendNotification(); application.Render(); @@ -1059,15 +1081,15 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void) ToolkitTestApplication application; PushButton pushButton = PushButton::New(); - pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetProperty( Actor::Property::SIZE, Vector2( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ) ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); Property::Map propertyMap; propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap ); + pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap ); tet_infoline(" UNSELECTED_VISUAL Added to button\n"); @@ -1081,7 +1103,7 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void) tet_printf("Remove button from stage\n" ); - Stage::GetCurrent().Remove( pushButton ); + application.GetScene().Remove( pushButton ); rendererCount = pushButton.GetRendererCount(); tet_printf("After removing pushbutton from stage the renderer count is(%d)\n ", rendererCount ); @@ -1093,13 +1115,13 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void) Property::Map propertyMap2; propertyMap2.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap2.Insert(ColorVisual::Property::MIX_COLOR, Color::RED); - pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, propertyMap2 ); + pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, propertyMap2 ); tet_printf("Added UNSELECTED_VISUAL and add button back to Stage\n"); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); - tet_printf("With UNSELECTED_BACKGROUND_VISUAL and UNSELECTED_ICON the renderer count is(%d)\n", pushButton.GetRendererCount() ); + tet_printf("With UNSELECTED_BACKGROUND_VISUAL and UNSELECTED_VISUAL the renderer count is(%d)\n", pushButton.GetRendererCount() ); DALI_TEST_EQUALS( pushButton.GetRendererCount(), 2, TEST_LOCATION ); @@ -1114,11 +1136,11 @@ int UtcDaliPushButtonSetSelectedVisualN(void) PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); application.SendNotification(); application.Render(0); @@ -1126,7 +1148,7 @@ int UtcDaliPushButtonSetSelectedVisualN(void) tet_printf("RendererCount prior to adding visual(%d)\n",preRendererCount); DALI_TEST_EQUALS( preRendererCount, 0, TEST_LOCATION ); - Stage::GetCurrent().Remove( pushButton ); + application.GetScene().Remove( pushButton ); application.SendNotification(); application.Render(0); @@ -1136,9 +1158,9 @@ int UtcDaliPushButtonSetSelectedVisualN(void) colorMap.Insert(Visual::Property::TYPE, BROKEN_VISUAL_TYPE); colorMap.Insert(BorderVisual::Property::COLOR, Color::BLUE); colorMap.Insert(BorderVisual::Property::SIZE, 5.f); - pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, colorMap ); + pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, colorMap ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); application.SendNotification(); application.Render(0); @@ -1149,147 +1171,6 @@ int UtcDaliPushButtonSetSelectedVisualN(void) END_TEST; } -int UtcDaliPushButtonSetButtonImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetButtonImage( ImageView::New() ); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - -int UtcDaliPushButtonSetBackgroundImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetBackgroundImage( ImageView::New() ); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - -int UtcDaliPushButtonSetSelectedImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetSelectedImage( ImageView::New() ); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - -int UtcDaliPushButtonSetSelectedBackgroundImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetSelectedBackgroundImage( ImageView::New() ); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - -int UtcDaliPushButtonSetDisabledBackgroundImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetDisabledBackgroundImage( ImageView::New() ); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - - -int UtcDaliPushButtonSetDisabledImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetDisabledImage( ImageView::New() ); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - -int UtcDaliPushButtonSetDisabledSelectedImageP(void) -{ - ToolkitTestApplication application; - - PushButton button = PushButton::New(); - Stage::GetCurrent().Add( button ); - - try - { - button.SetDisabledSelectedImage( ImageView::New() ); - DALI_TEST_CHECK( true ); - } - catch(...) - { - DALI_TEST_CHECK( false ); - } - - END_TEST; -} - int UtcDaliPushButtonToggleSignalP(void) { ToolkitTestApplication application; @@ -1300,7 +1181,7 @@ int UtcDaliPushButtonToggleSignalP(void) SetupButtonForTestTouchEvents( application, button, true ); - Stage::GetCurrent().Add( button ); + application.GetScene().Add( button ); application.SendNotification(); application.Render(); @@ -1333,17 +1214,17 @@ int UtcDaliPushButtonSetGetAutoRepeating(void) PushButton pushButton = PushButton::New(); - pushButton.SetAutoRepeating( true ); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, true ); - DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION ); - pushButton.SetAutoRepeating( false ); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, false ); - DALI_TEST_CHECK( !pushButton.IsAutoRepeating() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::AUTO_REPEATING ), false, TEST_LOCATION ); - pushButton.SetAutoRepeating( true ); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, true ); - DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION ); END_TEST; } @@ -1354,17 +1235,17 @@ int UtcDaliPushButtonSetGetTogglableButton(void) PushButton pushButton = PushButton::New(); - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( Button::Property::TOGGLABLE, true ); - DALI_TEST_CHECK( pushButton.IsTogglableButton() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::TOGGLABLE ), true, TEST_LOCATION ); - pushButton.SetTogglableButton( false ); + pushButton.SetProperty( Button::Property::TOGGLABLE, false ); - DALI_TEST_CHECK( !pushButton.IsTogglableButton() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::TOGGLABLE ), false, TEST_LOCATION ); - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( Button::Property::TOGGLABLE, true ); - DALI_TEST_CHECK( pushButton.IsTogglableButton() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::TOGGLABLE ), true, TEST_LOCATION ); END_TEST; } @@ -1375,17 +1256,18 @@ int UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton(void) PushButton pushButton = PushButton::New(); - pushButton.SetAutoRepeating( true ); - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, true ); + pushButton.SetProperty( Button::Property::TOGGLABLE, true); - DALI_TEST_CHECK( pushButton.IsTogglableButton() ); - DALI_TEST_CHECK( !pushButton.IsAutoRepeating() ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::TOGGLABLE ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::AUTO_REPEATING ), false, TEST_LOCATION ); + + pushButton.SetProperty( Button::Property::TOGGLABLE, true); + pushButton.SetProperty( Button::Property::AUTO_REPEATING, true ); - pushButton.SetTogglableButton( true ); - pushButton.SetAutoRepeating( true ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::TOGGLABLE ), false, TEST_LOCATION ); - DALI_TEST_CHECK( pushButton.IsAutoRepeating() ); - DALI_TEST_CHECK( !pushButton.IsTogglableButton() ); END_TEST; } @@ -1396,23 +1278,23 @@ int UtcDaliPushButtonSetGetSelected01(void) PushButton pushButton = PushButton::New(); - pushButton.SetTogglableButton( true ); + pushButton.SetProperty( Button::Property::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; } @@ -1424,24 +1306,27 @@ int UtcDaliPushButtonSetGetSelected02(void) PushButton pushButton = PushButton::New(); - pushButton.SetTogglableButton( false ); + tet_infoline(" Set Toggle feature off"); + pushButton.SetProperty( Button::Property::TOGGLABLE, false); pushButton.StateChangedSignal().Connect( &PushButtonSelected ); gPushButtonSelectedState = false; - pushButton.SetSelected( true ); + tet_infoline(" Try to set to selected, expecting failure as not a toggle button"); + 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; } @@ -1452,13 +1337,14 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues01(void) 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( Button::Property::INITIAL_AUTO_REPEATING_DELAY ), 1.f, TEST_LOCATION ); - pushButton.SetNextAutoRepeatingDelay( 1.f ); - DALI_TEST_EQUALS( pushButton.GetNextAutoRepeatingDelay(), 1.f, TEST_LOCATION ); + pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, 1.f); + + DALI_TEST_EQUALS( pushButton.GetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY ), 1.f, TEST_LOCATION ); END_TEST; } @@ -1472,11 +1358,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 ) { @@ -1487,7 +1373,7 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void) try { - pushButton.SetNextAutoRepeatingDelay( -1.f ); + pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, -1.f ); } catch( Dali::DaliException& e ) { @@ -1510,309 +1396,16 @@ int UtcDaliPushButtonSetLabelText(void) PushButton pushButton = PushButton::New(); pushButton.SetProperty( Toolkit::Button::Property::LABEL, - Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::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; -} - -int UtcDaliPushButtonSetButtonImageDeprecatedP(void) -{ - ToolkitTestApplication application; - Image setButtonImage = ResourceImage::New( TEST_IMAGE_ONE); - PushButton pushButton = PushButton::New(); - pushButton.SetButtonImage( setButtonImage ); - Image retreivedButtonImage = ImageView::DownCast(pushButton.GetButtonImage()).GetImage(); - DALI_TEST_EQUALS( retreivedButtonImage, setButtonImage , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonSetSelectedImageDeprecatedP(void) -{ - ToolkitTestApplication application; - Image setButtonImage = ResourceImage::New( TEST_IMAGE_ONE); - PushButton pushButton = PushButton::New(); - pushButton.SetSelectedImage( setButtonImage ); - Image retreivedButtonImage = ImageView::DownCast(pushButton.GetSelectedImage()).GetImage(); - DALI_TEST_EQUALS( retreivedButtonImage, setButtonImage , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonGetButtonImageURLDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButtonGetButtonImageURLDeprecatedP Testing mix use of API"); - - ToolkitTestApplication application; - - PushButton pushButton = PushButton::New(); - pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE ); - - ImageView retreivedButtonImageView = ImageView::DownCast(pushButton.GetButtonImage()); - Image retreivedButtonImage = retreivedButtonImageView.GetImage(); - ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage ); - - DALI_TEST_EQUALS( resourceImage.GetUrl(), TEST_IMAGE_ONE , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonGetSelectedImageURLDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButtonGetSelectedImageURLDeprecatedP Testing mix use of API"); - - ToolkitTestApplication application; - - PushButton pushButton = PushButton::New(); - - pushButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, TEST_IMAGE_ONE ); - - Image retreivedButtonImage = ImageView::DownCast(pushButton.GetSelectedImage()).GetImage(); - ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage ); - DALI_TEST_EQUALS( resourceImage.GetUrl(), TEST_IMAGE_ONE , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonSetSelectedImageWithActorDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButton SetSelectedImage With ImageView (Actor)"); - - ToolkitTestApplication application; - - Image image = ResourceImage::New( TEST_IMAGE_ONE ); - - DALI_TEST_CHECK( image ); - - ImageView imgViewSet = ImageView::New(image); - - DALI_TEST_CHECK(imgViewSet ); - - PushButton pushButton = PushButton::New(); - - DALI_TEST_CHECK( pushButton ); - - pushButton.SetSelectedImage( imgViewSet ); - - ImageView imageView = ImageView::DownCast( pushButton.GetSelectedImage()); - - DALI_TEST_CHECK( imageView ); - - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - Property::Map map; - value.Get( map ); - DALI_TEST_CHECK( !map.Empty() ); - DALI_TEST_EQUALS( map[ "filename" ].Get(), TEST_IMAGE_ONE , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonSetButtonImageWithActorDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButton SetButtonImage With ImageView (Actor)"); - - ToolkitTestApplication application; - - Image image = ResourceImage::New( TEST_IMAGE_ONE ); - - DALI_TEST_CHECK( image ); - - ImageView imgViewSet = ImageView::New(image); - - DALI_TEST_CHECK(imgViewSet ); - - PushButton pushButton = PushButton::New(); - - DALI_TEST_CHECK( pushButton ); - - pushButton.SetButtonImage( imgViewSet ); - - ImageView imageView = ImageView::DownCast( pushButton.GetButtonImage()); - - DALI_TEST_CHECK( imageView ); - - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - Property::Map map; - value.Get( map ); - DALI_TEST_CHECK( !map.Empty() ); - DALI_TEST_EQUALS( map[ "filename" ].Get(), TEST_IMAGE_ONE , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonSetBackgroundImageWithActorDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButton SetBackgroundImage With ImageView (Actor)"); - - ToolkitTestApplication application; - - Image image = ResourceImage::New( TEST_IMAGE_ONE ); - - DALI_TEST_CHECK( image ); - - ImageView imgViewSet = ImageView::New(image); - - DALI_TEST_CHECK(imgViewSet ); - - PushButton pushButton = PushButton::New(); - - DALI_TEST_CHECK( pushButton ); - - pushButton.SetBackgroundImage( imgViewSet ); - - ImageView imageView = ImageView::DownCast( pushButton.GetButtonImage()); - - DALI_TEST_CHECK( imageView ); - - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - Property::Map map; - value.Get( map ); - DALI_TEST_CHECK( !map.Empty() ); - DALI_TEST_EQUALS( map[ "filename" ].Get(), TEST_IMAGE_ONE , TEST_LOCATION ); - - END_TEST; -} - - -int UtcDaliPushButtonSetSelectedBackgroundImageWithActorDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButton SetSelectedBackgroundImage With ImageView (Actor)"); - - ToolkitTestApplication application; - - Image image = ResourceImage::New( TEST_IMAGE_ONE ); - - DALI_TEST_CHECK( image ); - - ImageView imgViewSet = ImageView::New(image); - - DALI_TEST_CHECK(imgViewSet ); - - PushButton pushButton = PushButton::New(); - - DALI_TEST_CHECK( pushButton ); - - pushButton.SetSelectedBackgroundImage( imgViewSet ); - - ImageView imageView = ImageView::DownCast( pushButton.GetSelectedImage()); - - DALI_TEST_CHECK( imageView ); - - Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); - Property::Map map; - value.Get( map ); - DALI_TEST_CHECK( !map.Empty() ); - DALI_TEST_EQUALS( map[ "filename" ].Get(), TEST_IMAGE_ONE , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonSetDisabledBackgroundImageWithActorDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButton SetDisabledBackgroundImage With ImageView (Actor)"); - - ToolkitTestApplication application; - - Image image = ResourceImage::New( TEST_IMAGE_ONE ); - - DALI_TEST_CHECK( image ); - - ImageView imgViewSet = ImageView::New(image); - - DALI_TEST_CHECK(imgViewSet ); - - PushButton pushButton = PushButton::New(); - - DALI_TEST_CHECK( pushButton ); - - pushButton.SetDisabledBackgroundImage( imgViewSet ); - - Property::Value value = pushButton.GetProperty( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL ); - Property::Map map; - value.Get( map ); - - Property::Value* urlValue = map.Find( ImageVisual::Property::URL ); - - std::string urlString; - urlValue->Get( urlString ); - DALI_TEST_EQUALS( urlString , TEST_IMAGE_ONE , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonSetDisabledImageWithActorDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButton SetDisabledImage With ImageView (Actor)"); - - ToolkitTestApplication application; - - Image image = ResourceImage::New( TEST_IMAGE_ONE ); - - DALI_TEST_CHECK( image ); - - ImageView imgViewSet = ImageView::New(image); - - DALI_TEST_CHECK(imgViewSet ); - - PushButton pushButton = PushButton::New(); - - DALI_TEST_CHECK( pushButton ); - - pushButton.SetDisabledImage( imgViewSet ); - - Property::Value value = pushButton.GetProperty( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL ); - - Property::Map map; - value.Get( map ); - - Property::Value* urlValue = map.Find( ImageVisual::Property::URL ); - - std::string urlString; - urlValue->Get( urlString ); - DALI_TEST_EQUALS( urlString , TEST_IMAGE_ONE , TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliPushButtonSetDisabledSelectedImageWithActorDeprecatedP(void) -{ - tet_infoline(" UtcDaliPushButton SetDisabledSelectedImage With ImageView (Actor)"); - - ToolkitTestApplication application; - - Image image = ResourceImage::New( TEST_IMAGE_ONE ); - - DALI_TEST_CHECK( image ); - - ImageView imgViewSet = ImageView::New(image); - - DALI_TEST_CHECK(imgViewSet ); - - PushButton pushButton = PushButton::New(); - - DALI_TEST_CHECK( pushButton ); - - pushButton.SetDisabledSelectedImage( imgViewSet ); - - Property::Value value = pushButton.GetProperty( Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL ); - - Property::Map map; - value.Get( map ); - - Property::Value* urlValue = map.Find( ImageVisual::Property::URL ); + pushButton.SetProperty( Button::Property::LABEL, STR ); - std::string urlString; - urlValue->Get( urlString ); - DALI_TEST_EQUALS( urlString , TEST_IMAGE_ONE , TEST_LOCATION ); + DALI_TEST_EQUALS(GetButtonText( pushButton ), STR, TEST_LOCATION); END_TEST; }