Remove redundant Core::SendEvent() & NotificationEvent

[Issue#]   N/A
[Problem]  Notification event is redundant
[Cause]    Previously there was no way of telling Core to process events,
except by sending an event.
[Solution] Use the ProcessEvents() method, which was separated from Core::SendEvent()

Signed-off-by: Paul Wisbey <p.wisbey@samsung.com>
Change-Id: I3ae05b53931a685c59b5b0e2a449c633901d7ede

diff --git a/automated-tests/dali-test-suite-utils/test-application.h b/automated-tests/dali-test-suite-utils/test-application.h
index 192c6be..e7cc8ac 100644 (file)
--- a/automated-tests/dali-test-suite-utils/test-application.h
+++ b/automated-tests/dali-test-suite-utils/test-application.h
@@ -23,7 +23,6 @@
 #include "test-gl-sync-abstraction.h"
 #include "test-gl-abstraction.h"
 #include "test-render-controller.h"
-#include <dali/integration-api/events/notification-event.h>
 #include <dali/public-api/common/dali-common.h>
 
 namespace Dali
@@ -153,10 +152,15 @@ public:
     return mGestureManager;
   }
 
+  void ProcessEvent(const Integration::Event& event)
+  {
+    mCore->QueueEvent(event);
+    mCore->ProcessEvents();
+  }
+
   void SendNotification()
   {
-    Integration::NotificationEvent event;
-    mCore->SendEvent(event);
+    mCore->ProcessEvents();
   }
 
   void SetSurfaceWidth( unsigned int width, unsigned height )

diff --git a/automated-tests/dali-test-suite-utils/test-render-controller.h b/automated-tests/dali-test-suite-utils/test-render-controller.h
index 3a15181..62c43f4 100644 (file)
--- a/automated-tests/dali-test-suite-utils/test-render-controller.h
+++ b/automated-tests/dali-test-suite-utils/test-render-controller.h
@@ -40,9 +40,9 @@ public:
     mRequestUpdateCalled = true;
   }
 
-  virtual void RequestNotificationEventOnIdle()
+  virtual void RequestProcessEventsOnIdle()
   {
-    mRequestNotificationEventOnIdleCalled = true;
+    mRequestProcessEventsOnIdle = true;
   }
 
   typedef enum
@@ -56,7 +56,7 @@ public:
     switch(func)
     {
       case RequestUpdateFunc: return mRequestUpdateCalled;
-      case RequestNotificationEventOnIdleFunc: return mRequestNotificationEventOnIdleCalled;
+      case RequestNotificationEventOnIdleFunc: return mRequestProcessEventsOnIdle;
     }
 
     return false;
@@ -65,12 +65,12 @@ public:
   void Initialize()
   {
     mRequestUpdateCalled = false;
-    mRequestNotificationEventOnIdleCalled = false;
+    mRequestProcessEventsOnIdle = false;
   }
 
 private:
   bool mRequestUpdateCalled;
-  bool mRequestNotificationEventOnIdleCalled;
+  bool mRequestProcessEventsOnIdle;
 };
 
 } // Dali

diff --git a/automated-tests/dali-test-suite/actors/utc-Dali-Actor.cpp b/automated-tests/dali-test-suite/actors/utc-Dali-Actor.cpp
index 6a5a153..ce2ea83 100644 (file)
--- a/automated-tests/dali-test-suite/actors/utc-Dali-Actor.cpp
+++ b/automated-tests/dali-test-suite/actors/utc-Dali-Actor.cpp
@@ -2158,7 +2158,7 @@ static void UtcDaliActorTouchedSignal()
   Dali::TouchPoint point( 1, TouchPoint::Down, touchPoint.x, touchPoint.y );
   Dali::Integration::TouchEvent event;
   event.AddPoint( point );
-  application.GetCore().SendEvent( event );
+  application.ProcessEvent( event );
 
   DALI_TEST_CHECK( gTouchCallBackCalled == true );
 }
@@ -2456,7 +2456,7 @@ static void UtcDaliActorHitTest()
     // flush the queue and render once
     application.SendNotification();
     application.Render();
-    application.GetCore().SendEvent( event );
+    application.ProcessEvent( event );
 
     DALI_TEST_CHECK( gTouchCallBackCalled == hitTestData[index]->mResult );
 
@@ -2587,7 +2587,7 @@ static void SimulateTouchForSetOverlayHitTest(TestApplication& app)
   Dali::TouchPoint point( 0, TouchPoint::Down, 25.0f, 25.0f );
   Dali::Integration::TouchEvent event;
   event.AddPoint( point );
-  app.GetCore().SendEvent( event );
+  app.ProcessEvent( event );
 
   app.SendNotification();
   app.Render(1);

diff --git a/automated-tests/dali-test-suite/actors/utc-Dali-BaseHandle.cpp b/automated-tests/dali-test-suite/actors/utc-Dali-BaseHandle.cpp
index 3c12d57..1aa14d3 100644 (file)
--- a/automated-tests/dali-test-suite/actors/utc-Dali-BaseHandle.cpp
+++ b/automated-tests/dali-test-suite/actors/utc-Dali-BaseHandle.cpp
@@ -431,7 +431,7 @@ static void UtcDaliBaseHandleConnectSignal()
   Dali::TouchPoint point( 0, TouchPoint::Down, 240, 400  );
   Dali::Integration::TouchEvent event;
   event.AddPoint( point );
-  application.GetCore().SendEvent( event );
+  application.ProcessEvent( event );
 
   application.SendNotification();
   application.Render(1000);
@@ -445,7 +445,7 @@ static void UtcDaliBaseHandleConnectSignal()
   application.DisconnectAll();
 
   // simulate another touch event
-  application.GetCore().SendEvent( event );
+  application.ProcessEvent( event );
 
   DALI_TEST_CHECK( gTouchCallBackCalled == false );
 }

diff --git a/automated-tests/dali-test-suite/actors/utc-Dali-CustomActor.cpp b/automated-tests/dali-test-suite/actors/utc-Dali-CustomActor.cpp
index 1b03df3..11464ff 100644 (file)
--- a/automated-tests/dali-test-suite/actors/utc-Dali-CustomActor.cpp
+++ b/automated-tests/dali-test-suite/actors/utc-Dali-CustomActor.cpp
@@ -1517,7 +1517,7 @@ static void UtcDaliCustomActorOnTouchEvent()
   Dali::TouchPoint point( 0, TouchPoint::Down, 1, 1 );
   Dali::Integration::TouchEvent event;
   event.AddPoint( point );
-  application.GetCore().SendEvent( event );
+  application.ProcessEvent( event );
 
   DALI_TEST_EQUALS( 1, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION );
   DALI_TEST_EQUALS( "OnTouchEvent", custom.GetMethodsCalled()[ 0 ], TEST_LOCATION );
@@ -1546,7 +1546,7 @@ static void UtcDaliCustomActorOnMouseWheelEvent()
   // simulate a mouse wheel event
   Vector2 screenCoordinates( 10.0f, 10.0f );
   Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
-  application.GetCore().SendEvent( event );
+  application.ProcessEvent( event );
 
   DALI_TEST_EQUALS( 1, (int)(custom.GetMethodsCalled().size()), TEST_LOCATION );
   DALI_TEST_EQUALS( "OnMouseWheelEvent", custom.GetMethodsCalled()[ 0 ], TEST_LOCATION );

diff --git a/automated-tests/dali-test-suite/actors/utc-Dali-Stage.cpp b/automated-tests/dali-test-suite/actors/utc-Dali-Stage.cpp
index 0c439d5..6b61d5e 100644 (file)
--- a/automated-tests/dali-test-suite/actors/utc-Dali-Stage.cpp
+++ b/automated-tests/dali-test-suite/actors/utc-Dali-Stage.cpp
@@ -451,14 +451,13 @@ static void UtcDaliStageSignalKeyEvent()
 {
   TestApplication application;
   Stage stage = Stage::GetCurrent();
-  Dali::Integration::Core& core ( application.GetCore() );
 
   KeyEventSignalData data;
   KeyEventReceivedFunctor functor( data );
   stage.KeyEventSignal().Connect( &application, functor );
 
   Integration::KeyEvent event( "i","i", 0, 0, 0, Integration::KeyEvent::Down );
-  core.SendEvent( event );
+  application.ProcessEvent( event );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.keyModifier );
@@ -469,7 +468,7 @@ static void UtcDaliStageSignalKeyEvent()
   data.Reset();
 
   Integration::KeyEvent event2( "i","i", 0, 0, 0, Integration::KeyEvent::Up );
-  core.SendEvent( event2 );
+  application.ProcessEvent( event2 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.keyModifier );
@@ -480,7 +479,7 @@ static void UtcDaliStageSignalKeyEvent()
   data.Reset();
 
   Integration::KeyEvent event3( "a","a", 0, 0, 0, Integration::KeyEvent::Down );
-  core.SendEvent( event3 );
+  application.ProcessEvent( event3 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.keyModifier );
@@ -491,7 +490,7 @@ static void UtcDaliStageSignalKeyEvent()
   data.Reset();
 
   Integration::KeyEvent event4( "a","a", 0, 0, 0, Integration::KeyEvent::Up );
-  core.SendEvent( event4 );
+  application.ProcessEvent( event4 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.keyModifier );
@@ -504,7 +503,6 @@ void UtcDaliStageTouchedSignal()
 {
   TestApplication application;
   Stage stage = Stage::GetCurrent();
-  Dali::Integration::Core& core ( application.GetCore() );
 
   TouchedSignalData data;
   TouchedFunctor functor( data );
@@ -518,7 +516,7 @@ void UtcDaliStageTouchedSignal()
   {
     Integration::TouchEvent touchEvent;
     touchEvent.points.push_back( TouchPoint( 0, TouchPoint::Down, 10.0f, 10.0f ) );
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0 );
@@ -527,13 +525,13 @@ void UtcDaliStageTouchedSignal()
 
     touchEvent.points[0].state = TouchPoint::Motion;
     touchEvent.points[0].screen.x = 12.0f; // Some motion
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
     data.Reset();
 
     touchEvent.points[0].state = TouchPoint::Up;
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0 );
@@ -558,7 +556,7 @@ void UtcDaliStageTouchedSignal()
   {
     Integration::TouchEvent touchEvent;
     touchEvent.points.push_back( TouchPoint( 0, TouchPoint::Down, 10.0f, 10.0f ) );
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0 );
@@ -567,13 +565,13 @@ void UtcDaliStageTouchedSignal()
 
     touchEvent.points[0].state = TouchPoint::Motion;
     touchEvent.points[0].screen.x = 150.0f; // Some motion
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
     data.Reset();
 
     touchEvent.points[0].state = TouchPoint::Up;
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0 );
@@ -585,7 +583,7 @@ void UtcDaliStageTouchedSignal()
   {
     Integration::TouchEvent touchEvent;
     touchEvent.points.push_back( TouchPoint( 0, TouchPoint::Interrupted, 10.0f, 10.0f ) );
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0 );
@@ -594,7 +592,7 @@ void UtcDaliStageTouchedSignal()
     data.Reset();
 
     touchEvent.points[0].state = TouchPoint::Down;
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0 );
@@ -603,7 +601,7 @@ void UtcDaliStageTouchedSignal()
     data.Reset();
 
     touchEvent.points[0].state = TouchPoint::Interrupted;
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0 );
@@ -618,21 +616,21 @@ void UtcDaliStageTouchedSignal()
 
     // 1st point
     touchEvent.points.push_back( TouchPoint( 0, TouchPoint::Down, 10.0f, 10.0f ) );
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     data.Reset();
 
     // 2nd point
     touchEvent.points[0].state = TouchPoint::Stationary;
     touchEvent.points.push_back( TouchPoint( 1, TouchPoint::Down, 50.0f, 50.0f ) );
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
     DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
     data.Reset();
 
     // Primary point is up
     touchEvent.points[0].state = TouchPoint::Up;
     touchEvent.points[1].state = TouchPoint::Stationary;
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
     DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
     data.Reset();
 
@@ -640,13 +638,13 @@ void UtcDaliStageTouchedSignal()
     touchEvent.points.erase( touchEvent.points.begin() );
     touchEvent.points[0].state = TouchPoint::Motion;
     touchEvent.points[0].screen.x = 150.0f;
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
     DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
     data.Reset();
 
     // Final point Up
     touchEvent.points[0].state = TouchPoint::Up;
-    core.SendEvent( touchEvent );
+    application.ProcessEvent( touchEvent );
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     data.Reset();
   }

diff --git a/automated-tests/dali-test-suite/events/utc-Dali-EventProcessing.cpp b/automated-tests/dali-test-suite/events/utc-Dali-EventProcessing.cpp
index 7090f04..72a4ec0 100644 (file)
--- a/automated-tests/dali-test-suite/events/utc-Dali-EventProcessing.cpp
+++ b/automated-tests/dali-test-suite/events/utc-Dali-EventProcessing.cpp
@@ -73,12 +73,11 @@ struct InvalidGesture : public Integration::GestureEvent
 void UtcDaliInvalidEvent()
 {
   TestApplication application;
-  Dali::Integration::Core& core ( application.GetCore() );
 
   try
   {
     InvalidEvent event;
-    core.SendEvent( event );
+    application.ProcessEvent( event );
     tet_result( TET_FAIL );
   }
   catch ( Dali::DaliException& e )
@@ -90,12 +89,11 @@ void UtcDaliInvalidEvent()
 void UtcDaliInvalidGesture()
 {
   TestApplication application;
-  Dali::Integration::Core& core ( application.GetCore() );
 
   try
   {
     InvalidGesture event;
-    core.SendEvent( event );
+    application.ProcessEvent( event );
     tet_result( TET_FAIL );
   }
   catch ( Dali::DaliException& e )

diff --git a/automated-tests/dali-test-suite/events/utc-Dali-KeyEvent.cpp b/automated-tests/dali-test-suite/events/utc-Dali-KeyEvent.cpp
index b9412a7..4de264f 100644 (file)
--- a/automated-tests/dali-test-suite/events/utc-Dali-KeyEvent.cpp
+++ b/automated-tests/dali-test-suite/events/utc-Dali-KeyEvent.cpp
@@ -271,8 +271,6 @@ static void UtcDaliIntegrationKeyEvent()
     const std::string keyString("keyString");
     const int keyCode(333);
     const int keyModifier(312);
-    const int offset(29);
-    const int characters(80);
     const unsigned long timeStamp(132);
     const Integration::KeyEvent::State keyState(Integration::KeyEvent::Up);
 

diff --git a/automated-tests/dali-test-suite/events/utc-Dali-LongPressGestureDetector.cpp b/automated-tests/dali-test-suite/events/utc-Dali-LongPressGestureDetector.cpp
index 1576484..fc06ce2 100644 (file)
--- a/automated-tests/dali-test-suite/events/utc-Dali-LongPressGestureDetector.cpp
+++ b/automated-tests/dali-test-suite/events/utc-Dali-LongPressGestureDetector.cpp
@@ -243,7 +243,7 @@ static void UtcDaliLongPressGestureDetectorNew()
   Integration::TouchEvent touchEvent(1);
   TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f);
   touchEvent.AddPoint(point);
-  application.GetCore().SendEvent(touchEvent);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
@@ -412,7 +412,6 @@ static void UtcDaliLongPressGestureGetMaximumTouchesRequired()
 static void UtcDaliLongPressGestureSignalReceptionNegative()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -431,16 +430,15 @@ static void UtcDaliLongPressGestureSignalReceptionNegative()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do a long press outside actor's area
-  core.SendEvent( GenerateLongPress( Gesture::Possible, 1u, Vector2(112.0f, 112.0f ) ) );
-  core.SendEvent( GenerateLongPress( Gesture::Started,  1u, Vector2(112.0f, 112.0f ) ) );
-  core.SendEvent( GenerateLongPress( Gesture::Finished, 1u, Vector2(112.0f, 112.0f ) ) );
+  application.ProcessEvent( GenerateLongPress( Gesture::Possible, 1u, Vector2(112.0f, 112.0f ) ) );
+  application.ProcessEvent( GenerateLongPress( Gesture::Started,  1u, Vector2(112.0f, 112.0f ) ) );
+  application.ProcessEvent( GenerateLongPress( Gesture::Finished, 1u, Vector2(112.0f, 112.0f ) ) );
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliLongPressGestureSignalReceptionPositive()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -459,18 +457,17 @@ static void UtcDaliLongPressGestureSignalReceptionPositive()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do a long press inside actor's area
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 50.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 50.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS( Vector2(50.0f, 50.0f), data.receivedGesture.localPoint, 0.1, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Finished,  1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished,  1u, Vector2(50.0f, 50.0f)));
 }
 
 static void UtcDaliLongPressGestureSignalReceptionDetach()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -489,38 +486,37 @@ static void UtcDaliLongPressGestureSignalReceptionDetach()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start long press within the actor's area
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 20.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS( Vector2(20.0f, 20.0f), data.receivedGesture.localPoint, 0.1, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(20.0f, 20.0f)));
 
   // repeat the long press within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 50.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 50.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS( Vector2(50.0f, 50.0f), data.receivedGesture.localPoint, 0.1, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 50.0f)));
 
   // Detach actor
   detector.DetachAll();
 
   // Ensure we are no longer signalled
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 20.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 50.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliLongPressGestureSignalReceptionActorDestroyedDuringLongPress()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   SignalData data;
   GestureReceivedFunctor functor(data);
@@ -542,8 +538,8 @@ static void UtcDaliLongPressGestureSignalReceptionActorDestroyedDuringLongPress(
     detector.Attach(actor);
 
     // Start long press within the actor's area
-    core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 20.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 20.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 20.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 20.0f)));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
     // Remove the actor from stage and reset the data
@@ -557,14 +553,13 @@ static void UtcDaliLongPressGestureSignalReceptionActorDestroyedDuringLongPress(
   // Actor should now have been destroyed
 
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliLongPressGestureSignalReceptionRotatedActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -583,9 +578,9 @@ static void UtcDaliLongPressGestureSignalReceptionRotatedActor()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do a long press
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(5.0f, 5.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(5.0f, 5.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(5.0f, 5.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS( Vector2(5.0f, 5.0f), data.receivedGesture.screenPoint, 0.1, TEST_LOCATION);
@@ -597,9 +592,9 @@ static void UtcDaliLongPressGestureSignalReceptionRotatedActor()
 
   // Do another long press, should still receive event
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(5.0f, 5.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(5.0f, 5.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(5.0f, 5.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS( Vector2(5.0f, 5.0f), data.receivedGesture.screenPoint, 0.1, TEST_LOCATION);
@@ -611,16 +606,15 @@ static void UtcDaliLongPressGestureSignalReceptionRotatedActor()
 
   // Do a long press, inside where the actor used to be, Should not receive the event
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(70.0f, 70.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(70.0f, 70.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(70.0f, 70.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(70.0f, 70.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(70.0f, 70.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(70.0f, 70.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliLongPressGestureSignalReceptionChildHit()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor parent = Actor::New();
   parent.SetSize(100.0f, 100.0f);
@@ -652,9 +646,9 @@ static void UtcDaliLongPressGestureSignalReceptionChildHit()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do long press - hits child area but parent should still receive it
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 50.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 50.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 50.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, parent == data.pressedActor, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(50.0f, 50.0f), data.receivedGesture.screenPoint, 0.01f, TEST_LOCATION);
@@ -666,9 +660,9 @@ static void UtcDaliLongPressGestureSignalReceptionChildHit()
 
   // Do an entire long press, only check finished value
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(51.0f, 51.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(51.0f, 51.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(51.0f, 51.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(51.0f, 51.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(51.0f, 51.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(51.0f, 51.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, child == data.pressedActor, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(51.0f, 51.0f), data.receivedGesture.screenPoint, 0.01f, TEST_LOCATION);
@@ -677,7 +671,6 @@ static void UtcDaliLongPressGestureSignalReceptionChildHit()
 static void UtcDaliLongPressGestureSignalReceptionAttachDetachMany()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor first = Actor::New();
   first.SetSize(100.0f, 100.0f);
@@ -703,17 +696,17 @@ static void UtcDaliLongPressGestureSignalReceptionAttachDetachMany()
   detector.DetectedSignal().Connect(&application, functor);
 
   // LongPress within second actor's area
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(120.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(120.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(120.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, second == data.pressedActor, TEST_LOCATION);
 
   // LongPress within first actor's area
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, first == data.pressedActor, TEST_LOCATION);
 
@@ -722,23 +715,22 @@ static void UtcDaliLongPressGestureSignalReceptionAttachDetachMany()
 
   // second actor shouldn't receive event
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(120.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(120.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(120.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // first actor should continue receiving event
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliLongPressGestureSignalReceptionActorBecomesUntouchable()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -757,9 +749,9 @@ static void UtcDaliLongPressGestureSignalReceptionActorBecomesUntouchable()
   detector.DetectedSignal().Connect(&application, functor);
 
   // LongPress in actor's area
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Actor becomes invisible - actor should not receive the next long press
@@ -771,16 +763,15 @@ static void UtcDaliLongPressGestureSignalReceptionActorBecomesUntouchable()
 
   // LongPress in the same area, shouldn't receive event
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliLongPressGestureSignalReceptionMultipleGestureDetectors()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
   Dali::TestGestureManager& gestureManager = application.GetGestureManager();
 
   Actor first = Actor::New();
@@ -820,32 +811,32 @@ static void UtcDaliLongPressGestureSignalReceptionMultipleGestureDetectors()
     DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
 
     // LongPress within second actor's area
-    core.SendEvent(GenerateLongPress(Gesture::Possible, 2u, Vector2(150.0f, 10.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Started,  2u, Vector2(150.0f, 10.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Finished, 2u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Possible, 2u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Started,  2u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Finished, 2u, Vector2(150.0f, 10.0f)));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(true, second == data.pressedActor, TEST_LOCATION);
 
     // LongPress continues as single touch gesture - we should not receive any gesture
     data.Reset();
-    core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(150.0f, 10.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(150.0f, 10.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(150.0f, 10.0f)));
     DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
     // Single touch long press starts - first actor should receive gesture
     data.Reset();
-    core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 10.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Started,  1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(true, first == data.pressedActor, TEST_LOCATION);
 
     // long press changes to double-touch - we shouldn't receive event
     data.Reset();
-    core.SendEvent(GenerateLongPress(Gesture::Possible, 2u, Vector2(50.0f, 10.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Started, 2u, Vector2(50.0f, 10.0f)));
-    core.SendEvent(GenerateLongPress(Gesture::Finished, 2u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Possible, 2u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Started, 2u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Finished, 2u, Vector2(50.0f, 10.0f)));
     DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
     // Reset gesture manager statistics
@@ -861,7 +852,6 @@ static void UtcDaliLongPressGestureSignalReceptionMultipleGestureDetectors()
 void UtcDaliLongPressGestureSignalReceptionMultipleDetectorsOnActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -887,8 +877,8 @@ void UtcDaliLongPressGestureSignalReceptionMultipleDetectorsOnActor()
   secondDetector.DetectedSignal().Connect(&application, secondFunctor);
 
   // LongPress in actor's area - both detector's functors should be called
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 }
@@ -896,7 +886,6 @@ void UtcDaliLongPressGestureSignalReceptionMultipleDetectorsOnActor()
 void UtcDaliLongPressGestureSignalReceptionDifferentPossible()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -915,7 +904,7 @@ void UtcDaliLongPressGestureSignalReceptionDifferentPossible()
   detector.DetectedSignal().Connect( &application, functor );
 
   // LongPress possible in actor's area.
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Move actor somewhere else
@@ -926,12 +915,12 @@ void UtcDaliLongPressGestureSignalReceptionDifferentPossible()
   application.Render();
 
   // Emit Started event, we should not receive the long press.
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // LongPress possible in empty area.
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Move actor in to the long press position.
@@ -942,21 +931,20 @@ void UtcDaliLongPressGestureSignalReceptionDifferentPossible()
   application.Render();
 
   // Emit Started event, we should not receive the long press.
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Normal long press in actor's area for completeness.
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliLongPressGestureEmitIncorrectStateClear()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -977,7 +965,7 @@ void UtcDaliLongPressGestureEmitIncorrectStateClear()
   // Try a Clear state
   try
   {
-    core.SendEvent(GenerateLongPress(Gesture::Clear, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Clear, 1u, Vector2(50.0f, 10.0f)));
     tet_result(TET_FAIL);
   }
   catch ( Dali::DaliException& e )
@@ -989,7 +977,6 @@ void UtcDaliLongPressGestureEmitIncorrectStateClear()
 void UtcDaliLongPressGestureEmitIncorrectStateContinuing()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1010,7 +997,7 @@ void UtcDaliLongPressGestureEmitIncorrectStateContinuing()
   // Try a Continuing state
   try
   {
-    core.SendEvent(GenerateLongPress(Gesture::Continuing, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateLongPress(Gesture::Continuing, 1u, Vector2(50.0f, 10.0f)));
     tet_result(TET_FAIL);
   }
   catch ( Dali::DaliException& e )
@@ -1022,7 +1009,6 @@ void UtcDaliLongPressGestureEmitIncorrectStateContinuing()
 void UtcDaliLongPressGestureDetectorTypeRegistry()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1051,16 +1037,15 @@ void UtcDaliLongPressGestureDetectorTypeRegistry()
   application.Render();
 
   // Emit gesture
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.voidFunctorCalled, TEST_LOCATION);
 }
 
 void UtcDaliLongPressGestureRepeatedState()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1079,41 +1064,40 @@ void UtcDaliLongPressGestureRepeatedState()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Two possibles
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // ... Send some finished states, still no signal
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Send two Started states, should be signalled
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
   // Send two cancelled states, should not be signalled
-  core.SendEvent(GenerateLongPress(Gesture::Cancelled, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Cancelled, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Cancelled, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Cancelled, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliLongPressGesturePossibleCancelled()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1132,16 +1116,15 @@ void UtcDaliLongPressGesturePossibleCancelled()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Send a possible followed by a cancel, we should not be signalled
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-  core.SendEvent(GenerateLongPress(Gesture::Cancelled, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Cancelled, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliLongPressGestureDetachAfterStarted()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1160,8 +1143,8 @@ void UtcDaliLongPressGestureDetachAfterStarted()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Emit initial signal
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1169,14 +1152,13 @@ void UtcDaliLongPressGestureDetachAfterStarted()
   detector.Detach(actor);
 
   // Emit Finished, no signal
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliLongPressGestureActorUnstaged()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1198,11 +1180,11 @@ void UtcDaliLongPressGestureActorUnstaged()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Emit signals
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Render and notify
@@ -1220,11 +1202,11 @@ void UtcDaliLongPressGestureActorUnstaged()
   stateToUnstage = Gesture::Finished;
 
   // Emit signals
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   tet_result( TET_PASS ); // If we get here then we have handled actor stage removal gracefully.
 }
@@ -1232,7 +1214,6 @@ void UtcDaliLongPressGestureActorUnstaged()
 void UtcDaliLongPressGestureActorStagedAndDestroyed()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1266,8 +1247,8 @@ void UtcDaliLongPressGestureActorStagedAndDestroyed()
   // position, we should still not be signalled.
 
   // Emit signals
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1283,15 +1264,15 @@ void UtcDaliLongPressGestureActorStagedAndDestroyed()
   application.Render();
 
   // Continue signal emission
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
   // Here we delete an actor in started, we should not receive any subsequent signalling.
 
   // Emit signals
-  core.SendEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Possible, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Started, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1307,15 +1288,14 @@ void UtcDaliLongPressGestureActorStagedAndDestroyed()
   application.Render();
 
   // Continue signal emission
-  core.SendEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateLongPress(Gesture::Finished, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliLongPressGestureSystemOverlay()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
-  Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() );
+  Dali::Integration::SystemOverlay& systemOverlay( application.GetCore().GetSystemOverlay() );
   systemOverlay.GetOverlayRenderTasks().CreateTask();
 
   Actor actor = Actor::New();
@@ -1336,7 +1316,7 @@ void UtcDaliLongPressGestureSystemOverlay()
 
   // Do a long press inside actor's area
   Vector2 screenCoords( 50.0f, 50.0f );
-  core.SendEvent( GenerateLongPress( Gesture::Possible, 1u, screenCoords ) );
-  core.SendEvent( GenerateLongPress( Gesture::Started, 1u, screenCoords ) );
+  application.ProcessEvent( GenerateLongPress( Gesture::Possible, 1u, screenCoords ) );
+  application.ProcessEvent( GenerateLongPress( Gesture::Started, 1u, screenCoords ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
 }

diff --git a/automated-tests/dali-test-suite/events/utc-Dali-MouseWheelEvent.cpp b/automated-tests/dali-test-suite/events/utc-Dali-MouseWheelEvent.cpp
index efd93db..22ba7a9 100644 (file)
--- a/automated-tests/dali-test-suite/events/utc-Dali-MouseWheelEvent.cpp
+++ b/automated-tests/dali-test-suite/events/utc-Dali-MouseWheelEvent.cpp
@@ -238,7 +238,6 @@ static void UtcDaliMouseWheelEventORModifer()
 void UtcDaliMouseWheelEventSignalling()
 {
   TestApplication application; // Reset all test adapter return codes
-  Dali::Integration::Core& core ( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -258,7 +257,7 @@ void UtcDaliMouseWheelEventSignalling()
   Integration::MouseWheelEvent event(0, SHIFT_MODIFIER, screenCoordinates, 1, 1000u);
 
   // Emit a mouse wheel signal
-  core.SendEvent( event );
+  application.ProcessEvent( event );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( actor == data.mouseWheeledActor );
   DALI_TEST_EQUALS(0, data.receivedMouseWheelEvent.direction, TEST_LOCATION); // check direction
@@ -278,7 +277,7 @@ void UtcDaliMouseWheelEventSignalling()
 
   screenCoordinates.x = screenCoordinates.y = 300.0f;
   Integration::MouseWheelEvent newEvent(0, SHIFT_MODIFIER, screenCoordinates, 1, 1000u);
-  core.SendEvent( newEvent );
+  application.ProcessEvent( newEvent );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( rootActor == rootData.mouseWheeledActor );
@@ -296,7 +295,7 @@ void UtcDaliMouseWheelEventSignalling()
   application.Render();
 
   // Emit a move at the same point, we should not be signalled.
-  core.SendEvent( event );
+  application.ProcessEvent( event );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 }

diff --git a/automated-tests/dali-test-suite/events/utc-Dali-PanGestureDetector.cpp b/automated-tests/dali-test-suite/events/utc-Dali-PanGestureDetector.cpp
index e505319..2c7d683 100644 (file)
--- a/automated-tests/dali-test-suite/events/utc-Dali-PanGestureDetector.cpp
+++ b/automated-tests/dali-test-suite/events/utc-Dali-PanGestureDetector.cpp
@@ -307,7 +307,7 @@ static void UtcDaliPanGestureDetectorNew()
   Integration::TouchEvent touchEvent(1);
   TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f);
   touchEvent.AddPoint(point);
-  application.GetCore().SendEvent(touchEvent);
+  application.ProcessEvent(touchEvent);
 }
 
 static void UtcDaliPanGestureDetectorDownCast()
@@ -464,7 +464,6 @@ static void UtcDaliPanGestureGetMaximumTouchesRequired()
 static void UtcDaliPanGestureSignalReceptionNegative()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -483,25 +482,24 @@ static void UtcDaliPanGestureSignalReceptionNegative()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do a pan outside actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(110.0f, 110.0f), Vector2(112.0f, 112.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(110.0f, 110.0f), Vector2(112.0f, 112.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(110.0f, 110.0f), Vector2(112.0f, 112.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(110.0f, 110.0f), Vector2(112.0f, 112.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Continue pan into actor's area - we should still not receive the signal
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(112.0f, 112.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(112.0f, 112.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Stop panning - we should still not receive the signal
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 20.0f), Vector2(12.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 20.0f), Vector2(12.0f, 12.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPanGestureSignalReceptionDownMotionLeave()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -520,8 +518,8 @@ static void UtcDaliPanGestureSignalReceptionDownMotionLeave()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pan within the actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -532,7 +530,7 @@ static void UtcDaliPanGestureSignalReceptionDownMotionLeave()
 
   // Continue the pan within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -543,7 +541,7 @@ static void UtcDaliPanGestureSignalReceptionDownMotionLeave()
 
   // Pan Gesture leaves actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(320.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(320.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -554,7 +552,7 @@ static void UtcDaliPanGestureSignalReceptionDownMotionLeave()
 
   // Gesture ends - we would receive a finished state
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(320.0f, 10.0f), Vector2(310.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(320.0f, 10.0f), Vector2(310.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -567,7 +565,6 @@ static void UtcDaliPanGestureSignalReceptionDownMotionLeave()
 static void UtcDaliPanGestureSignalReceptionDownMotionUp()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -586,8 +583,8 @@ static void UtcDaliPanGestureSignalReceptionDownMotionUp()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pan within the actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -598,7 +595,7 @@ static void UtcDaliPanGestureSignalReceptionDownMotionUp()
 
   // Continue the pan within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -609,7 +606,7 @@ static void UtcDaliPanGestureSignalReceptionDownMotionUp()
 
   // Gesture ends within actor's area - we would receive a finished state
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -622,7 +619,6 @@ static void UtcDaliPanGestureSignalReceptionDownMotionUp()
 static void UtcDaliPanGestureSignalReceptionCancelled()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -641,20 +637,20 @@ static void UtcDaliPanGestureSignalReceptionCancelled()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pan within the actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
 
   // Continue the pan within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
 
   // The gesture is cancelled
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Cancelled, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Cancelled, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Cancelled, data.receivedGesture.state, TEST_LOCATION);
 }
@@ -662,7 +658,6 @@ static void UtcDaliPanGestureSignalReceptionCancelled()
 static void UtcDaliPanGestureSignalReceptionDetach()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -681,18 +676,18 @@ static void UtcDaliPanGestureSignalReceptionDetach()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pan within the actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Continue the pan within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Gesture ends within actor's area
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Detach actor
@@ -700,17 +695,16 @@ static void UtcDaliPanGestureSignalReceptionDetach()
 
   // Ensure we are no longer signalled
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPanGestureSignalReceptionDetachWhilePanning()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -729,13 +723,13 @@ static void UtcDaliPanGestureSignalReceptionDetachWhilePanning()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pan within the actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Continue the pan within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Detach actor during the pan, we should not receive the next event
@@ -743,14 +737,13 @@ static void UtcDaliPanGestureSignalReceptionDetachWhilePanning()
 
   // Gesture ends within actor's area
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPanGestureSignalReceptionActorDestroyedWhilePanning()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   SignalData data;
   GestureReceivedFunctor functor(data);
@@ -780,13 +773,13 @@ static void UtcDaliPanGestureSignalReceptionActorDestroyedWhilePanning()
     detector.Attach(actor);
 
     // Start pan within the actor's area
-    core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-    core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
     // Continue the pan within the actor's area - we should still receive the signal
     data.Reset();
-    core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
     // Remove the actor from stage and reset the data
@@ -801,14 +794,13 @@ static void UtcDaliPanGestureSignalReceptionActorDestroyedWhilePanning()
 
   // Gesture ends within the area where the actor used to be
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPanGestureSignalReceptionRotatedActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -827,10 +819,10 @@ static void UtcDaliPanGestureSignalReceptionRotatedActor()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do an entire pan, only check finished value
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(8.0f, -5.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
 
@@ -840,10 +832,10 @@ static void UtcDaliPanGestureSignalReceptionRotatedActor()
   application.Render();
 
   // Do an entire pan, only check finished value
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(-5.0f, -8.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
 
@@ -853,10 +845,10 @@ static void UtcDaliPanGestureSignalReceptionRotatedActor()
   application.Render();
 
   // Do an entire pan, only check finished value
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(-8.0f, 5.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
 }
@@ -864,7 +856,6 @@ static void UtcDaliPanGestureSignalReceptionRotatedActor()
 static void UtcDaliPanGestureSignalReceptionChildHit()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor parent = Actor::New();
   parent.SetSize(100.0f, 100.0f);
@@ -896,10 +887,10 @@ static void UtcDaliPanGestureSignalReceptionChildHit()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do an entire pan, only check finished value - hits child area but parent should still receive it
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, parent == data.pannedActor, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(5.0f, 8.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
@@ -910,10 +901,10 @@ static void UtcDaliPanGestureSignalReceptionChildHit()
   detector.Detach(parent);
 
   // Do an entire pan, only check finished value
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, child == data.pannedActor, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(8.0f, -5.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
@@ -922,7 +913,6 @@ static void UtcDaliPanGestureSignalReceptionChildHit()
 static void UtcDaliPanGestureSignalReceptionAttachDetachMany()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor first = Actor::New();
   first.SetSize(100.0f, 100.0f);
@@ -948,14 +938,14 @@ static void UtcDaliPanGestureSignalReceptionAttachDetachMany()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pan within second actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(110.0f, 20.0f), Vector2(120.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(110.0f, 20.0f), Vector2(120.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(110.0f, 20.0f), Vector2(120.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(110.0f, 20.0f), Vector2(120.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, second == data.pannedActor, TEST_LOCATION);
 
   // Pan moves into first actor's area - second actor should receive the pan
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(120.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(120.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, second == data.pannedActor, TEST_LOCATION);
 
@@ -964,14 +954,13 @@ static void UtcDaliPanGestureSignalReceptionAttachDetachMany()
 
   // Gesture ends within actor's area
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPanGestureSignalReceptionActorBecomesUntouchable()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -990,13 +979,13 @@ static void UtcDaliPanGestureSignalReceptionActorBecomesUntouchable()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pan in actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Pan continues within actor's area
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Actor become invisible - actor should not receive the next pan
@@ -1008,14 +997,13 @@ static void UtcDaliPanGestureSignalReceptionActorBecomesUntouchable()
 
   // Gesture ends within actor's area
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPanGestureSignalReceptionMultipleGestureDetectors()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
   Dali::TestGestureManager& gestureManager = application.GetGestureManager();
 
   Actor first = Actor::New();
@@ -1055,50 +1043,50 @@ static void UtcDaliPanGestureSignalReceptionMultipleGestureDetectors()
     DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
 
     // Start pan within second actor's area
-    core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10, 2));
-    core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10, 2));
+    application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10, 2));
+    application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10, 2));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(true, second == data.pannedActor, TEST_LOCATION);
 
     // Two touch pan changes to single touch - we should receive a finished state
     data.Reset();
-    core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
     DALI_TEST_EQUALS(true, second == data.pannedActor, TEST_LOCATION);
 
     // Pan continues as single touch gesture - we should not receive any gesture
     data.Reset();
-    core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(30.0f, 10.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(30.0f, 10.0f), 10));
     DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
     // Pan ends - still no signal
     data.Reset();
-    core.SendEvent(GeneratePan(Gesture::Finished, Vector2(30.0f, 10.0f), Vector2(30.0f, 20.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(30.0f, 10.0f), Vector2(30.0f, 20.0f), 10));
     DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
     // Single touch pan starts - first actor should be panned
     data.Reset();
-    core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-    core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(true, first == data.pannedActor, TEST_LOCATION);
 
     // Pan changes to double-touch - we should receive a finished state
     data.Reset();
-    core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10, 2));
+    application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10, 2));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
     DALI_TEST_EQUALS(true, first == data.pannedActor, TEST_LOCATION);
 
     // Pan continues as double touch gesture - we should not receive any gesture
     data.Reset();
-    core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(30.0f, 10.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(30.0f, 10.0f), 10));
     DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
     // Pan ends - still no signal
     data.Reset();
-    core.SendEvent(GeneratePan(Gesture::Finished, Vector2(30.0f, 10.0f), Vector2(30.0f, 20.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(30.0f, 10.0f), Vector2(30.0f, 20.0f), 10));
     DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
     // Reset gesture manager statistics
@@ -1114,7 +1102,6 @@ static void UtcDaliPanGestureSignalReceptionMultipleGestureDetectors()
 void UtcDaliPanGestureSignalReceptionMultipleDetectorsOnActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1150,15 +1137,15 @@ void UtcDaliPanGestureSignalReceptionMultipleDetectorsOnActor()
   secondDetector.Attach(actor2);
 
   // Pan in actor's area - both detector's functors should be called
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 
   // Pan continues in actor's area - both detector's functors should be called
   firstData.Reset();
   secondData.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 
@@ -1166,15 +1153,15 @@ void UtcDaliPanGestureSignalReceptionMultipleDetectorsOnActor()
   firstDetector.Detach(actor);
   firstData.Reset();
   secondData.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 
   // New pan on actor, only secondDetector has actor attached
   firstData.Reset();
   secondData.Reset();
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 
@@ -1182,7 +1169,7 @@ void UtcDaliPanGestureSignalReceptionMultipleDetectorsOnActor()
   secondDetector.Detach(actor);
   firstData.Reset();
   secondData.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(false, secondData.functorCalled, TEST_LOCATION);
 }
@@ -1192,7 +1179,6 @@ void UtcDaliPanGestureSignalReceptionMultipleStarted()
   // Should handle two started events gracefully.
 
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1211,13 +1197,13 @@ void UtcDaliPanGestureSignalReceptionMultipleStarted()
   application.Render();
 
   // Start pan in actor's area
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Send another start in actor's area
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Add a child actor to overlap actor and send another start in actor's area
@@ -1236,21 +1222,20 @@ void UtcDaliPanGestureSignalReceptionMultipleStarted()
 
   // Send another possible and start in actor's area
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Send another start in actor's area
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliPanGestureSignalReceptionEnsureCorrectSignalling()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor1 = Actor::New();
   actor1.SetSize(100.0f, 100.0f);
@@ -1278,8 +1263,8 @@ void UtcDaliPanGestureSignalReceptionEnsureCorrectSignalling()
   application.Render();
 
   // Start pan in actor1's area, only data1 should be set
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data1.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(false, data2.functorCalled, TEST_LOCATION);
 }
@@ -1287,7 +1272,6 @@ void UtcDaliPanGestureSignalReceptionEnsureCorrectSignalling()
 void UtcDaliPanGestureSignalReceptionDifferentPossible()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1306,7 +1290,7 @@ void UtcDaliPanGestureSignalReceptionDifferentPossible()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Gesture possible in actor's area.
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Move actor somewhere else
@@ -1317,12 +1301,12 @@ void UtcDaliPanGestureSignalReceptionDifferentPossible()
   application.Render();
 
   // Emit Started event, we should not receive the long press.
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // LongPress possible in empty area.
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Move actor in to the long press position.
@@ -1333,21 +1317,20 @@ void UtcDaliPanGestureSignalReceptionDifferentPossible()
   application.Render();
 
   // Emit Started event, we should not receive the long press.
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Normal long press in actor's area for completeness.
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliPanGestureEmitIncorrectState()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1368,7 +1351,7 @@ void UtcDaliPanGestureEmitIncorrectState()
   // Try a Clear state
   try
   {
-    core.SendEvent(GeneratePan(Gesture::Clear, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+    application.ProcessEvent(GeneratePan(Gesture::Clear, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
     tet_result(TET_FAIL);
   }
   catch ( Dali::DaliException& e )
@@ -1380,7 +1363,6 @@ void UtcDaliPanGestureEmitIncorrectState()
 void UtcDaliPanGestureDetectorTypeRegistry()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1409,16 +1391,15 @@ void UtcDaliPanGestureDetectorTypeRegistry()
   application.Render();
 
   // Emit gesture
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.voidFunctorCalled, TEST_LOCATION);
 }
 
 void UtcDaliPanGestureActorUnstaged()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1440,11 +1421,11 @@ void UtcDaliPanGestureActorUnstaged()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Emit signals
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1463,14 +1444,14 @@ void UtcDaliPanGestureActorUnstaged()
   stateToUnstage = Gesture::Continuing;
 
   // Emit signals
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1489,14 +1470,14 @@ void UtcDaliPanGestureActorUnstaged()
   stateToUnstage = Gesture::Finished;
 
   // Emit signals
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   tet_result( TET_PASS ); // If we get here then we have handled actor stage removal gracefully.
 }
@@ -1504,7 +1485,6 @@ void UtcDaliPanGestureActorUnstaged()
 void UtcDaliPanGestureActorStagedAndDestroyed()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1538,8 +1518,8 @@ void UtcDaliPanGestureActorStagedAndDestroyed()
   // position, we should still not be signalled.
 
   // Emit signals
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1555,18 +1535,18 @@ void UtcDaliPanGestureActorStagedAndDestroyed()
   application.Render();
 
   // Continue signal emission
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
   // Here we delete an actor in started, we should not receive any subsequent signalling.
 
   // Emit signals
-  core.SendEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
-  core.SendEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1582,18 +1562,17 @@ void UtcDaliPanGestureActorStagedAndDestroyed()
   application.Render();
 
   // Continue signal emission
-  core.SendEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+  application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliPanGestureSystemOverlay()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
-  Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() );
+  Dali::Integration::SystemOverlay& systemOverlay( application.GetCore().GetSystemOverlay() );
   systemOverlay.GetOverlayRenderTasks().CreateTask();
 
   Actor actor = Actor::New();
@@ -1616,8 +1595,8 @@ void UtcDaliPanGestureSystemOverlay()
   Vector2 screenCoordsEnd( 20.0f, 20.0f );
 
   // Start pan within the actor's area
-  core.SendEvent( GeneratePan( Gesture::Possible, screenCoordsStart, screenCoordsEnd, 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started, screenCoordsStart, screenCoordsEnd, 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, screenCoordsStart, screenCoordsEnd, 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started, screenCoordsStart, screenCoordsEnd, 10 ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
 }
 
@@ -1738,7 +1717,6 @@ void UtcDaliPanGestureAngleOutOfRange()
 void UtcDaliPanGestureAngleProcessing()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor parent = Actor::New();
   parent.SetSize(100.0f, 100.0f);
@@ -1771,38 +1749,38 @@ void UtcDaliPanGestureAngleProcessing()
   childDetector.DetectedSignal().Connect(&application, childFunctor);
 
   // Generate an Up pan gesture, only parent should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10 ) );
   DALI_TEST_EQUALS( true,  parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a Right pan gesture, only child should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(30.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(30.0f, 20.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true,  childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a Down pan gesture, no one should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(20.0f, 30.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(20.0f, 30.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a Left pan gesture, no one should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 }
@@ -1858,7 +1836,6 @@ void UtcDaliPanGestureDirectionHandling()
 void UtcDaliPanGestureDirectionProcessing()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor parent = Actor::New();
   parent.SetSize(100.0f, 100.0f);
@@ -1891,74 +1868,74 @@ void UtcDaliPanGestureDirectionProcessing()
   childDetector.DetectedSignal().Connect(&application, childFunctor);
 
   // Generate an Up pan gesture, only parent should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10 ) );
   DALI_TEST_EQUALS( true,  parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a Right pan gesture, only child should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(30.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(30.0f, 20.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true,  childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a Down pan gesture, only parent should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(20.0f, 30.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(20.0f, 30.0f), 10 ) );
   DALI_TEST_EQUALS( true,  parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a Left pan gesture, only child should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true,  childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a pan at -45 degrees, no one should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 30.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 30.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a pan at 45 degrees, no one should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(30.0f, 30.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(30.0f, 30.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a pan at 135 degrees, no one should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 30.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 30.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 
   // Generate a pan at -135 degrees, no one should receive it.
-  core.SendEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 10.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  Vector2(20.0f, 20.0f), Vector2(10.0f, 10.0f), 10 ) );
   DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, childData.functorCalled,  TEST_LOCATION );
-  core.SendEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Finished,  Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
   parentData.Reset();
   childData.Reset();
 }
@@ -2019,7 +1996,6 @@ void UtcDaliPanGestureSetProperties()
 void UtcDaliPanGestureSetPropertiesAlreadyPanning()
 {
   TestApplication application;
-  Integration::Core& core( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -2048,8 +2024,8 @@ void UtcDaliPanGestureSetPropertiesAlreadyPanning()
 
   Vector2 previousPosition( 20.0f, 20.0f );
   Vector2 currentPosition( 20.0f, 10.0f );
-  core.SendEvent( GeneratePan( Gesture::Possible, previousPosition, previousPosition, 10 ) );
-  core.SendEvent( GeneratePan( Gesture::Started,  previousPosition, currentPosition, 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Possible, previousPosition, previousPosition, 10 ) );
+  application.ProcessEvent( GeneratePan( Gesture::Started,  previousPosition, currentPosition, 10 ) );
   DALI_TEST_EQUALS( true,  data.functorCalled, TEST_LOCATION );
 
   Vector2 screenPosition( 100.0f, 20.0f );

diff --git a/automated-tests/dali-test-suite/events/utc-Dali-PinchGestureDetector.cpp b/automated-tests/dali-test-suite/events/utc-Dali-PinchGestureDetector.cpp
index 7770ccc..3810ff8 100644 (file)
--- a/automated-tests/dali-test-suite/events/utc-Dali-PinchGestureDetector.cpp
+++ b/automated-tests/dali-test-suite/events/utc-Dali-PinchGestureDetector.cpp
@@ -212,11 +212,11 @@ static void UtcDaliPinchGestureDetectorNew()
   Integration::TouchEvent touchEvent(1);
   TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f);
   touchEvent.AddPoint(point);
-  application.GetCore().SendEvent(touchEvent);
+  application.ProcessEvent(touchEvent);
 
   TouchPoint point2(1, TouchPoint::Down, 20.0f, 20.0f, 20.0f, 20.0f);
   touchEvent.AddPoint(point2);
-  application.GetCore().SendEvent(touchEvent);
+  application.ProcessEvent(touchEvent);
 }
 
 static void UtcDaliPinchGestureDetectorDownCast()
@@ -250,7 +250,6 @@ static void UtcDaliPinchGestureDetectorDownCast()
 static void UtcDaliPinchGestureSignalReceptionNegative()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -269,24 +268,23 @@ static void UtcDaliPinchGestureSignalReceptionNegative()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do a pinch outside actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 45.0f, Vector2(112.0f, 112.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 45.0f, Vector2(112.0f, 112.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Continue pinch into actor's area - we should still not receive the signal
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 4.5f, 95.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 4.5f, 95.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Stop pinching - we should still not receive the signal
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(12.0f, 12.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(12.0f, 12.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPinchGestureSignalReceptionDownMotionLeave()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -305,7 +303,7 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionLeave()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pan within the actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(10.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -314,7 +312,7 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionLeave()
 
   // Continue the pan within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 5.0f, 90.0f, Vector2(21.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 5.0f, 90.0f, Vector2(21.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(5.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -323,7 +321,7 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionLeave()
 
   // Pan Gesture leaves actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 10.0f, 15.5f, Vector2(320.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 10.0f, 15.5f, Vector2(320.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(10.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -332,7 +330,7 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionLeave()
 
   // Gesture ends - we would receive a finished state
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 15.2f, 12.1f, Vector2(310.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 15.2f, 12.1f, Vector2(310.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(15.2f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -343,7 +341,6 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionLeave()
 static void UtcDaliPinchGestureSignalReceptionDownMotionUp()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -362,7 +359,7 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionUp()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pinch within the actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(10.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -371,7 +368,7 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionUp()
 
   // Continue the pinch within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(5.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -380,7 +377,7 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionUp()
 
   // Gesture ends within actor's area - we would receive a finished state
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(5.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -391,7 +388,6 @@ static void UtcDaliPinchGestureSignalReceptionDownMotionUp()
 static void UtcDaliPinchGestureSignalReceptionCancelled()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -410,20 +406,20 @@ static void UtcDaliPinchGestureSignalReceptionCancelled()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pinch within the actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
 
 
   // Continue the pinch within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
 
   // The gesture is cancelled
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Cancelled, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Cancelled, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Cancelled, data.receivedGesture.state, TEST_LOCATION);
 }
@@ -431,7 +427,6 @@ static void UtcDaliPinchGestureSignalReceptionCancelled()
 static void UtcDaliPinchGestureSignalReceptionDetach()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -450,20 +445,20 @@ static void UtcDaliPinchGestureSignalReceptionDetach()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pinch within the actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
 
 
   // Continue the pinch within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
 
   // Gesture ends within actor's area
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
 
@@ -472,16 +467,15 @@ static void UtcDaliPinchGestureSignalReceptionDetach()
 
   // Ensure we are no longer signalled
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
-  core.SendEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPinchGestureSignalReceptionDetachWhilePinching()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -500,13 +494,13 @@ static void UtcDaliPinchGestureSignalReceptionDetachWhilePinching()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pinch within the actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
 
   // Continue the pinch within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
 
@@ -515,14 +509,13 @@ static void UtcDaliPinchGestureSignalReceptionDetachWhilePinching()
 
   // Gesture ends within actor's area
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPinchGestureSignalReceptionActorDestroyedWhilePinching()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   SignalData data;
   GestureReceivedFunctor functor(data);
@@ -552,13 +545,13 @@ static void UtcDaliPinchGestureSignalReceptionActorDestroyedWhilePinching()
     detector.Attach(actor);
 
     // Start pinch within the actor's area
-    core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+    application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
 
     // Continue the pinch within the actor's area - we should still receive the signal
     data.Reset();
-    core.SendEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+    application.ProcessEvent(GeneratePinch(Gesture::Continuing, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
 
@@ -574,14 +567,13 @@ static void UtcDaliPinchGestureSignalReceptionActorDestroyedWhilePinching()
 
   // Gesture ends within the area where the actor used to be
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 5.0f, 25.0f, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPinchGestureSignalReceptionRotatedActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -600,9 +592,9 @@ static void UtcDaliPinchGestureSignalReceptionRotatedActor()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do an entire pinch, only check finished value
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(10.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
   DALI_TEST_EQUALS(50.0f, data.receivedGesture.speed, 0.01f, TEST_LOCATION);
@@ -614,9 +606,9 @@ static void UtcDaliPinchGestureSignalReceptionRotatedActor()
   application.Render();
 
   // Do an entire pinch, only check finished value
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(10.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
   DALI_TEST_EQUALS(50.0f, data.receivedGesture.speed, 0.01f, TEST_LOCATION);
@@ -628,9 +620,9 @@ static void UtcDaliPinchGestureSignalReceptionRotatedActor()
   application.Render();
 
   // Do an entire pinch, only check finished value
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(10.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
   DALI_TEST_EQUALS(50.0f, data.receivedGesture.speed, 0.01f, TEST_LOCATION);
@@ -640,7 +632,6 @@ static void UtcDaliPinchGestureSignalReceptionRotatedActor()
 static void UtcDaliPinchGestureSignalReceptionChildHit()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor parent = Actor::New();
   parent.SetSize(100.0f, 100.0f);
@@ -672,9 +663,9 @@ static void UtcDaliPinchGestureSignalReceptionChildHit()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do an entire pan, only check finished value - hits child area but parent should still receive it
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 5.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 5.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, parent == data.pinchedActor, TEST_LOCATION);
   DALI_TEST_EQUALS(5.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -687,9 +678,9 @@ static void UtcDaliPinchGestureSignalReceptionChildHit()
   detector.Detach(parent);
 
   // Do an entire pan, only check finished value
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 5.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 5.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, child == data.pinchedActor, TEST_LOCATION);
   DALI_TEST_EQUALS(5.0f, data.receivedGesture.scale, 0.01f, TEST_LOCATION);
@@ -700,7 +691,6 @@ static void UtcDaliPinchGestureSignalReceptionChildHit()
 static void UtcDaliPinchGestureSignalReceptionAttachDetachMany()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor first = Actor::New();
   first.SetSize(100.0f, 100.0f);
@@ -726,13 +716,13 @@ static void UtcDaliPinchGestureSignalReceptionAttachDetachMany()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pinch within second actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(120.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, second == data.pinchedActor, TEST_LOCATION);
 
   // Pinch moves into first actor's area - second actor should receive the pinch
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, second == data.pinchedActor, TEST_LOCATION);
 
@@ -741,14 +731,13 @@ static void UtcDaliPinchGestureSignalReceptionAttachDetachMany()
 
   // Gesture ends within actor's area
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(120.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliPinchGestureSignalReceptionActorBecomesUntouchable()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -767,12 +756,12 @@ static void UtcDaliPinchGestureSignalReceptionActorBecomesUntouchable()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start pinch in actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Pan continues within actor's area
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Started, 5.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 5.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Actor become invisible - actor should not receive the next pinch
@@ -784,14 +773,13 @@ static void UtcDaliPinchGestureSignalReceptionActorBecomesUntouchable()
 
   // Gesture ends within actor's area
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 5.0f, 50.0f, Vector2(10.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 5.0f, 50.0f, Vector2(10.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliPinchGestureSignalReceptionMultipleDetectorsOnActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -827,14 +815,14 @@ void UtcDaliPinchGestureSignalReceptionMultipleDetectorsOnActor()
   secondDetector.Attach(actor2);
 
   // Pinch in actor's area - both detector's functors should be called
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 
   // Pinch continues in actor's area - both detector's functors should be called
   firstData.Reset();
   secondData.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 
@@ -842,14 +830,14 @@ void UtcDaliPinchGestureSignalReceptionMultipleDetectorsOnActor()
   firstDetector.Detach(actor);
   firstData.Reset();
   secondData.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 
   // New pinch on actor, only secondDetector has actor attached
   firstData.Reset();
   secondData.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 
@@ -857,7 +845,7 @@ void UtcDaliPinchGestureSignalReceptionMultipleDetectorsOnActor()
   secondDetector.Detach(actor);
   firstData.Reset();
   secondData.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(false, secondData.functorCalled, TEST_LOCATION);
 }
@@ -867,7 +855,6 @@ void UtcDaliPinchGestureSignalReceptionMultipleStarted()
   // Should handle two started events gracefully.
 
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -886,12 +873,12 @@ void UtcDaliPinchGestureSignalReceptionMultipleStarted()
   application.Render();
 
   // Start pan in actor's area
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Send another start in actor's area
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Add a child actor to overlap actor and send another start in actor's area
@@ -910,19 +897,18 @@ void UtcDaliPinchGestureSignalReceptionMultipleStarted()
 
   // Send another start in actor's area
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Send another start in actor's area
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliPinchGestureSignalReceptionEnsureCorrectSignalling()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor1 = Actor::New();
   actor1.SetSize(100.0f, 100.0f);
@@ -950,7 +936,7 @@ void UtcDaliPinchGestureSignalReceptionEnsureCorrectSignalling()
   application.Render();
 
   // Start pan in actor1's area, only data1 should be set
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data1.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(false, data2.functorCalled, TEST_LOCATION);
 }
@@ -958,7 +944,6 @@ void UtcDaliPinchGestureSignalReceptionEnsureCorrectSignalling()
 void UtcDaliPinchGestureEmitIncorrectStateClear()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -979,7 +964,7 @@ void UtcDaliPinchGestureEmitIncorrectStateClear()
   // Try a Clear state
   try
   {
-    core.SendEvent(GeneratePinch(Gesture::Clear, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+    application.ProcessEvent(GeneratePinch(Gesture::Clear, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
     tet_result(TET_FAIL);
   }
   catch ( Dali::DaliException& e )
@@ -991,7 +976,6 @@ void UtcDaliPinchGestureEmitIncorrectStateClear()
 void UtcDaliPinchGestureEmitIncorrectStatePossible()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1012,7 +996,7 @@ void UtcDaliPinchGestureEmitIncorrectStatePossible()
   // Try a Possible state
   try
   {
-    core.SendEvent(GeneratePinch(Gesture::Possible, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+    application.ProcessEvent(GeneratePinch(Gesture::Possible, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
     tet_result(TET_FAIL);
   }
   catch ( Dali::DaliException& e )
@@ -1024,7 +1008,6 @@ void UtcDaliPinchGestureEmitIncorrectStatePossible()
 void UtcDaliPinchGestureDetectorTypeRegistry()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1053,14 +1036,13 @@ void UtcDaliPinchGestureDetectorTypeRegistry()
   application.Render();
 
   // Emit gesture
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.voidFunctorCalled, TEST_LOCATION);
 }
 
 void UtcDaliPinchGestureActorUnstaged()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1082,10 +1064,10 @@ void UtcDaliPinchGestureActorUnstaged()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Emit signals
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1104,13 +1086,13 @@ void UtcDaliPinchGestureActorUnstaged()
   stateToUnstage = Gesture::Continuing;
 
   // Emit signals
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1129,13 +1111,13 @@ void UtcDaliPinchGestureActorUnstaged()
   stateToUnstage = Gesture::Finished;
 
   // Emit signals
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   tet_result( TET_PASS ); // If we get here then we have handled actor stage removal gracefully.
 }
@@ -1143,7 +1125,6 @@ void UtcDaliPinchGestureActorUnstaged()
 void UtcDaliPinchGestureActorStagedAndDestroyed()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1177,7 +1158,7 @@ void UtcDaliPinchGestureActorStagedAndDestroyed()
   // position, we should still not be signalled.
 
   // Emit signals
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1193,17 +1174,17 @@ void UtcDaliPinchGestureActorStagedAndDestroyed()
   application.Render();
 
   // Continue signal emission
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
   // Here we delete an actor in started, we should not receive any subsequent signalling.
 
   // Emit signals
-  core.SendEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Started, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
 
@@ -1219,18 +1200,17 @@ void UtcDaliPinchGestureActorStagedAndDestroyed()
   application.Render();
 
   // Continue signal emission
-  core.SendEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Continuing, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GeneratePinch(Gesture::Finished, 10.0f, 50.0f, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliPinchGestureSystemOverlay()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
-  Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() );
+  Dali::Integration::SystemOverlay& systemOverlay( application.GetCore().GetSystemOverlay() );
   systemOverlay.GetOverlayRenderTasks().CreateTask();
 
   Actor actor = Actor::New();
@@ -1254,6 +1234,6 @@ void UtcDaliPinchGestureSystemOverlay()
   float speed ( 50.0f );
 
   // Start pan within the actor's area
-  core.SendEvent( GeneratePinch( Gesture::Started, scale, speed, screenCoords ) );
+  application.ProcessEvent( GeneratePinch( Gesture::Started, scale, speed, screenCoords ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
 }

diff --git a/automated-tests/dali-test-suite/events/utc-Dali-TapGestureDetector.cpp b/automated-tests/dali-test-suite/events/utc-Dali-TapGestureDetector.cpp
index d8ab0f0..21acd54 100644 (file)
--- a/automated-tests/dali-test-suite/events/utc-Dali-TapGestureDetector.cpp
+++ b/automated-tests/dali-test-suite/events/utc-Dali-TapGestureDetector.cpp
@@ -230,7 +230,7 @@ static void UtcDaliTapGestureDetectorNew()
   Integration::TouchEvent touchEvent(1);
   TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f);
   touchEvent.AddPoint(point);
-  application.GetCore().SendEvent(touchEvent);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
@@ -390,7 +390,6 @@ static void UtcDaliTapGestureGetTouchesRequired()
 static void UtcDaliTapGestureSignalReceptionNegative()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -409,14 +408,13 @@ static void UtcDaliTapGestureSignalReceptionNegative()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Do a tap outside actor's area
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(112.0f, 112.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(112.0f, 112.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(112.0f, 112.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(112.0f, 112.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 static void UtcDaliTapGestureSignalReceptionPositive()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -435,8 +433,8 @@ static void UtcDaliTapGestureSignalReceptionPositive()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Do a tap inside actor's area
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 50.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 50.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTaps, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -446,7 +444,6 @@ static void UtcDaliTapGestureSignalReceptionPositive()
 static void UtcDaliTapGestureSignalReceptionDetach()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -465,8 +462,8 @@ static void UtcDaliTapGestureSignalReceptionDetach()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Start tap within the actor's area
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 20.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTaps, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -474,8 +471,8 @@ static void UtcDaliTapGestureSignalReceptionDetach()
 
   // repeat the tap within the actor's area - we should still receive the signal
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 50.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 50.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTaps, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -486,17 +483,16 @@ static void UtcDaliTapGestureSignalReceptionDetach()
 
   // Ensure we are no longer signalled
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 20.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 50.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 50.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 static void UtcDaliTapGestureSignalReceptionActorDestroyedWhileTapping()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   SignalData data;
   GestureReceivedFunctor functor(data);
@@ -518,8 +514,8 @@ static void UtcDaliTapGestureSignalReceptionActorDestroyedWhileTapping()
     detector.Attach(actor);
 
     // Start tap within the actor's area
-    core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 20.0f)));
-    core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 20.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 20.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 20.0f)));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
     // Remove the actor from stage and reset the data
@@ -533,14 +529,13 @@ static void UtcDaliTapGestureSignalReceptionActorDestroyedWhileTapping()
   // Actor should now have been destroyed
 
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 20.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 20.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 20.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 static void UtcDaliTapGestureSignalReceptionRotatedActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -559,8 +554,8 @@ static void UtcDaliTapGestureSignalReceptionRotatedActor()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do tap, only check finished value
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(5.0f, 5.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(5.0f, 5.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTaps, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -573,8 +568,8 @@ static void UtcDaliTapGestureSignalReceptionRotatedActor()
 
   // Do tap, should still receive event
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(5.0f, 5.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(5.0f, 5.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(5.0f, 5.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTaps, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
@@ -587,14 +582,13 @@ static void UtcDaliTapGestureSignalReceptionRotatedActor()
 
   // Do tap, inside the actor's area (area if it is not rotated), Should not receive the event
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(70.0f, 70.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(70.0f, 70.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(70.0f, 70.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(70.0f, 70.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 static void UtcDaliTapGestureSignalReceptionChildHit()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor parent = Actor::New();
   parent.SetSize(100.0f, 100.0f);
@@ -626,8 +620,8 @@ static void UtcDaliTapGestureSignalReceptionChildHit()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Do tap - hits child area but parent should still receive it
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 50.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 50.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 50.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, parent == data.tappedActor, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(50.0f, 50.0f), data.receivedGesture.screenPoint, 0.01f, TEST_LOCATION);
@@ -639,8 +633,8 @@ static void UtcDaliTapGestureSignalReceptionChildHit()
 
   // Do an entire tap, only check finished value
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(51.0f, 51.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(51.0f, 51.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(51.0f, 51.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(51.0f, 51.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, child == data.tappedActor, TEST_LOCATION);
   DALI_TEST_EQUALS(Vector2(51.0f, 51.0f), data.receivedGesture.screenPoint, 0.01f, TEST_LOCATION);
@@ -648,7 +642,6 @@ static void UtcDaliTapGestureSignalReceptionChildHit()
 static void UtcDaliTapGestureSignalReceptionAttachDetachMany()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor first = Actor::New();
   first.SetSize(100.0f, 100.0f);
@@ -674,15 +667,15 @@ static void UtcDaliTapGestureSignalReceptionAttachDetachMany()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Tap within second actor's area
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(120.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(120.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, second == data.tappedActor, TEST_LOCATION);
 
   // Tap within first actor's area
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, first == data.tappedActor, TEST_LOCATION);
 
@@ -691,20 +684,19 @@ static void UtcDaliTapGestureSignalReceptionAttachDetachMany()
 
   // second actor shouldn't receive event
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(120.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(120.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(120.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // first actor should continue receiving event
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(20.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(20.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 }
 static void UtcDaliTapGestureSignalReceptionActorBecomesUntouchable()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -723,8 +715,8 @@ static void UtcDaliTapGestureSignalReceptionActorBecomesUntouchable()
   detector.DetectedSignal().Connect(&application, functor);
 
   // Tap in actor's area
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 
   // Actor become invisible - actor should not receive the next pan
@@ -736,15 +728,14 @@ static void UtcDaliTapGestureSignalReceptionActorBecomesUntouchable()
 
   // Tap in the same area, shouldn't receive event
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 static void UtcDaliTapGestureSignalReceptionMultipleGestureDetectors()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
   Dali::TestGestureManager& gestureManager = application.GetGestureManager();
 
   Actor first = Actor::New();
@@ -785,28 +776,28 @@ static void UtcDaliTapGestureSignalReceptionMultipleGestureDetectors()
     DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
 
     // Tap within second actor's area
-    core.SendEvent(GenerateTap(Gesture::Possible, 2u, 2u, Vector2(150.0f, 10.0f)));
-    core.SendEvent(GenerateTap(Gesture::Started, 2u, 2u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Possible, 2u, 2u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Started, 2u, 2u, Vector2(150.0f, 10.0f)));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(true, second == data.tappedActor, TEST_LOCATION);
 
     // Tap continues as single touch gesture - we should not receive any gesture
     data.Reset();
-    core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(150.0f, 10.0f)));
-    core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(150.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(150.0f, 10.0f)));
     DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
     // Single touch tap starts - first actor should be panned
     data.Reset();
-    core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-    core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
     DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
     DALI_TEST_EQUALS(true, first == data.tappedActor, TEST_LOCATION);
 
     // Pan changes to double-touch - we shouldn't receive event
     data.Reset();
-    core.SendEvent(GenerateTap(Gesture::Possible, 2u, 2u, Vector2(50.0f, 10.0f)));
-    core.SendEvent(GenerateTap(Gesture::Started, 2u, 2u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Possible, 2u, 2u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Started, 2u, 2u, Vector2(50.0f, 10.0f)));
     DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
     // Reset gesture manager statistics
@@ -822,7 +813,6 @@ static void UtcDaliTapGestureSignalReceptionMultipleGestureDetectors()
 void UtcDaliTapGestureSignalReceptionMultipleDetectorsOnActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -848,8 +838,8 @@ void UtcDaliTapGestureSignalReceptionMultipleDetectorsOnActor()
   secondDetector.DetectedSignal().Connect(&application, secondFunctor);
 
   // Tap in actor's area - both detector's functors should be called
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, firstData.functorCalled, TEST_LOCATION);
   DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
 }
@@ -857,7 +847,6 @@ void UtcDaliTapGestureSignalReceptionMultipleDetectorsOnActor()
 void UtcDaliTapGestureSignalReceptionDifferentPossible()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -876,7 +865,7 @@ void UtcDaliTapGestureSignalReceptionDifferentPossible()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Gesture possible in actor's area.
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Move actor somewhere else
@@ -887,11 +876,11 @@ void UtcDaliTapGestureSignalReceptionDifferentPossible()
   application.Render();
 
   // Emit Started event, we should not receive the long press.
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // LongPress possible in empty area.
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Move actor in to the long press position.
@@ -902,19 +891,18 @@ void UtcDaliTapGestureSignalReceptionDifferentPossible()
   application.Render();
 
   // Emit Started event, we should not receive the long press.
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Normal long press in actor's area for completeness.
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliTapGestureEmitIncorrectStateClear()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -935,7 +923,7 @@ void UtcDaliTapGestureEmitIncorrectStateClear()
   // Try a Clear state
   try
   {
-    core.SendEvent(GenerateTap(Gesture::Clear, 1u, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Clear, 1u, 1u, Vector2(50.0f, 10.0f)));
     tet_result(TET_FAIL);
   }
   catch ( Dali::DaliException& e )
@@ -947,7 +935,6 @@ void UtcDaliTapGestureEmitIncorrectStateClear()
 void UtcDaliTapGestureEmitIncorrectStateContinuing()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -968,7 +955,7 @@ void UtcDaliTapGestureEmitIncorrectStateContinuing()
   // Try a Continuing state
   try
   {
-    core.SendEvent(GenerateTap(Gesture::Continuing, 1u, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Continuing, 1u, 1u, Vector2(50.0f, 10.0f)));
     tet_result(TET_FAIL);
   }
   catch ( Dali::DaliException& e )
@@ -980,7 +967,6 @@ void UtcDaliTapGestureEmitIncorrectStateContinuing()
 void UtcDaliTapGestureEmitIncorrectStateFinished()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1001,7 +987,7 @@ void UtcDaliTapGestureEmitIncorrectStateFinished()
   // Try a Finished state
   try
   {
-    core.SendEvent(GenerateTap(Gesture::Finished, 1u, 1u, Vector2(50.0f, 10.0f)));
+    application.ProcessEvent(GenerateTap(Gesture::Finished, 1u, 1u, Vector2(50.0f, 10.0f)));
     tet_result(TET_FAIL);
   }
   catch ( Dali::DaliException& e )
@@ -1013,7 +999,6 @@ void UtcDaliTapGestureEmitIncorrectStateFinished()
 void UtcDaliTapGestureDetectorTypeRegistry()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1042,15 +1027,14 @@ void UtcDaliTapGestureDetectorTypeRegistry()
   application.Render();
 
   // Emit gesture
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.voidFunctorCalled, TEST_LOCATION);
 }
 
 void UtcDaliTapGestureActorUnstaged()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1069,8 +1053,8 @@ void UtcDaliTapGestureActorUnstaged()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Tap in Actor's area, actor removed in signal handler, should be handled gracefully.
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   tet_result( TET_PASS ); // If we get here, then the actor removal on signal handler was handled gracefully.
 }
@@ -1078,7 +1062,6 @@ void UtcDaliTapGestureActorUnstaged()
 void UtcDaliTapGestureRepeatedState()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1097,27 +1080,26 @@ void UtcDaliTapGestureRepeatedState()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Emit two possibles
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Send a couple of Started states, only first one should be received.
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
   data.Reset();
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 
   // Send a couple of cancelled states, no reception
-  core.SendEvent(GenerateTap(Gesture::Cancelled, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Cancelled, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Cancelled, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Cancelled, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliTapGesturePossibleCancelled()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1136,15 +1118,14 @@ void UtcDaliTapGesturePossibleCancelled()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Emit a possible and then a cancelled, no reception
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
-  core.SendEvent(GenerateTap(Gesture::Cancelled, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Cancelled, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliTapGestureDetectorRemovedWhilePossible()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1163,18 +1144,17 @@ void UtcDaliTapGestureDetectorRemovedWhilePossible()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Emit a possible
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
 
   // Detach actor and send a Started state, no signal.
   detector.DetachAll();
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliTapGestureActorRemovedWhilePossible()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1193,7 +1173,7 @@ void UtcDaliTapGestureActorRemovedWhilePossible()
   detector.DetectedSignal().Connect( &application, functor );
 
   // Emit a possible
-  core.SendEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Possible, 1u, 1u, Vector2(50.0f, 10.0f)));
 
   // Remove, render and delete actor
   Stage::GetCurrent().Remove(actor);
@@ -1202,15 +1182,14 @@ void UtcDaliTapGestureActorRemovedWhilePossible()
   actor = NULL;
 
   // Send a Started state, no signal.
-  core.SendEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
+  application.ProcessEvent(GenerateTap(Gesture::Started, 1u, 1u, Vector2(50.0f, 10.0f)));
   DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
 }
 
 void UtcDaliTapGestureSystemOverlay()
 {
   TestApplication application;
-  Dali::Integration::Core& core = application.GetCore();
-  Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() );
+  Dali::Integration::SystemOverlay& systemOverlay( application.GetCore().GetSystemOverlay() );
   systemOverlay.GetOverlayRenderTasks().CreateTask();
 
   Actor actor = Actor::New();
@@ -1232,7 +1211,7 @@ void UtcDaliTapGestureSystemOverlay()
   Vector2 screenCoords( 50.0f, 50.0f );
 
   // Do a tap inside actor's area
-  core.SendEvent( GenerateTap( Gesture::Possible, 1u, 1u, screenCoords ) );
-  core.SendEvent( GenerateTap( Gesture::Started, 1u, 1u, screenCoords ) );
+  application.ProcessEvent( GenerateTap( Gesture::Possible, 1u, 1u, screenCoords ) );
+  application.ProcessEvent( GenerateTap( Gesture::Started, 1u, 1u, screenCoords ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
 }

diff --git a/automated-tests/dali-test-suite/events/utc-Dali-TouchProcessing.cpp b/automated-tests/dali-test-suite/events/utc-Dali-TouchProcessing.cpp
index 95054a8..afea2c8 100644 (file)
--- a/automated-tests/dali-test-suite/events/utc-Dali-TouchProcessing.cpp
+++ b/automated-tests/dali-test-suite/events/utc-Dali-TouchProcessing.cpp
@@ -166,7 +166,6 @@ Integration::TouchEvent GenerateSingleTouch( TouchPoint::State state, Vector2 sc
 void UtcDaliTouchNormalProcessing()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -187,7 +186,7 @@ void UtcDaliTouchNormalProcessing()
   actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -198,7 +197,7 @@ void UtcDaliTouchNormalProcessing()
   // Emit a motion signal
   screenCoordinates.x = screenCoordinates.y = 11.0f;
   actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Motion, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -209,7 +208,7 @@ void UtcDaliTouchNormalProcessing()
   // Emit an up signal
   screenCoordinates.x = screenCoordinates.y = 12.0f;
   actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Up, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Up, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Up, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -219,14 +218,13 @@ void UtcDaliTouchNormalProcessing()
 
   // Emit a down signal where the actor is not present
   screenCoordinates.x = screenCoordinates.y = 200.0f;
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
 }
 
 void UtcDaliTouchOutsideCameraNearFarPlanes()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   Stage stage = Stage::GetCurrent();
   Vector2 stageSize = stage.GetSize();
@@ -260,7 +258,7 @@ void UtcDaliTouchOutsideCameraNearFarPlanes()
   Vector2 screenCoordinates( stageSize.x * 0.5f, stageSize.y * 0.5f );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -271,7 +269,7 @@ void UtcDaliTouchOutsideCameraNearFarPlanes()
   application.SendNotification();
   application.Render();
 
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -282,7 +280,7 @@ void UtcDaliTouchOutsideCameraNearFarPlanes()
   application.SendNotification();
   application.Render();
 
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -293,7 +291,7 @@ void UtcDaliTouchOutsideCameraNearFarPlanes()
   application.SendNotification();
   application.Render();
 
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -304,7 +302,7 @@ void UtcDaliTouchOutsideCameraNearFarPlanes()
   application.SendNotification();
   application.Render();
 
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 }
@@ -312,13 +310,12 @@ void UtcDaliTouchOutsideCameraNearFarPlanes()
 void UtcDaliTouchEmitEmpty()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   try
   {
     // Emit an empty TouchEvent
     Integration::TouchEvent event;
-    core.SendEvent( event );
+    application.ProcessEvent( event );
     tet_result( TET_FAIL );
   }
   catch ( Dali::DaliException& e )
@@ -330,7 +327,6 @@ void UtcDaliTouchEmitEmpty()
 void UtcDaliTouchInterrupted()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -347,26 +343,25 @@ void UtcDaliTouchInterrupted()
   actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION );
   data.Reset();
 
   // Emit an interrupted signal, we should be signalled regardless of whether there is a hit or not.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f /* Outside actor */ ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f /* Outside actor */ ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION );
   data.Reset();
 
   // Emit another interrupted signal, our signal handler should not be called.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
 }
 
 void UtcDaliTouchParentConsumer()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Actor rootActor( Stage::GetCurrent().GetRootLayer() );
 
   Actor actor = Actor::New();
@@ -394,7 +389,7 @@ void UtcDaliTouchParentConsumer()
   rootActor.ScreenToLocal( rootCoordinates.x, rootCoordinates.y, screenCoordinates.x, screenCoordinates.y );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION );
@@ -414,7 +409,7 @@ void UtcDaliTouchParentConsumer()
   screenCoordinates.x = screenCoordinates.y = 11.0f;
   actor.ScreenToLocal( actorCoordinates.x, actorCoordinates.y, screenCoordinates.x, screenCoordinates.y );
   rootActor.ScreenToLocal( rootCoordinates.x, rootCoordinates.y, screenCoordinates.x, screenCoordinates.y );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION );
@@ -434,7 +429,7 @@ void UtcDaliTouchParentConsumer()
   screenCoordinates.x = screenCoordinates.y = 12.0f;
   actor.ScreenToLocal( actorCoordinates.x, actorCoordinates.y, screenCoordinates.x, screenCoordinates.y );
   rootActor.ScreenToLocal( rootCoordinates.x, rootCoordinates.y, screenCoordinates.x, screenCoordinates.y );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Up, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Up, screenCoordinates ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( 1u, data.touchEvent.GetPointCount(), TEST_LOCATION );
@@ -453,7 +448,7 @@ void UtcDaliTouchParentConsumer()
   // Emit a down signal where the actor is not present, will hit the root actor though
   screenCoordinates.x = screenCoordinates.y = 200.0f;
   rootActor.ScreenToLocal( rootCoordinates.x, rootCoordinates.y, screenCoordinates.x, screenCoordinates.y );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, screenCoordinates ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( 1u, rootData.touchEvent.GetPointCount(), TEST_LOCATION );
@@ -466,7 +461,6 @@ void UtcDaliTouchParentConsumer()
 void UtcDaliTouchInterruptedParentConsumer()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Actor rootActor( Stage::GetCurrent().GetRootLayer() );
 
   Actor actor = Actor::New();
@@ -489,7 +483,7 @@ void UtcDaliTouchInterruptedParentConsumer()
   rootActor.TouchedSignal().Connect( &application, rootFunctor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -500,7 +494,7 @@ void UtcDaliTouchInterruptedParentConsumer()
   rootData.Reset();
 
   // Emit an interrupted signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -511,7 +505,7 @@ void UtcDaliTouchInterruptedParentConsumer()
   rootData.Reset();
 
   // Emit another down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -527,7 +521,7 @@ void UtcDaliTouchInterruptedParentConsumer()
   application.Render();
 
   // Emit an interrupted signal, only root actor's signal should be called.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f /* Outside actor */ ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f /* Outside actor */ ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Interrupted, rootData.touchEvent.points[0].state, TEST_LOCATION );
@@ -536,7 +530,7 @@ void UtcDaliTouchInterruptedParentConsumer()
   rootData.Reset();
 
   // Emit another interrupted state, none of the signal's should be called.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Interrupted, Vector2( 200.0f, 200.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( false, rootData.functorCalled, TEST_LOCATION );
 }
@@ -544,7 +538,6 @@ void UtcDaliTouchInterruptedParentConsumer()
 void UtcDaliTouchLeave()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -564,24 +557,24 @@ void UtcDaliTouchLeave()
   actor.SetLeaveRequired( true );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION );
   data.Reset();
 
   // Emit a motion signal outside of actor, should be signalled with a Leave
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Leave, data.touchEvent.points[0].state, TEST_LOCATION );
   data.Reset();
 
   // Another motion outside of actor, no signalling
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 201.0f, 201.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 201.0f, 201.0f )) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
   // Another motion event inside actor, signalled with motion
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 10.0f, 10.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 10.0f, 10.0f )) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Motion, data.touchEvent.points[0].state, TEST_LOCATION );
   data.Reset();
@@ -590,7 +583,7 @@ void UtcDaliTouchLeave()
   actor.SetLeaveRequired( false );
 
   // Another motion event outside of actor, no signalling
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 }
@@ -598,7 +591,6 @@ void UtcDaliTouchLeave()
 void UtcDaliTouchLeaveParentConsumer()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Actor rootActor( Stage::GetCurrent().GetRootLayer() );
 
   Actor actor = Actor::New();
@@ -625,7 +617,7 @@ void UtcDaliTouchLeaveParentConsumer()
   rootActor.SetLeaveRequired( true );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -636,7 +628,7 @@ void UtcDaliTouchLeaveParentConsumer()
   rootData.Reset();
 
   // Emit a motion signal outside of actor, should be signalled with a Leave
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Leave, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -647,7 +639,7 @@ void UtcDaliTouchLeaveParentConsumer()
   rootData.Reset();
 
   // Another motion outside of actor, only rootActor signalled
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 201.0f, 201.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 201.0f, 201.0f )) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Motion, rootData.touchEvent.points[0].state, TEST_LOCATION );
@@ -656,7 +648,7 @@ void UtcDaliTouchLeaveParentConsumer()
   rootData.Reset();
 
   // Another motion event inside actor, signalled with motion
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 10.0f, 10.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 10.0f, 10.0f )) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Motion, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -671,7 +663,7 @@ void UtcDaliTouchLeaveParentConsumer()
 
   // Another motion event outside of root actor, only root signalled
   Vector2 stageSize( Stage::GetCurrent().GetSize() );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( stageSize.width + 10.0f, stageSize.height + 10.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( stageSize.width + 10.0f, stageSize.height + 10.0f )) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Leave, rootData.touchEvent.points[0].state, TEST_LOCATION );
@@ -680,7 +672,6 @@ void UtcDaliTouchLeaveParentConsumer()
 void UtcDaliTouchActorBecomesInsensitive()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -697,7 +688,7 @@ void UtcDaliTouchActorBecomesInsensitive()
   actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION );
   data.Reset();
@@ -706,7 +697,7 @@ void UtcDaliTouchActorBecomesInsensitive()
   actor.SetSensitive( false );
 
   // Emit a motion signal, signalled with an interrupted
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Interrupted, data.touchEvent.points[0].state, TEST_LOCATION );
   data.Reset();
@@ -715,7 +706,6 @@ void UtcDaliTouchActorBecomesInsensitive()
 void UtcDaliTouchActorBecomesInsensitiveParentConsumer()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Actor rootActor( Stage::GetCurrent().GetRootLayer() );
 
   Actor actor = Actor::New();
@@ -738,7 +728,7 @@ void UtcDaliTouchActorBecomesInsensitiveParentConsumer()
   rootActor.TouchedSignal().Connect( &application, rootFunctor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Down, data.touchEvent.points[0].state, TEST_LOCATION );
@@ -759,7 +749,7 @@ void UtcDaliTouchActorBecomesInsensitiveParentConsumer()
   rootActor.SetSensitive( false );
 
   // Emit a motion signal, signalled with an interrupted (should get interrupted even if within root actor)
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2 ( 200.0f, 200.0f )) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( true, rootData.functorCalled, TEST_LOCATION );
   DALI_TEST_EQUALS( TouchPoint::Interrupted, rootData.touchEvent.points[0].state, TEST_LOCATION );
@@ -768,7 +758,6 @@ void UtcDaliTouchActorBecomesInsensitiveParentConsumer()
 void UtcDaliTouchMultipleLayers()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Actor rootActor( Stage::GetCurrent().GetRootLayer() );
 
   // Connect to actor's touched signal
@@ -795,27 +784,27 @@ void UtcDaliTouchMultipleLayers()
   actor1.TouchedSignal().Connect( &application, functor );
 
   // Hit in hittable area, actor1 should be hit
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( data.touchedActor == actor1 );
   data.Reset();
 
   // Make layer1 insensitive, nothing should be hit
   layer1.SetSensitive( false );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
   // Make layer1 sensitive again, again actor1 will be hit
   layer1.SetSensitive( true );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( data.touchedActor == actor1 );
   data.Reset();
 
   // Make rootActor insensitive, nothing should be hit
   rootActor.SetSensitive( false );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -843,21 +832,21 @@ void UtcDaliTouchMultipleLayers()
   actor2.TouchedSignal().Connect( &application, functor );
 
   // Emit an event, should hit layer2
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   //DALI_TEST_CHECK( data.touchedActor == layer2 ); // TODO: Uncomment this after removing renderable hack!
   data.Reset();
 
   // Make layer2 insensitive, should hit actor1
   layer2.SetSensitive( false );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( data.touchedActor == actor1 );
   data.Reset();
 
   // Make layer2 sensitive again, should hit layer2
   layer2.SetSensitive( true );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   //DALI_TEST_CHECK( data.touchedActor == layer2 ); // TODO: Uncomment this after removing renderable hack!
   data.Reset();
@@ -868,7 +857,7 @@ void UtcDaliTouchMultipleLayers()
   application.Render();
 
   // Should hit actor1
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( data.touchedActor == actor1 );
   data.Reset();
@@ -879,7 +868,7 @@ void UtcDaliTouchMultipleLayers()
   application.Render();
 
   // Should not hit anything
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 }
@@ -887,7 +876,6 @@ void UtcDaliTouchMultipleLayers()
 void UtcDaliTouchMultipleRenderTasks()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Stage stage ( Stage::GetCurrent() );
   Vector2 stageSize ( stage.GetSize() );
 
@@ -912,18 +900,18 @@ void UtcDaliTouchMultipleRenderTasks()
   actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
   // Ensure renderTask actor can be hit too.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( viewport.x + 5.0f, viewport.y + 5.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( viewport.x + 5.0f, viewport.y + 5.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
   // Disable input on renderTask, should not be hittable
   renderTask.SetInputEnabled( false );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( viewport.x + 5.0f, viewport.y + 5.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( viewport.x + 5.0f, viewport.y + 5.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 }
@@ -931,7 +919,6 @@ void UtcDaliTouchMultipleRenderTasks()
 void UtcDaliTouchMultipleRenderTasksWithChildLayer()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Stage stage ( Stage::GetCurrent() );
   Vector2 stageSize ( stage.GetSize() );
 
@@ -963,18 +950,18 @@ void UtcDaliTouchMultipleRenderTasksWithChildLayer()
   layer.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
   // Ensure renderTask actor can be hit too.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( viewport.x + 5.0f, viewport.y + 5.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( viewport.x + 5.0f, viewport.y + 5.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
   // Disable input on renderTask, should not be hittable
   renderTask.SetInputEnabled( false );
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( viewport.x + 5.0f, viewport.y + 5.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( viewport.x + 5.0f, viewport.y + 5.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 }
@@ -982,7 +969,6 @@ void UtcDaliTouchMultipleRenderTasksWithChildLayer()
 void UtcDaliTouchOffscreenRenderTasks()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Stage stage ( Stage::GetCurrent() );
   Vector2 stageSize ( stage.GetSize() );
 
@@ -1024,7 +1010,7 @@ void UtcDaliTouchOffscreenRenderTasks()
   actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 }
@@ -1032,7 +1018,6 @@ void UtcDaliTouchOffscreenRenderTasks()
 void UtcDaliTouchMultipleRenderableActors()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
   Stage stage ( Stage::GetCurrent() );
   Vector2 stageSize ( stage.GetSize() );
 
@@ -1057,7 +1042,7 @@ void UtcDaliTouchMultipleRenderableActors()
   actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( actor == data.touchedActor );
 }
@@ -1065,7 +1050,6 @@ void UtcDaliTouchMultipleRenderableActors()
 void UtcDaliTouchActorRemovedInSignal()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1085,7 +1069,7 @@ void UtcDaliTouchActorRemovedInSignal()
   actor.SetLeaveRequired( true );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -1095,12 +1079,12 @@ void UtcDaliTouchActorRemovedInSignal()
   application.Render();
 
   // Emit another signal outside of actor's area, should not get anything as the scene has changed.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -1109,7 +1093,7 @@ void UtcDaliTouchActorRemovedInSignal()
   application.Render();
 
   // Emit another signal outside of actor's area, should not get anything as the scene has changed.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -1119,7 +1103,7 @@ void UtcDaliTouchActorRemovedInSignal()
   application.Render();
 
   // Emit another down event
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -1127,14 +1111,13 @@ void UtcDaliTouchActorRemovedInSignal()
   actor = NULL;
 
   // Emit event, should not crash and should not receive an event.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 210.0f, 210.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
 }
 
 void UtcDaliTouchActorSignalNotConsumed()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1151,14 +1134,13 @@ void UtcDaliTouchActorSignalNotConsumed()
   actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
 }
 
 void UtcDaliTouchActorUnStaged()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
 
   Actor actor = Actor::New();
   actor.SetSize(100.0f, 100.0f);
@@ -1175,7 +1157,7 @@ void UtcDaliTouchActorUnStaged()
   actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
@@ -1187,7 +1169,7 @@ void UtcDaliTouchActorUnStaged()
   application.Render();
 
   // Emit a move at the same point, we should not be signalled.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Motion, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
   data.Reset();
 }
@@ -1195,8 +1177,7 @@ void UtcDaliTouchActorUnStaged()
 void UtcDaliTouchSystemOverlayActor()
 {
   TestApplication application;
-  Dali::Integration::Core& core( application.GetCore() );
-  Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() );
+  Dali::Integration::SystemOverlay& systemOverlay( application.GetCore().GetSystemOverlay() );
   systemOverlay.GetOverlayRenderTasks().CreateTask();
 
   // Create an actor and add it to the system overlay.
@@ -1222,7 +1203,7 @@ void UtcDaliTouchSystemOverlayActor()
   application.Render();
 
   // Emit a down signal, the system overlay is drawn last so is at the top, should hit the systemActor.
-  core.SendEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
+  application.ProcessEvent( GenerateSingleTouch( TouchPoint::Down, Vector2( 10.0f, 10.0f ) ) );
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   DALI_TEST_CHECK( systemActor == data.touchedActor );
 }

diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp
index aea1a54..6f312c6 100644 (file)
--- a/dali/integration-api/core.cpp
+++ b/dali/integration-api/core.cpp
@@ -99,12 +99,6 @@ void Core::Resume()
   mImpl->Resume();
 }
 
-void Core::SendEvent(const Event& event)
-{
-  mImpl->QueueEvent(event);
-  mImpl->ProcessEvents();
-}
-
 void Core::QueueEvent(const Event& event)
 {
   mImpl->QueueEvent(event);

diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h
index 6be7269..ddf21ae 100644 (file)
--- a/dali/integration-api/core.h
+++ b/dali/integration-api/core.h
@@ -295,15 +295,6 @@ public:
   void Resume();
 
   /**
-   * @deprecated - This is equivalent to:
-   * @code
-   *  Core::QueueEvent(event);
-   *  Core::ProcessEvents();
-   * @endcode
-   */
-  void SendEvent(const Event& event);
-
-  /**
    * Queue an event with Core.
    * Pre-processing of events may be benificial e.g. a series of motion events could be throttled, so that only the last event is queued.
    * Multi-threading note: this method should be called from the main thread.

diff --git a/dali/integration-api/events/notification-event.cpp b/dali/integration-api/events/notification-event.cpp
deleted file mode 100644 (file)
index 08b5bd1..0000000
--- a/dali/integration-api/events/notification-event.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// CLASS HEADER
-#include "notification-event.h"
-
-namespace Dali
-{
-
-namespace Integration
-{
-
-NotificationEvent::NotificationEvent()
-: Event(Event::Notification)
-{
-}
-
-NotificationEvent::~NotificationEvent()
-{
-}
-
-} // namespace Integration
-
-} // namespace Dali

diff --git a/dali/integration-api/events/notification-event.h b/dali/integration-api/events/notification-event.h
deleted file mode 100644 (file)
index 2a0739f..0000000
--- a/dali/integration-api/events/notification-event.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef __DALI_INTEGRATION_NOTIFICATION_EVENT_H__
-#define __DALI_INTEGRATION_NOTIFICATION_EVENT_H__
-
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// INTERNAL INCLUDES
-#include <dali/integration-api/events/event.h>
-
-namespace Dali DALI_IMPORT_API
-{
-
-namespace Integration
-{
-
-/**
- * Notification events are sent in order to process messages queued (internally) during rendering.
- * For example, an event may be queued when an animation has finished during Core::Render().
- * The caller of Dali::Integration::Core::Render() is responsible for posting a NotificationEvent,
- * via the main thread's event loop.
- */
-struct NotificationEvent : public Event
-{
-  // Construction & Destruction
-
-  /**
-   * Constructor
-   */
-  NotificationEvent();
-
-  /**
-   * Virtual Destructor
-   */
-  virtual ~NotificationEvent();
-};
-
-} // namespace Integration
-
-} // namespace Dali
-
-#endif // __DALI_INTEGRATION_NOTIFICATION_EVENT_H__

diff --git a/dali/integration-api/file.list b/dali/integration-api/file.list
index b42d1ef..9d8866f 100644 (file)
--- a/dali/integration-api/file.list
+++ b/dali/integration-api/file.list
@@ -13,7 +13,6 @@ platform_abstraction_src_files = \
    $(platform_abstraction_src_dir)/events/key-event-integ.cpp \
    $(platform_abstraction_src_dir)/events/long-press-gesture-event.cpp \
    $(platform_abstraction_src_dir)/events/mouse-wheel-event-integ.cpp \
-   $(platform_abstraction_src_dir)/events/notification-event.cpp \
    $(platform_abstraction_src_dir)/events/pan-gesture-event.cpp \
    $(platform_abstraction_src_dir)/events/pinch-gesture-event.cpp \
    $(platform_abstraction_src_dir)/events/tap-gesture-event.cpp \
@@ -56,7 +55,6 @@ platform_abstraction_events_header_files = \
    $(platform_abstraction_src_dir)/events/key-event-integ.h \
    $(platform_abstraction_src_dir)/events/long-press-gesture-event.h \
    $(platform_abstraction_src_dir)/events/mouse-wheel-event-integ.h \
-   $(platform_abstraction_src_dir)/events/notification-event.h \
    $(platform_abstraction_src_dir)/events/pan-gesture-event.h \
    $(platform_abstraction_src_dir)/events/pinch-gesture-event.h \
    $(platform_abstraction_src_dir)/events/tap-gesture-event.h \

diff --git a/dali/integration-api/render-controller.h b/dali/integration-api/render-controller.h
index 3c78349..5cee933 100644 (file)
--- a/dali/integration-api/render-controller.h
+++ b/dali/integration-api/render-controller.h
@@ -47,10 +47,9 @@ public:
 
   /**
    * Requests a future call to Dali::Integration::Core::ProcessEvents(), when the application is idle.
-   * TODO - Rename to RequestProcessEventsOnIdle()
    * Multi-threading note: this method will be called from the main thread only.
    */
-  virtual void RequestNotificationEventOnIdle() = 0;
+  virtual void RequestProcessEventsOnIdle() = 0;
 
 };
 

diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp
index 6b94df5..1a5cbb7 100644 (file)
--- a/dali/internal/common/core-impl.cpp
+++ b/dali/internal/common/core-impl.cpp
@@ -329,7 +329,7 @@ void Core::ProcessEvents()
   if( mProcessingEvent )
   {
     DALI_LOG_ERROR( "ProcessEvents should not be called from within ProcessEvents!" );
-    mRenderController.RequestNotificationEventOnIdle();
+    mRenderController.RequestProcessEventsOnIdle();
     return;
   }
 
@@ -370,7 +370,7 @@ void Core::ProcessEvents()
     }
   }
 
-  // SendEvent() may now be called again
+  // ProcessEvents() may now be called again
   mProcessingEvent = false;
 }
 

diff --git a/dali/internal/update/queue/update-message-queue.cpp b/dali/internal/update/queue/update-message-queue.cpp
index b5c9896..185b9bb 100644 (file)
--- a/dali/internal/update/queue/update-message-queue.cpp
+++ b/dali/internal/update/queue/update-message-queue.cpp
@@ -191,11 +191,11 @@ unsigned int* MessageQueue::ReserveMessageSlot( std::size_t requestedSize, bool
     }
   }
 
-  // If we are inside core event processing, core will automatically flush the queue.
-  // If we are outside, then we have to request an idle update to flush the queue
+  // If we are inside Core::ProcessEvents(), core will automatically flush the queue.
+  // If we are outside, then we have to request a call to Core::ProcessEvents() on idle.
   if ( false == mImpl->processingEvents )
   {
-    mImpl->renderController.RequestNotificationEventOnIdle();
+    mImpl->renderController.RequestProcessEventsOnIdle();
   }
 
   return mImpl->currentMessageBuffer->ReserveMessageSlot( requestedSize );