X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-AccessibilityManager.cpp;h=9ea8bc3cabe91dfec4fac0a5ec70a27068ac28a6;hb=e5d4cd830e75a208dd18c743e1564a4ed1fde780;hp=23200c089e02af59ad264c82c7124285b4e318ad;hpb=45fc50ae7d1c0b9d33d47da82e2ac8e928e992f9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp index 23200c0..9ea8bc3 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) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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 #include +#include #include #include @@ -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(); @@ -550,6 +551,7 @@ int UtcDaliAccessibilityManagerMoveFocusForward(void) Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get(); Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true ); accAdaptor.HandleActionEnableEvent(); + accAdaptor.HandleActionNextEvent(true); Actor first = Actor::New(); Stage::GetCurrent().Add(first); @@ -630,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(); @@ -643,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(); @@ -747,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(); @@ -760,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(); @@ -1314,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 ); @@ -1523,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 ); @@ -1568,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 ); @@ -2096,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 ); @@ -2131,30 +2133,6 @@ int UtcDaliAccessibilityManagerActionZoomSignalN(void) END_TEST; } -int UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalP(void) -{ - ToolkitTestApplication application; - tet_infoline( " UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalP" ); - - AccessibilityManagerSignalHandler callback; - - Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get(); - Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true ); - accAdaptor.HandleActionEnableEvent(); - - AccessibilityManager manager = AccessibilityManager::Get(); - DALI_TEST_CHECK( manager ); - - manager.ActionReadIndicatorInformationSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback ); - - Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get(); - accessibilityAdaptor.HandleActionReadIndicatorInformationEvent(); - - DALI_TEST_EQUALS( callback.GetCalls(), 1u, TEST_LOCATION ); - - END_TEST; -} - int UtcDaliAccessibilityManagerActionReadIndicatorInformationSignalN(void) { ToolkitTestApplication application; @@ -2339,7 +2317,7 @@ int UtcDaliAccessibilityManagerActionTouch(void) DummyControl dummyControl = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(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 ); @@ -2365,10 +2343,10 @@ 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 ); - Dali::Integration::PanGestureEvent panGestureEvent(Gesture::Started); + AccessibilityGestureEvent panGestureEvent(AccessibilityGestureEvent::Started); panGestureEvent.previousPosition = Vector2(0.f, 0.f); panGestureEvent.currentPosition = Vector2(100.f, 0.f); panGestureEvent.timeDelta = 16; @@ -2376,12 +2354,12 @@ int UtcDaliAccessibilityManagerHandlePanGesture(void) Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent ); - panGestureEvent.state = Gesture::Continuing; + panGestureEvent.state = AccessibilityGestureEvent::Continuing; panGestureEvent.previousPosition = Vector2(100.f, 0.f); panGestureEvent.currentPosition = Vector2(200.f, 0.f); Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent ); - panGestureEvent.state = Gesture::Finished; + panGestureEvent.state = AccessibilityGestureEvent::Finished; panGestureEvent.previousPosition = Vector2(200.f, 0.f); panGestureEvent.currentPosition = Vector2(300.f, 0.f); Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent );