X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-CustomActor.cpp;h=bce0c344b89c9524b0ca695f758679583a0dcdb7;hb=0e446efe2d2c2a430d3d413b9c473be53508a2b3;hp=ad9943ae1982e38ec7165f26fd353c8005e8e787;hpb=e42df3603845e1c4707175052c30f1e1b56729ff;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/automated-tests/src/dali/utc-Dali-CustomActor.cpp b/automated-tests/src/dali/utc-Dali-CustomActor.cpp index ad9943a..bce0c34 100644 --- a/automated-tests/src/dali/utc-Dali-CustomActor.cpp +++ b/automated-tests/src/dali/utc-Dali-CustomActor.cpp @@ -997,40 +997,6 @@ int UtcDaliCustomActorSizeComponentAnimation(void) DALI_TEST_EQUALS( "OnSizeAnimation", custom.GetMethodsCalled()[ 2 ], TEST_LOCATION ); END_TEST; - -} - -int UtcDaliCustomActorOnTouchEvent(void) -{ - TestApplication application; - tet_infoline("Testing Dali::CustomActor::OnTouchEvent()"); - - Test::TestCustomActor custom = Test::TestCustomActor::New(); - DALI_TEST_EQUALS( 0, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); - - // set size for custom actor - custom.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) ); - // add the custom actor to stage - application.GetScene().Add( custom ); - custom.ResetCallStack(); - - // Render and notify a couple of times - application.SendNotification(); - application.Render(); - application.SendNotification(); - application.Render(); - - // simulate a touch event - Dali::Integration::Point point; - point.SetState( PointState::DOWN ); - point.SetScreenPosition( Vector2( 1, 1 ) ); - Dali::Integration::TouchEvent event; - event.AddPoint( point ); - application.ProcessEvent( event ); - - DALI_TEST_EQUALS( 1, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION ); - DALI_TEST_EQUALS( "OnTouchEvent", custom.GetMethodsCalled()[ 0 ], TEST_LOCATION ); - END_TEST; } int UtcDaliCustomActorOnHoverEvent(void) @@ -1448,8 +1414,6 @@ struct UnregisteredCustomActor : public Dali::CustomActorImpl { } virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize) { } - virtual bool OnTouchEvent(const TouchEvent& event) DALI_DEPRECATED_API - { return false; } virtual bool OnHoverEvent(const HoverEvent& event) { return false; } virtual bool OnKeyEvent(const KeyEvent& event) @@ -1620,4 +1584,3 @@ int UtcDaliCustomActorPropertyRegistrationDefaultValue(void) END_TEST; } -