[AT-SPI] Squashed implementation

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
index 2771fbd..984518f 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
@@ -45,7 +45,7 @@ int UtcDaliMagnifierNew(void)
   magnifier = Magnifier::New();
   DALI_TEST_CHECK( magnifier );
 
-  Stage::GetCurrent().Add( magnifier );
+  application.GetScene().Add( magnifier );
 
   application.SendNotification();
   application.Render();
@@ -115,7 +115,7 @@ int UtcDaliMagnifierSetSourceActorP(void)
 {
   ToolkitTestApplication application;
 
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
   stage.Add( view );
@@ -163,7 +163,7 @@ int UtcDaliMagnifierFrameVisibility(void)
 {
   ToolkitTestApplication application;
 
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
   stage.Add( view );
@@ -196,7 +196,7 @@ int UtcDaliMagnifierMagnificationFactor(void)
 {
   ToolkitTestApplication application;
 
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
   stage.Add( view );
@@ -231,7 +231,7 @@ int UtcDaliMagnifierSourcePosition(void)
 {
   ToolkitTestApplication application;
 
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
   stage.Add( view );
@@ -262,18 +262,18 @@ int UtcDaliMagnifierOnSizeSet(void)
 
   Magnifier view = Magnifier::New();
 
-  Stage::GetCurrent().Add( view );
+  application.GetScene().Add( view );
 
   application.SendNotification();
   application.Render();
 
   Vector3 size( 200.0f, 300.0f, 0.0f );
-  view.SetSize( size );
+  view.SetProperty( Actor::Property::SIZE, size );
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetCurrentSize(), size, TEST_LOCATION );
+  DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION );
 
   END_TEST;
 }