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=7ff4e3a347bdf252ff4ebdc1bcffb616d95c314b;hp=235d8ab449d48d488ebd97a14889cd81594f78c6;hb=675f5551ef3c7ca20ec45c36b865a5092883af43;hpb=e5dbcae1f8ee31b14d675793ab86161eeeefb029 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp index 235d8ab..7ff4e3a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp @@ -26,6 +26,10 @@ #include #include +#include +#include +#include + using namespace Dali; using namespace Toolkit; @@ -43,6 +47,10 @@ namespace { static const char* TEST_IMAGE_ONE = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; +static const Vector2 INSIDE_TOUCH_POINT_POSITON = Vector2( 240, 400 ); +static const Vector3 BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS = Vector3( 200, 360, 0 ); +static const Size BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS = Size( 100, 100 ); + static bool gPushButtonSelectedState = false; bool PushButtonSelected( Button button ) { @@ -66,11 +74,19 @@ static bool PushButtonReleased( Button button ) return true; } +static bool gPushButtonClicked = false; + +static bool PushButtonClicked( Button button ) +{ + gPushButtonClicked = true; + return gPushButtonClicked; +} + Dali::Integration::Point GetPointDownInside() { Dali::Integration::Point point; point.SetState( PointState::DOWN ); - point.SetScreenPosition( Vector2( 240, 400 ) ); + point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON ); return point; } @@ -78,7 +94,7 @@ Dali::Integration::Point GetPointUpInside() { Dali::Integration::Point point; point.SetState( PointState::UP ); - point.SetScreenPosition( Vector2( 240, 400 ) ); + point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON ); return point; } @@ -86,7 +102,7 @@ Dali::Integration::Point GetPointLeave() { Dali::Integration::Point point; point.SetState( PointState::LEAVE ); - point.SetScreenPosition( Vector2( 240, 400 ) ); + point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON ); return point; } @@ -94,7 +110,7 @@ Dali::Integration::Point GetPointEnter() { Dali::Integration::Point point; point.SetState( PointState::MOTION ); - point.SetScreenPosition( Vector2( 240, 400 ) ); + point.SetScreenPosition( INSIDE_TOUCH_POINT_POSITON ); return point; } @@ -114,6 +130,22 @@ Dali::Integration::Point GetPointUpOutside() return point; } +// 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 ); + 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 ); + } +} + } //namespace int UtcDaliPushButtonConstructorP(void) @@ -397,6 +429,11 @@ 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(); @@ -415,8 +452,8 @@ int UtcDaliPushButtonPressed(void) PushButton pushButton = PushButton::New(); pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 240, 400 ); - pushButton.SetSize( 100, 100 ); + pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); Stage::GetCurrent().Add( pushButton ); @@ -448,8 +485,8 @@ int UtcDaliPushButtonReleased(void) PushButton pushButton = PushButton::New(); pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 240, 400 ); - pushButton.SetSize( 100, 100 ); + pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); Stage::GetCurrent().Add( pushButton ); @@ -531,8 +568,8 @@ int UtcDaliPushButtonSelected(void) PushButton pushButton = PushButton::New(); pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); - pushButton.SetPosition( 240, 400 ); - pushButton.SetSize( 100, 100 ); + pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); + pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); Stage::GetCurrent().Add( pushButton ); @@ -1002,7 +1039,7 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void) ToolkitTestApplication application; PushButton pushButton = PushButton::New(); - pushButton.SetSize(100.0f, 100.0f); + pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); Stage::GetCurrent().Add( pushButton ); @@ -1010,7 +1047,7 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void) propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE); - pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap ); + pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap ); tet_infoline(" UNSELECTED_VISUAL Added to button\n"); @@ -1036,7 +1073,7 @@ int UtcDaliPushButtonSetUnSelectedVisual01P(void) Property::Map propertyMap2; propertyMap2.Insert(Visual::Property::TYPE, Visual::COLOR); propertyMap2.Insert(ColorVisual::Property::MIX_COLOR, Color::RED); - pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, propertyMap2 ); + pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, propertyMap2 ); tet_printf("Added UNSELECTED_VISUAL and add button back to Stage\n"); @@ -1077,10 +1114,9 @@ int UtcDaliPushButtonSetSelectedVisualN(void) const int BROKEN_VISUAL_TYPE = 999999999; colorMap.Insert(Visual::Property::TYPE, BROKEN_VISUAL_TYPE); - //colorMap.Insert(Visual::Property::TYPE, Visual::COLOR); colorMap.Insert(BorderVisual::Property::COLOR, Color::BLUE); colorMap.Insert(BorderVisual::Property::SIZE, 5.f); - pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, colorMap ); + pushButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, colorMap ); Stage::GetCurrent().Add( pushButton ); application.SendNotification(); @@ -1233,3 +1269,37 @@ int UtcDaliPushButtonSetDisabledSelectedImageP(void) END_TEST; } + +int UtcDaliPushButtonToggleSignalP(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliButtonToggleSignalP Ensure Signals emitted"); + + PushButton button = PushButton::New(); + button.SetProperty( Button::Property::TOGGLABLE, true); + + SetupButtonForTestTouchEvents( application, button, true ); + + Stage::GetCurrent().Add( button ); + + application.SendNotification(); + application.Render(); + + // connect to its signal + button.ClickedSignal().Connect( &PushButtonClicked ); + gPushButtonClicked = false; + + tet_infoline(" Touch down and up within button"); + Dali::Integration::TouchEvent event; + event = Dali::Integration::TouchEvent(); + event.AddPoint( GetPointDownInside() ); + application.ProcessEvent( event ); + + event = Dali::Integration::TouchEvent(); + event.AddPoint( GetPointUpInside() ); + application.ProcessEvent( event ); + + DALI_TEST_EQUALS( gPushButtonClicked, true, TEST_LOCATION ); + + END_TEST; +}