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-DragAndDropDetector.cpp;h=9ef083d9a3130d7849a67019c5eeafa7d71804ac;hp=e1282ad747da8ab1d2bf840c346780af8f04ac35;hb=6a219d0bbcfd016e24b5466d5fb1a666c92feae5;hpb=4aaa3009e1e192b20eae5f0831996f1034cbb6f4 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp old mode 100755 new mode 100644 index e1282ad..9ef083d --- a/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -15,8 +15,8 @@ * */ -#include #include +#include // Need to override adaptor classes for toolkit test harness, so include // test harness headers before dali headers. @@ -40,57 +40,57 @@ void utc_dali_toolkit_drag_drop_detector_cleanup(void) namespace { - const int RENDER_FRAME_INTERVAL = 16; - struct SignalData - { - SignalData() - :functorCalled(false), +const int RENDER_FRAME_INTERVAL = 16; +struct SignalData +{ + SignalData() + : functorCalled(false), control(), detector() - { - } + { + } - void Reset() - { - functorCalled = false; - control.Reset(); - } + void Reset() + { + functorCalled = false; + control.Reset(); + } - bool functorCalled; - Control control; - Dali::Toolkit::DragAndDropDetector detector; - }; + bool functorCalled; + Control control; + Dali::Toolkit::DragAndDropDetector detector; +}; - struct DragSignalFunctor - { - DragSignalFunctor(SignalData& data, bool returnValue = true) - :signalData(data), +struct DragSignalFunctor +{ + DragSignalFunctor(SignalData& data, bool returnValue = true) + : signalData(data), returnValue(returnValue) - { - } - - bool operator()(Control control, Dali::Toolkit::DragAndDropDetector detector) - { - signalData.functorCalled = true; - signalData.control = control; - signalData.detector = detector; - return returnValue; - } - - SignalData& signalData; - bool returnValue; - }; - - Integration::TouchEvent GenerateSingleTouch(TouchPoint::State state, const Vector2& screenPosition) { - Integration::TouchEvent touchEvent; - Integration::Point point; - point.SetState(static_cast(state)); - point.SetScreenPosition(screenPosition); - touchEvent.points.push_back(point); - return touchEvent; } + + bool operator()(Control control, Dali::Toolkit::DragAndDropDetector detector) + { + signalData.functorCalled = true; + signalData.control = control; + signalData.detector = detector; + return returnValue; + } + + SignalData& signalData; + bool returnValue; +}; + +Integration::TouchEvent GenerateSingleTouch(PointState::Type state, const Vector2& screenPosition) +{ + Integration::TouchEvent touchEvent; + Integration::Point point; + point.SetState(static_cast(state)); + point.SetScreenPosition(screenPosition); + touchEvent.points.push_back(point); + return touchEvent; } +} // namespace int UtcDaliDragAndDropDetectorConstructorN(void) { @@ -117,7 +117,7 @@ int UtcDaliDragAndDropDetectorAttachN(void) ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control; + Control control; detector.Attach(control); DALI_TEST_EQUALS(0, detector.GetAttachedControlCount(), TEST_LOCATION); @@ -134,7 +134,7 @@ int UtcDaliDragAndDropDetectorAttachP(void) ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control = Control::New(); + Control control = Control::New(); detector.Attach(control); DALI_TEST_EQUALS(1, detector.GetAttachedControlCount(), TEST_LOCATION); @@ -143,12 +143,12 @@ int UtcDaliDragAndDropDetectorAttachP(void) } int UtcDaliDragAndDropDetectorDetachN(void) - { +{ ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1; - Control control2 = Control::New(); + Control control1; + Control control2 = Control::New(); detector.Attach(control1); detector.Attach(control2); @@ -161,7 +161,6 @@ int UtcDaliDragAndDropDetectorDetachN(void) DALI_TEST_EQUALS(0, detector.GetAttachedControlCount(), TEST_LOCATION); END_TEST; - } int UtcDaliDragAndDropDetectorDetachP(void) @@ -169,9 +168,9 @@ int UtcDaliDragAndDropDetectorDetachP(void) ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); - Control control3; + Control control1 = Control::New(); + Control control2 = Control::New(); + Control control3; detector.Attach(control1); detector.Attach(control2); @@ -205,8 +204,8 @@ int UtcDaliDragAndDropDetectorDetachAllP(void) ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); + Control control1 = Control::New(); + Control control2 = Control::New(); detector.Attach(control1); detector.Attach(control2); @@ -221,8 +220,8 @@ int UtcDaliDragAndDropDetectorGetAttachedControlCountP(void) ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); + Control control1 = Control::New(); + Control control2 = Control::New(); detector.Attach(control1); detector.Attach(control2); @@ -236,8 +235,8 @@ int UtcDaliDragAndDropDetectorGetAttachedControlN(void) ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); + Control control1 = Control::New(); + Control control2 = Control::New(); detector.Attach(control1); @@ -252,8 +251,8 @@ int UtcDaliDragAndDropDetectorGetAttachedControlP(void) ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); + Control control1 = Control::New(); + Control control2 = Control::New(); detector.Attach(control1); detector.Attach(control2); @@ -266,13 +265,13 @@ int UtcDaliDragAndDropDetectorGetAttachedControlP(void) int UtcDaliDragAndDropDetectorStartSignal(void) { - TestApplication application; + ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control = Control::New(); - control.SetSize(100.0f, 100.0f); - control.SetAnchorPoint(AnchorPoint::TOP_LEFT); - Stage::GetCurrent().Add(control); + Control control = Control::New(); + control.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + application.GetScene().Add(control); detector.Attach(control); application.SendNotification(); @@ -281,7 +280,7 @@ int UtcDaliDragAndDropDetectorStartSignal(void) DALI_TEST_CHECK(detector); DALI_TEST_CHECK(control); - SignalData data; + SignalData data; DragSignalFunctor functor(data); detector.StartedSignal().Connect(&application, functor); @@ -297,22 +296,22 @@ int UtcDaliDragAndDropDetectorStartSignal(void) int UtcDaliDragAndDropDetectorEnteredSignal(void) { - TestApplication application; + ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); - control1.SetSize(100.0f,100.0f); - control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); - control1.SetPosition(0.0f, 0.0f); - control2.SetPosition(0.0f, 100.0f); - - Stage::GetCurrent().Add(control1); - Stage::GetCurrent().Add(control2); + Control control1 = Control::New(); + Control control2 = Control::New(); + control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); + control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f)); + + application.GetScene().Add(control1); + application.GetScene().Add(control2); detector.Attach(control1); detector.Attach(control2); @@ -320,14 +319,14 @@ int UtcDaliDragAndDropDetectorEnteredSignal(void) application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - SignalData data; + SignalData data; DragSignalFunctor functor(data); detector.EnteredSignal().Connect(&application, functor); TestGenerateMiniPan(application); Vector2 screenCoordinates(10.0f, 110.0f); - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates)); DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); DALI_TEST_EQUALS(control2, data.control, TEST_LOCATION); @@ -335,27 +334,26 @@ int UtcDaliDragAndDropDetectorEnteredSignal(void) data.Reset(); END_TEST; - } int UtcDaliDragAndDropDetectorMovedSignal(void) { - TestApplication application; + ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); - control1.SetSize(100.0f,100.0f); - control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); - control1.SetPosition(0.0f, 0.0f); - control2.SetPosition(0.0f, 100.0f); - - Stage::GetCurrent().Add(control1); - Stage::GetCurrent().Add(control2); + Control control1 = Control::New(); + Control control2 = Control::New(); + control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); + control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f)); + + application.GetScene().Add(control1); + application.GetScene().Add(control2); detector.Attach(control1); detector.Attach(control2); @@ -363,18 +361,18 @@ int UtcDaliDragAndDropDetectorMovedSignal(void) application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - SignalData data; + SignalData data; DragSignalFunctor functor(data); detector.MovedSignal().Connect(&application, functor); TestGenerateMiniPan(application); Vector2 screenCoordinates(10.0f, 110.0f); - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates)); screenCoordinates.x = 10.0f; screenCoordinates.y = 120.0f; - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates)); DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); DALI_TEST_EQUALS(Vector2(10.0f, 120.0f), data.detector.GetCurrentScreenPosition(), TEST_LOCATION); @@ -387,25 +385,25 @@ int UtcDaliDragAndDropDetectorMovedSignal(void) int UtcDaliDragAndDropDetectorExitedSignal(void) { - TestApplication application; + ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); - control1.SetSize(100.0f,100.0f); - control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); - control1.SetPosition(0.0f, 0.0f); - control2.SetPosition(0.0f, 100.0f); - - control1.SetLeaveRequired(true); - control2.SetLeaveRequired(true); - - Stage::GetCurrent().Add(control1); - Stage::GetCurrent().Add(control2); + Control control1 = Control::New(); + Control control2 = Control::New(); + control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); + control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f)); + + control1.SetProperty(Actor::Property::LEAVE_REQUIRED, true); + control2.SetProperty(Actor::Property::LEAVE_REQUIRED, true); + + application.GetScene().Add(control1); + application.GetScene().Add(control2); detector.Attach(control1); detector.Attach(control2); @@ -413,18 +411,18 @@ int UtcDaliDragAndDropDetectorExitedSignal(void) application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - SignalData data; + SignalData data; DragSignalFunctor functor(data); detector.ExitedSignal().Connect(&application, functor); TestGenerateMiniPan(application); Vector2 screenCoordinates(10.0f, 110.0f); - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates)); screenCoordinates.x = 20.0f; screenCoordinates.y = 20.0f; - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates)); DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); DALI_TEST_EQUALS(control2, data.control, TEST_LOCATION); @@ -435,22 +433,22 @@ int UtcDaliDragAndDropDetectorExitedSignal(void) int UtcDaliDragAndDropDetectorDroppedSignal(void) { - TestApplication application; + ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); - control1.SetSize(100.0f,100.0f); - control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); - control1.SetPosition(0.0f, 0.0f); - control2.SetPosition(0.0f, 100.0f); - - Stage::GetCurrent().Add(control1); - Stage::GetCurrent().Add(control2); + Control control1 = Control::New(); + Control control2 = Control::New(); + control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); + control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f)); + + application.GetScene().Add(control1); + application.GetScene().Add(control2); detector.Attach(control1); detector.Attach(control2); @@ -458,18 +456,18 @@ int UtcDaliDragAndDropDetectorDroppedSignal(void) application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - SignalData data; + SignalData data; DragSignalFunctor functor(data); detector.DroppedSignal().Connect(&application, functor); TestGenerateMiniPan(application); Vector2 screenCoordinates(10.0f, 110.0f); - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates)); screenCoordinates.x = 10.0f; screenCoordinates.y = 112.0f; - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Up, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::UP, screenCoordinates)); DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); DALI_TEST_EQUALS(control2, data.control, TEST_LOCATION); @@ -483,22 +481,22 @@ int UtcDaliDragAndDropDetectorDroppedSignal(void) int UtcDaliDragAndDropDetectorEndedSignal(void) { - TestApplication application; + ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); - control1.SetSize(100.0f,100.0f); - control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); - control1.SetPosition(0.0f, 0.0f); - control2.SetPosition(0.0f, 100.0f); - - Stage::GetCurrent().Add(control1); - Stage::GetCurrent().Add(control2); + Control control1 = Control::New(); + Control control2 = Control::New(); + control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); + control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f)); + + application.GetScene().Add(control1); + application.GetScene().Add(control2); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); @@ -506,13 +504,13 @@ int UtcDaliDragAndDropDetectorEndedSignal(void) detector.Attach(control1); detector.Attach(control2); - SignalData data; + SignalData data; DragSignalFunctor functor(data); detector.EndedSignal().Connect(&application, functor); TestGenerateMiniPan(application); - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Down, Vector2(10.0f, 10.0f))); + application.ProcessEvent(GenerateSingleTouch(PointState::DOWN, Vector2(10.0f, 10.0f))); DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); DALI_TEST_EQUALS(control1, data.control, TEST_LOCATION); @@ -523,24 +521,24 @@ int UtcDaliDragAndDropDetectorEndedSignal(void) int UtcDaliDragAndDropDetectorGetContent(void) { - TestApplication application; + ToolkitTestApplication application; Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); - Control control1 = Control::New(); - Control control2 = Control::New(); - control1.SetName("control1"); - control2.SetName("control2"); - control1.SetSize(100.0f,100.0f); - control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); - control1.SetPosition(0.0f, 0.0f); - control2.SetPosition(0.0f, 100.0f); - - Stage::GetCurrent().Add(control1); - Stage::GetCurrent().Add(control2); + Control control1 = Control::New(); + Control control2 = Control::New(); + control1.SetProperty(Dali::Actor::Property::NAME, "control1"); + control2.SetProperty(Dali::Actor::Property::NAME, "control2"); + control1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f)); + control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + control1.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); + control2.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 100.0f)); + + application.GetScene().Add(control1); + application.GetScene().Add(control2); detector.Attach(control1); detector.Attach(control2); @@ -548,18 +546,18 @@ int UtcDaliDragAndDropDetectorGetContent(void) application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - SignalData data; + SignalData data; DragSignalFunctor functor(data); detector.DroppedSignal().Connect(&application, functor); TestGenerateMiniPan(application); Vector2 screenCoordinates(10.0f, 110.0f); - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Motion, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::MOTION, screenCoordinates)); screenCoordinates.x = 10.0f; screenCoordinates.y = 112.0f; - application.ProcessEvent(GenerateSingleTouch(TouchPoint::Up, screenCoordinates)); + application.ProcessEvent(GenerateSingleTouch(PointState::UP, screenCoordinates)); DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); DALI_TEST_EQUALS(control2, data.control, TEST_LOCATION);