projects / platform / core / uifw / dali-core.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Renamed TouchSignal to TouchedSignal
[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-Stage.cpp
diff --git a/automated-tests/src/dali/utc-Dali-Stage.cpp b/automated-tests/src/dali/utc-Dali-Stage.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 857fd78..8ca978e
--- a/automated-tests/src/dali/utc-Dali-Stage.cpp
+++ b/automated-tests/src/dali/utc-Dali-Stage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,9 +75,7 @@ struct KeyEventGeneratedSignalData
   {
     functorCalled = false;
 
-    receivedKeyEvent.keyModifier = 0;
-    receivedKeyEvent.keyPressedName.clear();
-    receivedKeyEvent.keyPressed.clear();
+    receivedKeyEvent.Reset();
   }
 
   bool functorCalled;
@@ -119,9 +117,7 @@ struct KeyEventSignalData
   {
     functorCalled = false;
 
-    receivedKeyEvent.keyModifier = 0;
-    receivedKeyEvent.keyPressedName.clear();
-    receivedKeyEvent.keyPressed.clear();
+    receivedKeyEvent.Reset();
   }
 
   bool functorCalled;
@@ -155,41 +151,23 @@ struct TouchedSignalData
   {
     functorCalled = false;
 
-    receivedTouchEvent.points.clear();
-    receivedTouchEvent.time = 0;
-
-    receivedTouchData.Reset();
+    receivedTouchEvent.Reset();
   }
 
   bool functorCalled;
   TouchEvent receivedTouchEvent;
-  TouchData receivedTouchData;
 };
 
 // Functor that sets the data when touched signal is received
-struct TouchedFunctor
-{
-  TouchedFunctor( TouchedSignalData& data ) : signalData( data ) { }
-
-  void operator()( const TouchEvent& touch )
-  {
-    signalData.functorCalled = true;
-    signalData.receivedTouchEvent = touch;
-  }
-
-  TouchedSignalData& signalData;
-};
-
-
-// Functor that sets the data when touched signal is received
 struct TouchFunctor
 {
   TouchFunctor( TouchedSignalData& data ) : signalData( data ) { }
 
-  void operator()( const TouchData& touch )
+  void operator()( const TouchEvent& touch )
   {
     signalData.functorCalled = true;
-    signalData.receivedTouchData = touch;
+    TouchEvent handle(touch);
+    signalData.receivedTouchEvent = handle;
   }
 
   void operator()()
@@ -768,7 +746,7 @@ int UtcDaliStageGetBackgroundColorP(void)
 
   Stage stage = Stage::GetCurrent();
 
-  DALI_TEST_EQUALS( Stage::DEFAULT_BACKGROUND_COLOR, stage.GetBackgroundColor(), TEST_LOCATION );
+  DALI_TEST_EQUALS( DEFAULT_BACKGROUND_COLOR, stage.GetBackgroundColor(), TEST_LOCATION );
   END_TEST;
 }
 
@@ -884,47 +862,47 @@ int UtcDaliStageKeyEventGeneratedSignalP(void)
   KeyEventGeneratedReceivedFunctor functor2( data2 );
   GetImplementation( stage ).ConnectSignal( &application, "keyEventGenerated", functor2 );
 
-  Integration::KeyEvent event( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Up, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
   application.ProcessEvent( event );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.keyModifier );
-  DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.keyPressedName );
-  DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+  DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+  DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.GetKeyName() );
+  DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.GetKeyString() );
+  DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
 
   data.Reset();
 
-  Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::Up, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::UP, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
   application.ProcessEvent( event2 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.keyModifier );
-  DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.keyPressedName );
-  DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+  DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+  DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.GetKeyName() );
+  DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.GetKeyString() );
+  DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
 
   data.Reset();
 
-  Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Down, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
   application.ProcessEvent( event3 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.keyModifier );
-  DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.keyPressedName );
-  DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+  DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+  DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.GetKeyName() );
+  DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.GetKeyString() );
+  DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
 
   data.Reset();
 
-  Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Up, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
   application.ProcessEvent( event4 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.keyModifier );
-  DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.keyPressedName );
-  DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+  DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+  DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.GetKeyName() );
+  DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.GetKeyString() );
+  DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
   END_TEST;
 }
 
@@ -937,47 +915,47 @@ int UtcDaliStageSignalKeyEventP(void)
   KeyEventReceivedFunctor functor( data );
   stage.KeyEventSignal().Connect( &application, functor );
 
-  Integration::KeyEvent event( "i", "", "i", 0, 0, 0, Integration::KeyEvent::Down, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event( "i", "", "i", 0, 0, 0, Integration::KeyEvent::DOWN, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
   application.ProcessEvent( event );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.keyModifier );
-  DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.keyPressedName );
-  DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+  DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+  DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.GetKeyName() );
+  DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.GetKeyString() );
+  DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
 
   data.Reset();
 
-  Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::Up, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::UP, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
   application.ProcessEvent( event2 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.keyModifier );
-  DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.keyPressedName );
-  DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+  DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+  DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.GetKeyName() );
+  DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.GetKeyString() );
+  DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
 
   data.Reset();
 
-  Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Down, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
   application.ProcessEvent( event3 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.keyModifier );
-  DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.keyPressedName );
-  DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+  DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+  DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.GetKeyName() );
+  DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.GetKeyString() );
+  DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
 
   data.Reset();
 
-  Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Up, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+  Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
   application.ProcessEvent( event4 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.keyModifier );
-  DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.keyPressedName );
-  DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.keyPressed );
-  DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+  DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+  DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.GetKeyName() );
+  DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.GetKeyString() );
+  DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
   END_TEST;
 }
 
@@ -1002,7 +980,7 @@ int UtcDaliStageTouchedSignalP(void)
   Stage stage = Stage::GetCurrent();
 
   TouchedSignalData data;
-  TouchedFunctor functor( data );
+  TouchFunctor functor( data );
   stage.TouchedSignal().Connect( &application, functor );
 
   // Render and notify.
@@ -1015,14 +993,15 @@ int UtcDaliStageTouchedSignalP(void)
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
     data.Reset();
 
     GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+
     data.Reset();
   }
 
@@ -1044,7 +1023,7 @@ int UtcDaliStageTouchedSignalP(void)
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( data.receivedTouchEvent.points[0].hitActor == actor );
+    DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) );
     data.Reset();
 
     GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion
@@ -1056,7 +1035,7 @@ int UtcDaliStageTouchedSignalP(void)
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
     data.Reset();
   }
 
@@ -1081,7 +1060,7 @@ int UtcDaliStageTouchedSignalP(void)
     touchEvent.points.push_back( point );
     application.ProcessEvent( touchEvent );
     DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
     data.Reset();
 
     // Primary point is up
@@ -1089,7 +1068,7 @@ int UtcDaliStageTouchedSignalP(void)
     touchEvent.points[1].SetState( PointState::STATIONARY );
     application.ProcessEvent( touchEvent );
     DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
     data.Reset();
 
     // Remove 1st point now, 2nd point is now in motion
@@ -1098,7 +1077,7 @@ int UtcDaliStageTouchedSignalP(void)
     touchEvent.points[0].SetScreenPosition( Vector2( 150.0f, 50.0f ) );
     application.ProcessEvent( touchEvent );
     DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
     data.Reset();
 
     // Final point Up
@@ -1117,7 +1096,7 @@ int UtcDaliStageTouchedSignalN(void)
   Stage stage = Stage::GetCurrent();
 
   TouchedSignalData data;
-  TouchedFunctor functor( data );
+  TouchFunctor functor( data );
   stage.TouchedSignal().Connect( &application, functor );
 
   // Render and notify.
@@ -1133,7 +1112,7 @@ int UtcDaliStageTouchedSignalN(void)
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
     data.Reset();
 
     // Confirm there is no signal when the touchpoint is only moved.
@@ -1147,7 +1126,7 @@ int UtcDaliStageTouchedSignalN(void)
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
     data.Reset();
   }
 
@@ -1169,251 +1148,29 @@ int UtcDaliStageTouchedSignalN(void)
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
-    DALI_TEST_CHECK( data.receivedTouchEvent.points[0].state == TouchPoint::Interrupted );
+    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+    DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
     data.Reset();
 
     GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( data.receivedTouchEvent.points[0].hitActor == actor );
-    DALI_TEST_CHECK( data.receivedTouchEvent.points[0].state == TouchPoint::Down );
+    DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
+    DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN );
     data.Reset();
 
     GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
 
     DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
     DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
-    DALI_TEST_CHECK( data.receivedTouchEvent.points[0].state == TouchPoint::Interrupted );
+    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+    DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
 
     DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
 
     // Check that getting info about a non-existent point causes an assert.
-    bool asserted = false;
-    try
-    {
-      data.receivedTouchEvent.GetPoint( 1 );
-    }
-    catch( Dali::DaliException& e )
-    {
-      DALI_TEST_PRINT_ASSERT( e );
-      DALI_TEST_ASSERT( e, "point < points.size() && \"No point at index\"", TEST_LOCATION );
-      asserted = true;
-    }
-    DALI_TEST_CHECK( asserted );
-
-    data.Reset();
-  }
-
-  END_TEST;
-}
-
-
-int UtcDaliStageTouchSignalP(void)
-{
-  TestApplication application;
-  Stage stage = Stage::GetCurrent();
-
-  TouchedSignalData data;
-  TouchFunctor functor( data );
-  stage.TouchSignal().Connect( &application, functor );
-
-  // Render and notify.
-  application.SendNotification();
-  application.Render();
-
-  // Basic test: No actors, single touch (down then up).
-  {
-    GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
-    data.Reset();
-
-    GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
-    data.Reset();
-  }
-
-  // Add an actor to the scene.
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  actor.TouchedSignal().Connect( &DummyTouchCallback );
-  stage.Add( actor );
-
-  // Render and notify.
-  application.SendNotification();
-  application.Render();
-
-  // Actor on scene, single touch, down in actor, motion, then up outside actor.
-  {
-    GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor );
-    data.Reset();
-
-    GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion
-
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
-    data.Reset();
-  }
-
-  // Multiple touch. Should only receive a touch on first down and last up.
-  {
-    Integration::TouchEvent touchEvent;
-    Integration::Point point;
-
-    // 1st point
-    point.SetState( PointState::DOWN );
-    point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-    touchEvent.points.push_back( point );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
-    data.Reset();
-
-    // 2nd point
-    touchEvent.points[0].SetState( PointState::STATIONARY );
-    point.SetDeviceId( 1 );
-    point.SetScreenPosition( Vector2( 50.0f, 50.0f ) );
-    touchEvent.points.push_back( point );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    // Primary point is up
-    touchEvent.points[0].SetState( PointState::UP );
-    touchEvent.points[1].SetState( PointState::STATIONARY );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    // Remove 1st point now, 2nd point is now in motion
-    touchEvent.points.erase( touchEvent.points.begin() );
-    touchEvent.points[0].SetState( PointState::MOTION );
-    touchEvent.points[0].SetScreenPosition( Vector2( 150.0f, 50.0f ) );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    // Final point Up
-    touchEvent.points[0].SetState( PointState::UP );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
-    data.Reset();
-  }
-  END_TEST;
-}
-
-int UtcDaliStageTouchSignalN(void)
-{
-  TestApplication application;
-  Stage stage = Stage::GetCurrent();
-
-  TouchedSignalData data;
-  TouchFunctor functor( data );
-  stage.TouchSignal().Connect( &application, functor );
-
-  TouchedSignalData data2;
-  TouchFunctor functor2( data2 );
-  GetImplementation( stage ).ConnectSignal( &application, "touch", functor2 );
-
-  // Render and notify.
-  application.SendNotification();
-  application.Render();
-
-  // Confirm functor not called before there has been any touch event.
-  DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_EQUALS( false, data2.functorCalled, TEST_LOCATION );
-
-  // No actors, single touch, down, motion then up.
-  {
-    GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0));
-
-    DALI_TEST_EQUALS( true, data2.functorCalled, TEST_LOCATION );
-
-    data.Reset();
-    data2.Reset();
-
-    // Confirm there is no signal when the touchpoint is only moved.
-    GenerateTouch( application, PointState::MOTION, Vector2( 1200.0f, 10.0f ) ); // Some motion
-
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    // Confirm a following up event generates a signal.
-    GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0));
-    data.Reset();
-  }
-
-  // Add an actor to the scene.
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  actor.TouchedSignal().Connect( &DummyTouchCallback );
-  stage.Add( actor );
-
-  // Render and notify.
-  application.SendNotification();
-  application.Render();
-
-  // Actor on scene. Interrupted before down and interrupted after down.
-  {
-    GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
-    DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED );
-    data.Reset();
-
-    GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor );
-    DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::DOWN );
-    data.Reset();
-
-    GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
-    DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED );
-
-    DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
-
-    // Check that getting info about a non-existent point returns an empty handle
-    Actor actor = data.receivedTouchData.GetHitActor( 1 );
-    DALI_TEST_CHECK( !actor );
+    DALI_TEST_EQUALS( data.receivedTouchEvent.GetState( 1 ), PointState::FINISHED, TEST_LOCATION );
 
     data.Reset();
   }
@@ -1434,12 +1191,12 @@ int UtcDaliStageSignalWheelEventP(void)
   application.ProcessEvent( event );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event.type) == data.receivedWheelEvent.type );
-  DALI_TEST_CHECK( event.direction == data.receivedWheelEvent.direction );
-  DALI_TEST_CHECK( event.modifiers == data.receivedWheelEvent.modifiers );
-  DALI_TEST_CHECK( event.point == data.receivedWheelEvent.point );
-  DALI_TEST_CHECK( event.z == data.receivedWheelEvent.z );
-  DALI_TEST_CHECK( event.timeStamp == data.receivedWheelEvent.timeStamp );
+  DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event.type) == data.receivedWheelEvent.GetType() );
+  DALI_TEST_CHECK( event.direction == data.receivedWheelEvent.GetDirection() );
+  DALI_TEST_CHECK( event.modifiers == data.receivedWheelEvent.GetModifiers() );
+  DALI_TEST_CHECK( event.point == data.receivedWheelEvent.GetPoint() );
+  DALI_TEST_CHECK( event.delta == data.receivedWheelEvent.GetDelta() );
+  DALI_TEST_CHECK( event.timeStamp == data.receivedWheelEvent.GetTime() );
 
   data.Reset();
 
@@ -1447,25 +1204,25 @@ int UtcDaliStageSignalWheelEventP(void)
   application.ProcessEvent( event2 );
 
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event2.type) == data.receivedWheelEvent.type );
-  DALI_TEST_CHECK( event2.direction == data.receivedWheelEvent.direction );
-  DALI_TEST_CHECK( event2.modifiers == data.receivedWheelEvent.modifiers );
-  DALI_TEST_CHECK( event2.point == data.receivedWheelEvent.point );
-  DALI_TEST_CHECK( event2.z == data.receivedWheelEvent.z );
-  DALI_TEST_CHECK( event2.timeStamp == data.receivedWheelEvent.timeStamp );
+  DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event2.type) == data.receivedWheelEvent.GetType() );
+  DALI_TEST_CHECK( event2.direction == data.receivedWheelEvent.GetDirection() );
+  DALI_TEST_CHECK( event2.modifiers == data.receivedWheelEvent.GetModifiers() );
+  DALI_TEST_CHECK( event2.point == data.receivedWheelEvent.GetPoint() );
+  DALI_TEST_CHECK( event2.delta == data.receivedWheelEvent.GetDelta() );
+  DALI_TEST_CHECK( event2.timeStamp == data.receivedWheelEvent.GetTime() );
   END_TEST;
 }
 
 int UtcDaliStageContextLostSignalP(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage = Stage::GetCurrent();
 
   bool contextLost = false;
   ContextStatusFunctor contextLostFunctor( contextLost );
-  stage.ContextLostSignal().Connect( &app, contextLostFunctor );
+  stage.ContextLostSignal().Connect( &application, contextLostFunctor );
 
-  Integration::ContextNotifierInterface* notifier = app.GetCore().GetContextNotifier();
+  Integration::ContextNotifierInterface* notifier = application.GetCore().GetContextNotifier();
   notifier->NotifyContextLost();
   DALI_TEST_EQUALS( contextLost, true, TEST_LOCATION );
 
@@ -1474,7 +1231,7 @@ int UtcDaliStageContextLostSignalP(void)
 
 int UtcDaliStageContextLostSignalN(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage;
 
   // Check that connecting to the signal with a bad stage instance causes an assert.
@@ -1483,7 +1240,7 @@ int UtcDaliStageContextLostSignalN(void)
   ContextStatusFunctor contextLostFunctor( contextLost );
   try
   {
-    stage.ContextLostSignal().Connect( &app, contextLostFunctor );
+    stage.ContextLostSignal().Connect( &application, contextLostFunctor );
   }
   catch( Dali::DaliException& e )
   {
@@ -1498,14 +1255,14 @@ int UtcDaliStageContextLostSignalN(void)
 
 int UtcDaliStageContextRegainedSignalP(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage = Stage::GetCurrent();
 
   bool contextRegained = false;
   ContextStatusFunctor contextRegainedFunctor( contextRegained );
-  stage.ContextRegainedSignal().Connect( &app, contextRegainedFunctor );
+  stage.ContextRegainedSignal().Connect( &application, contextRegainedFunctor );
 
-  Integration::ContextNotifierInterface* notifier = app.GetCore().GetContextNotifier();
+  Integration::ContextNotifierInterface* notifier = application.GetCore().GetContextNotifier();
   notifier->NotifyContextLost();
   notifier->NotifyContextRegained();
   DALI_TEST_EQUALS( contextRegained, true, TEST_LOCATION );
@@ -1515,7 +1272,7 @@ int UtcDaliStageContextRegainedSignalP(void)
 
 int UtcDaliStageContextRegainedSignalN(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage;
 
   // Check that connecting to the signal with a bad stage instance causes an assert.
@@ -1524,7 +1281,7 @@ int UtcDaliStageContextRegainedSignalN(void)
   ContextStatusFunctor contextRegainedFunctor( contextRegained );
   try
   {
-    stage.ContextRegainedSignal().Connect( &app, contextRegainedFunctor );
+    stage.ContextRegainedSignal().Connect( &application, contextRegainedFunctor );
   }
   catch( Dali::DaliException& e )
   {
@@ -1539,14 +1296,14 @@ int UtcDaliStageContextRegainedSignalN(void)
 
 int UtcDaliStageSceneCreatedSignalP(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage = Stage::GetCurrent();
 
   bool signalCalled = false;
   SceneCreatedStatusFunctor sceneCreatedFunctor( signalCalled );
-  stage.SceneCreatedSignal().Connect( &app, sceneCreatedFunctor );
+  stage.SceneCreatedSignal().Connect( &application, sceneCreatedFunctor );
 
-  Integration::Core& core = app.GetCore();
+  Integration::Core& core = application.GetCore();
   core.SceneCreated();
   DALI_TEST_EQUALS( signalCalled, true, TEST_LOCATION );
 
@@ -1555,7 +1312,7 @@ int UtcDaliStageSceneCreatedSignalP(void)
 
 int UtcDaliStageSceneCreatedSignalN(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage;
 
   // Check that connecting to the signal with a bad stage instance causes an assert.
@@ -1564,7 +1321,7 @@ int UtcDaliStageSceneCreatedSignalN(void)
   SceneCreatedStatusFunctor sceneCreatedFunctor( signalCalled );
   try
   {
-    stage.SceneCreatedSignal().Connect( &app, sceneCreatedFunctor );
+    stage.SceneCreatedSignal().Connect( &application, sceneCreatedFunctor );
   }
   catch( Dali::DaliException& e )
   {
@@ -1579,7 +1336,7 @@ int UtcDaliStageSceneCreatedSignalN(void)
 
 int UtcDaliStageGetRenderTaskListP(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage = Stage::GetCurrent();
 
   // Check we get a valid instance.
@@ -1599,7 +1356,7 @@ int UtcDaliStageGetRenderTaskListP(void)
 
 int UtcDaliStageGetRenderTaskListN(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage;
 
   // Check that getting the render task list with a bad stage instance causes an assert.
@@ -1621,7 +1378,7 @@ int UtcDaliStageGetRenderTaskListN(void)
 
 int UtcDaliStageGetObjectRegistryP(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage = Stage::GetCurrent();
 
   ObjectRegistry objectRegistry = stage.GetObjectRegistry();
@@ -1630,7 +1387,7 @@ int UtcDaliStageGetObjectRegistryP(void)
   // However we want a basic test to confirm the returned registry is valid and works.
   bool verified = false;
   ActorCreatedFunctor test( verified );
-  objectRegistry.ObjectCreatedSignal().Connect( &app, test );
+  objectRegistry.ObjectCreatedSignal().Connect( &application, test );
 
   Actor actor = Actor::New();
   DALI_TEST_CHECK( test.mSignalVerified );
@@ -1640,7 +1397,7 @@ int UtcDaliStageGetObjectRegistryP(void)
 
 int UtcDaliStageGetObjectRegistryN(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage;
 
   // Check that getting the object registry with a bad stage instance DOES NOT cause an assert.
@@ -1662,7 +1419,7 @@ int UtcDaliStageGetObjectRegistryN(void)
 
 int UtcDaliStageOperatorAssign(void)
 {
-  TestApplication app;
+  TestApplication application;
   Stage stage;
   DALI_TEST_CHECK( !stage );
 
Domain: Graphics System / DALi;