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-AccessibilityManager.cpp;h=5a8b3dc2100809c6c0c5f5fb3c8eddda94dde8cd;hp=dbbbd848b1360da40969450e1fa65b2ec7d58f6b;hb=0d07bc303ad28647afa1342319721384cc37d19f;hpb=d82f43904668532387d5c796aad7aa265d5536d6

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
index dbbbd84..5a8b3dc 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 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.
@@ -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>
@@ -359,7 +360,7 @@ int UtcDaliAccessibilityManagerSetAndGetCurrentFocusActor(void)
   Stage::GetCurrent().Add(third);
 
   // make the third actor invisible
-  third.SetVisible(false);
+  third.SetProperty( Actor::Property::VISIBLE,false);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
@@ -368,7 +369,7 @@ int UtcDaliAccessibilityManagerSetAndGetCurrentFocusActor(void)
   DALI_TEST_CHECK(manager.SetCurrentFocusActor(third) == false);
 
   // Make the third actor visible
-  third.SetVisible(true);
+  third.SetProperty( Actor::Property::VISIBLE,true);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
@@ -631,7 +632,7 @@ int UtcDaliAccessibilityManagerMoveFocusForward(void)
   DALI_TEST_CHECK(manager.GetAccessibilityAttribute(manager.GetCurrentFocusActor(), AccessibilityManager::ACCESSIBILITY_LABEL) == "third");
 
   // Make the first actor invisible
-  first.SetVisible(false);
+  first.SetProperty( Actor::Property::VISIBLE,false);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
@@ -644,7 +645,7 @@ int UtcDaliAccessibilityManagerMoveFocusForward(void)
   DALI_TEST_CHECK(manager.GetAccessibilityAttribute(manager.GetCurrentFocusActor(), AccessibilityManager::ACCESSIBILITY_LABEL) == "third");
 
   // Make the third actor invisible so that no actor can be focused.
-  third.SetVisible(false);
+  third.SetProperty( Actor::Property::VISIBLE,false);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
@@ -748,7 +749,7 @@ int UtcDaliAccessibilityManagerMoveFocusBackward(void)
   DALI_TEST_CHECK(manager.GetAccessibilityAttribute(manager.GetCurrentFocusActor(), AccessibilityManager::ACCESSIBILITY_LABEL) == "first");
 
   // Make the third actor invisible
-  third.SetVisible(false);
+  third.SetProperty( Actor::Property::VISIBLE,false);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
@@ -761,7 +762,7 @@ int UtcDaliAccessibilityManagerMoveFocusBackward(void)
   DALI_TEST_CHECK(manager.GetAccessibilityAttribute(manager.GetCurrentFocusActor(), AccessibilityManager::ACCESSIBILITY_LABEL) == "first");
 
   // Make the first actor invisible so that no actor can be focused.
-  first.SetVisible(false);
+  first.SetProperty( Actor::Property::VISIBLE,false);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
@@ -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 );
@@ -2132,22 +2133,6 @@ int UtcDaliAccessibilityManagerActionZoomSignalN(void)
   END_TEST;
 }
 
-int UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalN(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( " UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalN" );
-
-  AccessibilityManagerSignalHandler callback;
-
-  AccessibilityManager manager = AccessibilityManager::Get();
-  DALI_TEST_CHECK( manager );
-
-  manager.ActionReadIndicatorInformationSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback );
-  DALI_TEST_EQUALS( callback.GetCalls(), 0u, TEST_LOCATION );
-
-  END_TEST;
-}
-
 int UtcDaliAccessibilityManagerActionReadPauseResumeSignalP(void)
 {
   ToolkitTestApplication application;
@@ -2316,7 +2301,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 +2327,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);