X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Tooltip.cpp;h=b1cf51038b1a9f06d795d7617bbe352814bbe164;hp=42f5d1ce75e66555c942163a5d2e7e80eb6fc060;hb=268f651469300b3950b3f314fa33803b6c24273e;hpb=d13e8792c0e8dd0a3f5fb167ca9ee7c0155b7afc

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp
index 42f5d1c..b1cf510 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -28,8 +28,6 @@
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
 #include <dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali/integration-api/events/hover-event-integ.h>
 
 using namespace Dali;
@@ -52,7 +50,7 @@ void utc_dali_toolkit_tooltip_cleanup(void)
 namespace
 {
 
-Integration::HoverEvent GenerateSingleHover( TouchPoint::State state, const Vector2& screenPosition )
+Integration::HoverEvent GenerateSingleHover( PointState::Type state, const Vector2& screenPosition )
 {
   Integration::HoverEvent hoverEvent;
   Integration::Point point;
@@ -128,7 +126,7 @@ int UtcDaliTooltipCreateWithTextVisualMap(void)
   Control control = Control::New();
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
+                                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
                                                            .Add( TextVisual::Property::TEXT, "Hello TextVisual Test" ) )
                      );
 
@@ -168,7 +166,7 @@ int UtcDaliTooltipCreateWithTextVisualMapWithoutString(void)
   Control control = Control::New();
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
+                                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
                                                            .Add( TextVisual::Property::POINT_SIZE, 20 ) )
                      );
 
@@ -208,7 +206,7 @@ int UtcDaliTooltipCreateWithImageVisualMap(void)
   Control control = Control::New();
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Map().Add( Visual::Property::TYPE, Visual::IMAGE )
+                                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
                                                            .Add( ImageVisual::Property::URL, "dummy-url.png" ) )
                      );
 
@@ -247,9 +245,9 @@ int UtcDaliTooltipCreateWithArray(void)
 
   Control control = Control::New();
   control.SetProperty( DevelControl::Property::TOOLTIP,
-                       Property::Array().Add( Property::Map().Add( Visual::Property::TYPE, Visual::IMAGE )
+                       Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
                                                              .Add( ImageVisual::Property::URL, "dummy-url.png" ) )
-                                        .Add( Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
+                                        .Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
                                                              .Add( TextVisual::Property::TEXT, "Hello Array Test" ) )
                      );
 
@@ -301,7 +299,7 @@ int UtcDaliTooltipCreateWithFullMap(void)
   Control control = Control::New();
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
+                                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
                                                            .Add( TextVisual::Property::TEXT, "Hello TextVisual Test" ) )
                                       .Add( Tooltip::Property::LAYOUT, Vector2( 1.0f, 2.0f ) )
                                       .Add( Tooltip::Property::WAIT_TIME, 2.5f )
@@ -510,11 +508,11 @@ int UtcDaliTooltipDisplay(void)
 
   Control control = Control::New();
   control.SetProperty( DevelControl::Property::TOOLTIP, "Test" );
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -522,8 +520,8 @@ int UtcDaliTooltipDisplay(void)
 
   int rootChildCount = rootActor.GetChildCount();
 
-  Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -535,7 +533,7 @@ int UtcDaliTooltipDisplay(void)
   ++rootChildCount;
   DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
 
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Stationary, centerPoint ) ); // Emit for code coverage, will have no effect
+  application.ProcessEvent( GenerateSingleHover( PointState::STATIONARY, centerPoint ) ); // Emit for code coverage, will have no effect
 
   END_TEST;
 }
@@ -545,9 +543,9 @@ int UtcDaliTooltipDisplayWithTail(void)
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::TAIL,
@@ -556,7 +554,7 @@ int UtcDaliTooltipDisplayWithTail(void)
                                                            .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ))
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -564,8 +562,8 @@ int UtcDaliTooltipDisplayWithTail(void)
 
   int rootChildCount = rootActor.GetChildCount();
 
-  Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -585,14 +583,14 @@ int UtcDaliTooltipDisplayWithContentArray(void)
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT,
-                                            Property::Array().Add( Property::Map().Add( Visual::Property::TYPE, Visual::IMAGE )
+                                            Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
                                                                                   .Add( ImageVisual::Property::URL, "dummy-url.png" ) )
-                                                             .Add( Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
+                                                             .Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
                                                                                   .Add( TextVisual::Property::TEXT, "Hello Array Test" ) ))
                                       .Add( Tooltip::Property::TAIL,
                                             Property::Map().Add( Tooltip::Tail::Property::VISIBILITY, true )
@@ -600,7 +598,7 @@ int UtcDaliTooltipDisplayWithContentArray(void)
                                                            .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ))
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -608,8 +606,8 @@ int UtcDaliTooltipDisplayWithContentArray(void)
 
   int rootChildCount = rootActor.GetChildCount();
 
-  Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -629,22 +627,22 @@ int UtcDaliTooltipDisplayBelow(void)
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW )
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
   application.Render();
 
-  Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -655,7 +653,7 @@ int UtcDaliTooltipDisplayBelow(void)
   Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
 
   tet_infoline( "Ensure tooltip is below control" );
-  DALI_TEST_CHECK( ( control.GetCurrentWorldPosition().y + 50.0f /* Half Size */) < tooltip.GetCurrentWorldPosition().y );
+  DALI_TEST_CHECK( ( control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + 50.0f /* Half Size */) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y );
 
   END_TEST;
 }
@@ -665,22 +663,22 @@ int UtcDaliTooltipDisplayAbove(void)
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::POSITION, Tooltip::Position::ABOVE )
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
   application.Render();
 
-  Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -691,7 +689,7 @@ int UtcDaliTooltipDisplayAbove(void)
   Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
 
   tet_infoline( "Ensure tooltip is above control" );
-  DALI_TEST_CHECK( ( control.GetCurrentWorldPosition().y - 50.0f /* Half Size */) >= ( tooltip.GetCurrentWorldPosition().y + 0.5f * tooltip.GetCurrentSize().height ) );
+  DALI_TEST_CHECK( ( control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y - 50.0f /* Half Size */) >= ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + 0.5f * tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height ) );
 
   END_TEST;
 }
@@ -701,25 +699,25 @@ int UtcDaliTooltipDisplayAtHoverPoint(void)
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::POSITION, Tooltip::Position::HOVER_POINT )
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
   application.Render();
 
-  const Vector2 stageSize = Stage::GetCurrent().GetSize();
+  const Vector2 stageSize = application.GetScene().GetSize();
   Vector2 hoverPoint = stageSize * 0.5f;
   hoverPoint.x -= 10.0f;
   hoverPoint.y -= 10.0f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -730,8 +728,8 @@ int UtcDaliTooltipDisplayAtHoverPoint(void)
   Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
 
   tet_infoline( "Ensure tooltip is below and to the right of control" );
-  DALI_TEST_CHECK( ( hoverPoint.y - stageSize.height * 0.5f ) < tooltip.GetCurrentWorldPosition().y );
-  DALI_TEST_CHECK( ( hoverPoint.x - stageSize.width  * 0.5f ) < tooltip.GetCurrentWorldPosition().x );
+  DALI_TEST_CHECK( ( hoverPoint.y - stageSize.height * 0.5f ) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y );
+  DALI_TEST_CHECK( ( hoverPoint.x - stageSize.width  * 0.5f ) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x );
 
   END_TEST;
 }
@@ -741,15 +739,15 @@ int UtcDaliTooltipExceedThreshold(void)
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::MOVEMENT_THRESHOLD, 5 )
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -758,15 +756,15 @@ int UtcDaliTooltipExceedThreshold(void)
   int rootChildCount = rootActor.GetChildCount();
 
   tet_infoline( "Start hover" );
-  Vector2 hoverPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) );
+  Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
 
   application.SendNotification();
   application.Render();
 
   tet_infoline( "Emit a value which exceeds threshold, timer should start again" );
   hoverPoint.x += 10.0f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, hoverPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) );
 
   application.SendNotification();
   application.Render();
@@ -790,12 +788,12 @@ int UtcDaliTooltipGoOutOfBounds(void)
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
   control.SetProperty( DevelControl::Property::TOOLTIP, "Test" );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -804,15 +802,15 @@ int UtcDaliTooltipGoOutOfBounds(void)
   int rootChildCount = rootActor.GetChildCount();
 
   tet_infoline( "Start hover" );
-  Vector2 hoverPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) );
+  Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
 
   application.SendNotification();
   application.Render();
 
   tet_infoline( "Emit a value which goes out of bounds" );
   hoverPoint.x += 100.0f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, hoverPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) );
 
   application.SendNotification();
   application.Render();
@@ -836,11 +834,11 @@ int UtcDaliTooltipHideTooltipWhenOutOfBounds(void)
 
   Control control = Control::New();
   control.SetProperty( DevelControl::Property::TOOLTIP, "Test" );
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -848,8 +846,8 @@ int UtcDaliTooltipHideTooltipWhenOutOfBounds(void)
 
   int rootChildCount = rootActor.GetChildCount();
 
-  Vector2 hoverPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) );
+  Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -862,7 +860,7 @@ int UtcDaliTooltipHideTooltipWhenOutOfBounds(void)
   DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
 
   hoverPoint.x += 100.0f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, hoverPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) );
 
   application.SendNotification();
   application.Render();
@@ -879,16 +877,16 @@ int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void)
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::DISAPPEAR_ON_MOVEMENT, true )
                                       .Add( Tooltip::Property::MOVEMENT_THRESHOLD, 5 )
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -896,8 +894,8 @@ int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void)
 
   int rootChildCount = rootActor.GetChildCount();
 
-  Vector2 hoverPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, hoverPoint ) );
+  Vector2 hoverPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, hoverPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -910,7 +908,7 @@ int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void)
   DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
 
   hoverPoint.x += 10.0f; // Stay within bounds but exceed threshold
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, hoverPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, hoverPoint ) );
 
   application.SendNotification();
   application.Render();
@@ -928,11 +926,11 @@ int UtcDaliTooltipChangeContent(void)
 
   Control control = Control::New();
   control.SetProperty( DevelControl::Property::TOOLTIP, "Test" );
-  control.SetAnchorPoint( AnchorPoint::CENTER );
-  control.SetParentOrigin( ParentOrigin::CENTER );
-  control.SetSize( 100.0f, 100.0f );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  control.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -940,8 +938,8 @@ int UtcDaliTooltipChangeContent(void)
 
   int rootChildCount = rootActor.GetChildCount();
 
-  Vector2 centerPoint = Stage::GetCurrent().GetSize() * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  Vector2 centerPoint = application.GetScene().GetSize() * 0.5f;
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   tet_infoline( "Change content while timer is running and ensure it matches the new value" );
   control.SetProperty( DevelControl::Property::TOOLTIP, "Second Value" );
@@ -969,7 +967,7 @@ int UtcDaliTooltipChangeContent(void)
   DALI_TEST_EQUALS( rootActor.GetChildCount(), rootChildCount, TEST_LOCATION );
 
   tet_infoline( "More movement at same point, and emit signal, we should get the tooltip" );
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Motion, centerPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::MOTION, centerPoint ) );
   timer.MockEmitSignal();
 
   application.SendNotification();
@@ -1011,13 +1009,13 @@ int UtcDaliTooltipEnsureRemainsOnStage1(void)
 {
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
-  Vector2 stageSize = Stage::GetCurrent().GetSize();
+  Vector2 stageSize = application.GetScene().GetSize();
 
   tet_infoline( "Create a control and place it at the bottom of the screen, setting the tooltip to appear below" );
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
-  control.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-  control.SetSize( stageSize );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
+  control.SetProperty( Actor::Property::SIZE, stageSize );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::TAIL,
@@ -1027,14 +1025,14 @@ int UtcDaliTooltipEnsureRemainsOnStage1(void)
                                       .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW )
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
   application.Render();
 
   Vector2 centerPoint = stageSize * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -1044,7 +1042,7 @@ int UtcDaliTooltipEnsureRemainsOnStage1(void)
 
   tet_infoline( "Ensure tooltip is still on the screen" );
   Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
-  DALI_TEST_CHECK( ( tooltip.GetCurrentWorldPosition().y + tooltip.GetCurrentSize().height * 0.5f ) <= centerPoint.height );
+  DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * 0.5f ) <= centerPoint.height );
 
   END_TEST;
 }
@@ -1053,13 +1051,13 @@ int UtcDaliTooltipEnsureRemainsOnStage2(void)
 {
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
-  Vector2 stageSize = Stage::GetCurrent().GetSize();
+  Vector2 stageSize = application.GetScene().GetSize();
 
   tet_infoline( "Create a control and place it at the top of the screen, setting the tooltip to appear above" );
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-  control.SetParentOrigin( ParentOrigin::TOP_CENTER );
-  control.SetSize( stageSize );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
+  control.SetProperty( Actor::Property::SIZE, stageSize );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::TAIL,
@@ -1069,14 +1067,14 @@ int UtcDaliTooltipEnsureRemainsOnStage2(void)
                                       .Add( Tooltip::Property::POSITION, Tooltip::Position::ABOVE )
                      );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
   application.Render();
 
   Vector2 centerPoint = stageSize * 0.5f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -1086,7 +1084,7 @@ int UtcDaliTooltipEnsureRemainsOnStage2(void)
 
   tet_infoline( "Ensure tooltip is still on the screen" );
   Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
-  DALI_TEST_CHECK( ( tooltip.GetCurrentWorldPosition().y - tooltip.GetCurrentSize().height * 0.5f ) >= -centerPoint.height );
+  DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y - tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * 0.5f ) >= -centerPoint.height );
 
   END_TEST;
 }
@@ -1095,14 +1093,14 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void)
 {
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
-  Vector2 stageSize = Stage::GetCurrent().GetSize();
+  Vector2 stageSize = application.GetScene().GetSize();
   Vector2 centerPoint = stageSize * 0.5f;
 
   tet_infoline( "Create a control and adjust it's position so that the tooltip will attempt to appear to the left of the screen" );
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
-  control.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-  control.SetSize( stageSize );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
+  control.SetProperty( Actor::Property::SIZE, stageSize );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::TAIL,
@@ -1111,9 +1109,9 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void)
                                                            .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ) )
                                       .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW )
                      );
-  control.SetX( -centerPoint.x );
+  control.SetProperty( Actor::Property::POSITION_X,  -centerPoint.x );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -1121,7 +1119,7 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void)
 
   Vector2 hoverPoint( centerPoint );
   hoverPoint.x = 1.0f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -1131,7 +1129,7 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void)
 
   tet_infoline( "Ensure tooltip is still on the screen" );
   Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
-  DALI_TEST_CHECK( ( tooltip.GetCurrentWorldPosition().x - tooltip.GetCurrentSize().width * 0.5f ) >= -centerPoint.width );
+  DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x - tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width * 0.5f ) >= -centerPoint.width );
 
   END_TEST;
 }
@@ -1140,14 +1138,14 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void)
 {
   ToolkitTestApplication application;  // Exceptions require ToolkitTestApplication
 
-  Vector2 stageSize = Stage::GetCurrent().GetSize();
+  Vector2 stageSize = application.GetScene().GetSize();
   Vector2 centerPoint = stageSize * 0.5f;
 
   tet_infoline( "Create a control and adjust it's position so that the tooltip will attempt to appear to the right of the screen" );
   Control control = Control::New();
-  control.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
-  control.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-  control.SetSize( stageSize );
+  control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
+  control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
+  control.SetProperty( Actor::Property::SIZE, stageSize );
   control.SetProperty( DevelControl::Property::TOOLTIP,
                        Property::Map().Add( Tooltip::Property::CONTENT, "Test" )
                                       .Add( Tooltip::Property::TAIL,
@@ -1156,9 +1154,9 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void)
                                                            .Add( Tooltip::Tail::Property::BELOW_VISUAL, "below-visual.png" ) )
                                       .Add( Tooltip::Property::POSITION, Tooltip::Position::BELOW )
                      );
-  control.SetX( centerPoint.x );
+  control.SetProperty( Actor::Property::POSITION_X,  centerPoint.x );
 
-  Actor rootActor = Stage::GetCurrent().GetRootLayer();
+  Actor rootActor = application.GetScene().GetRootLayer();
   rootActor.Add( control );
 
   application.SendNotification();
@@ -1166,7 +1164,7 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void)
 
   Vector2 hoverPoint( centerPoint );
   hoverPoint.x = 1.0f;
-  application.ProcessEvent( GenerateSingleHover( TouchPoint::Started, centerPoint ) );
+  application.ProcessEvent( GenerateSingleHover( PointState::STARTED, centerPoint ) );
 
   Dali::Timer timer = Timer::New( 1u );
   timer.MockEmitSignal();
@@ -1176,7 +1174,7 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void)
 
   tet_infoline( "Ensure tooltip is still on the screen" );
   Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip
-  DALI_TEST_CHECK( ( tooltip.GetCurrentWorldPosition().x + tooltip.GetCurrentSize().width * 0.5f ) <= centerPoint.width );
+  DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x + tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width * 0.5f ) <= centerPoint.width );
 
   END_TEST;
 }