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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp
index 42f5d1c..6eabaed 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) 2017 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;
@@ -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,9 +508,9 @@ 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();
   rootActor.Add( control );
@@ -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,
@@ -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 )
@@ -629,9 +627,9 @@ 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 )
@@ -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,9 +663,9 @@ 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 )
@@ -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,9 +699,9 @@ 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 )
@@ -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,9 +739,9 @@ 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 )
@@ -790,9 +788,9 @@ 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();
@@ -836,9 +834,9 @@ 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();
   rootActor.Add( control );
@@ -879,9 +877,9 @@ 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 )
@@ -928,9 +926,9 @@ 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();
   rootActor.Add( control );
@@ -1015,9 +1013,9 @@ int UtcDaliTooltipEnsureRemainsOnStage1(void)
 
   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,
@@ -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;
 }
@@ -1057,9 +1055,9 @@ int UtcDaliTooltipEnsureRemainsOnStage2(void)
 
   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,
@@ -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;
 }
@@ -1100,9 +1098,9 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void)
 
   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,7 +1109,7 @@ 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();
   rootActor.Add( control );
@@ -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;
 }
@@ -1145,9 +1143,9 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void)
 
   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,7 +1154,7 @@ 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();
   rootActor.Add( control );
@@ -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;
 }