[dali_1.9.18] Merge branch 'devel/master'

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
index 06967cf..9ea8bc3 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <toolkit-accessibility-adaptor.h>
@@ -1315,7 +1316,7 @@ int UtcDaliAccessibilityManagerActionActivateSignalP(void)
   accAdaptor.HandleActionEnableEvent();
 
   Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
-  button.SetSize(480, 800);
+  button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
   Stage::GetCurrent().Add(button);
   manager.SetFocusOrder( button, 1 );
   manager.SetCurrentFocusActor( button );
@@ -1524,7 +1525,7 @@ int UtcDaliAccessibilityManagerActionUpSignalP(void)
   manager.ActionUpSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback );
 
   DummyControl dummyControl = DummyControl::New(true);
-  dummyControl.SetSize(480, 800);
+  dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
   manager.SetFocusOrder( dummyControl, 1 );
   Stage::GetCurrent().Add( dummyControl );
   manager.SetCurrentFocusActor( dummyControl );
@@ -1569,7 +1570,7 @@ int UtcDaliAccessibilityManagerActionDownSignalP(void)
   manager.ActionDownSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback );
 
   Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
-  button.SetSize(480, 800);
+  button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
   Stage::GetCurrent().Add(button);
   manager.SetFocusOrder( button, 1 );
   manager.SetCurrentFocusActor( button );
@@ -2097,7 +2098,7 @@ int UtcDaliAccessibilityManagerActionZoomSignalP(void)
   DALI_TEST_CHECK( manager );
 
   Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
-  button.SetSize(480, 800);
+  button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
   Stage::GetCurrent().Add(button);
   manager.SetFocusOrder( button, 1 );
   manager.SetCurrentFocusActor( button );
@@ -2316,7 +2317,7 @@ int UtcDaliAccessibilityManagerActionTouch(void)
 
   DummyControl dummyControl = DummyControl::New(true);
   Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyControl.SetSize(480, 800);
+  dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
   manager.SetFocusOrder( dummyControl, 1 );
   Stage::GetCurrent().Add( dummyControl );
   manager.SetCurrentFocusActor( dummyControl );
@@ -2342,7 +2343,7 @@ int UtcDaliAccessibilityManagerHandlePanGesture(void)
 
   Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
   DummyControl dummyControl = DummyControl::New(true);
-  dummyControl.SetSize(480, 800);
+  dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
   Stage::GetCurrent().Add( dummyControl );
 
   AccessibilityGestureEvent panGestureEvent(AccessibilityGestureEvent::Started);