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=4d0de670c89ee1f9f251e8d5bca76cd66bd32447;hp=de95e55586a903138ee8accc52b05ed802789109;hb=c01b6a044893962dbc4ec47aeca60bf3b5d09766;hpb=c01f2590ed7bb00d9b3600511d08dc420261ed46 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp index de95e55..4d0de67 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) 2017 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. @@ -135,7 +135,7 @@ void SetupButtonForTestTouchEvents( ToolkitTestApplication& application, Button& { button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - button.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); + 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 ); @@ -466,10 +466,10 @@ int UtcDaliPushButtonPressed(void) PushButton pushButton = PushButton::New(); pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, 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::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,10 +499,10 @@ int UtcDaliPushButtonReleased(void) PushButton pushButton = PushButton::New(); pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, 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::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,10 +582,10 @@ int UtcDaliPushButtonSelected(void) PushButton pushButton = PushButton::New(); pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, 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::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(); @@ -686,21 +686,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,10 +734,10 @@ int UtcDaliPushButtonPaddingLayout(void) pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 0.0f, 0.0f ); + 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,15 +783,15 @@ int UtcDaliPushButtonPaddingLayout(void) pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 0.0f, 0.0f ); + 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,10 +881,10 @@ int UtcDaliPushButtonAlignmentLayout(void) pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 0.0f, 0.0f ); + 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" ); @@ -931,9 +916,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(); @@ -960,7 +945,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(); @@ -1001,8 +986,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(); @@ -1037,7 +1022,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(); @@ -1057,9 +1042,9 @@ 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); @@ -1079,7 +1064,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 ); @@ -1095,9 +1080,9 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void) 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 ); @@ -1116,7 +1101,7 @@ int UtcDaliPushButtonSetSelectedVisualN(void) 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); @@ -1124,7 +1109,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,7 +1121,7 @@ int UtcDaliPushButtonSetSelectedVisualN(void) colorMap.Insert(BorderVisual::Property::SIZE, 5.f); pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, colorMap ); - Stage::GetCurrent().Add( pushButton ); + application.GetScene().Add( pushButton ); application.SendNotification(); application.Render(0); @@ -1157,7 +1142,7 @@ int UtcDaliPushButtonToggleSignalP(void) SetupButtonForTestTouchEvents( application, button, true ); - Stage::GetCurrent().Add( button ); + application.GetScene().Add( button ); application.SendNotification(); application.Render(); @@ -1384,4 +1369,4 @@ int UtcDaliPushButtonSetLabelText(void) DALI_TEST_EQUALS(GetButtonText( pushButton ), STR, TEST_LOCATION); END_TEST; -} \ No newline at end of file +}