[dali_2.3.19] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-DragAndDropDetector.cpp

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 (executable)
new mode 100644 (file)
index 3fbbfcd..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) 2018 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 <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
@@ -24,7 +24,6 @@
 
 #include <dali-toolkit/devel-api/drag-drop-detector/drag-and-drop-detector.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -41,76 +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<PointState::Type>(state));
-    point.SetScreenPosition(screenPosition);
-    touchEvent.points.push_back(point);
-    return touchEvent;
   }
 
-  Integration::PanGestureEvent GeneratePan(
-    Gesture::State state,
-    Vector2 previousPosition,
-    Vector2 currentPosition,
-    unsigned long timeDelta,
-    unsigned int numberOfTouches = 1,
-    unsigned int time = 1u)
+  bool operator()(Control control, Dali::Toolkit::DragAndDropDetector detector)
   {
-    Integration::PanGestureEvent pan(state);
-    pan.previousPosition = previousPosition;
-    pan.currentPosition = currentPosition;
-    pan.timeDelta = timeDelta;
-    pan.numberOfTouches = numberOfTouches;
-    pan.time = time;
-
-    return pan;
+    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<PointState::Type>(state));
+  point.SetScreenPosition(screenPosition);
+  touchEvent.points.push_back(point);
+  return touchEvent;
 }
+} // namespace
 
 int UtcDaliDragAndDropDetectorConstructorN(void)
 {
@@ -137,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);
@@ -154,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);
@@ -163,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);
@@ -181,7 +161,6 @@ int UtcDaliDragAndDropDetectorDetachN(void)
   DALI_TEST_EQUALS(0, detector.GetAttachedControlCount(), TEST_LOCATION);
 
   END_TEST;
-
 }
 
 int UtcDaliDragAndDropDetectorDetachP(void)
@@ -189,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);
@@ -225,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);
@@ -241,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);
@@ -256,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);
 
@@ -272,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);
@@ -286,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();
@@ -301,16 +280,15 @@ int UtcDaliDragAndDropDetectorStartSignal(void)
   DALI_TEST_CHECK(detector);
   DALI_TEST_CHECK(control);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.StartedSignal().Connect(&application, functor);
 
-  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
-  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
+  TestGenerateMiniPan(application);
 
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(control, data.control, TEST_LOCATION);
-  DALI_TEST_EQUALS(Vector2(12.0f, 12.0f), data.detector.GetCurrentScreenPosition(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector2(20.0f, 40.0f), data.detector.GetCurrentScreenPosition(), TEST_LOCATION);
   data.Reset();
 
   END_TEST;
@@ -318,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);
@@ -341,15 +319,14 @@ int UtcDaliDragAndDropDetectorEnteredSignal(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.EnteredSignal().Connect(&application, functor);
 
-  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
-  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
+  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);
@@ -357,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);
@@ -385,19 +361,18 @@ int UtcDaliDragAndDropDetectorMovedSignal(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.MovedSignal().Connect(&application, functor);
 
-  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
-  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
+  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);
@@ -410,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);
@@ -436,19 +411,18 @@ int UtcDaliDragAndDropDetectorExitedSignal(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.ExitedSignal().Connect(&application, functor);
 
-  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
-  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
+  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);
 
@@ -459,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);
@@ -482,19 +456,18 @@ int UtcDaliDragAndDropDetectorDroppedSignal(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.DroppedSignal().Connect(&application, functor);
 
-  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
-  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
+  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);
@@ -508,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);
@@ -531,17 +504,13 @@ int UtcDaliDragAndDropDetectorEndedSignal(void)
   detector.Attach(control1);
   detector.Attach(control2);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.EndedSignal().Connect(&application, functor);
 
-  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
-  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
-
-  application.ProcessEvent(GenerateSingleTouch(TouchPoint::Down, Vector2(10.0f, 10.0f)));
+  TestGenerateMiniPan(application);
 
-  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 10.0f), Vector2(120.0f, 12.0f), 10));
-  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(120.0f, 12.0f), Vector2(120.0f, 20.0f), 10));
+  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);
@@ -552,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);
@@ -577,19 +546,18 @@ int UtcDaliDragAndDropDetectorGetContent(void)
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  SignalData data;
+  SignalData        data;
   DragSignalFunctor functor(data);
   detector.DroppedSignal().Connect(&application, functor);
 
-  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
-  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 10.0f), Vector2(12.0f, 12.0f), 10));
+  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);