/*
- * Copyright (c) 2015 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.
#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>
namespace
{
-static bool gObjectCreatedCallBackCalled;
-
-static void TestCallback(BaseHandle handle)
-{
- gObjectCreatedCallBackCalled = true;
-}
-
// Functors to test whether focus changed signal is emitted when the focus is changed
class FocusChangedCallback : public Dali::ConnectionTracker
{
tet_infoline(" UtcDaliAccessibilityManagerGet");
- AccessibilityManager manager;
-
- //Ensure object is created by checking if it's registered
- ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
- DALI_TEST_CHECK(registry);
-
- gObjectCreatedCallBackCalled = false;
- registry.ObjectCreatedSignal().Connect( &TestCallback );
- {
- manager = AccessibilityManager::Get();
- DALI_TEST_CHECK(manager);
- }
- DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+ AccessibilityManager manager = AccessibilityManager::Get();
+ DALI_TEST_CHECK(manager);
AccessibilityManager newManager = AccessibilityManager::Get();
DALI_TEST_CHECK(newManager);
DALI_TEST_CHECK(manager.GetActorByFocusOrder(3) == Actor());
// Add the actors to the stage
- Stage::GetCurrent().Add(first);
- Stage::GetCurrent().Add(second);
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(first);
+ application.GetScene().Add(second);
+ application.GetScene().Add(third);
// Check that we get an empty handle because focus order 0 means undefined.
DALI_TEST_CHECK(manager.GetActorByFocusOrder(0) == Actor());
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Create the third actor but don't add it to the stage
Actor third = Actor::New();
DALI_TEST_CHECK(manager.SetCurrentFocusActor(third) == false);
// Add the third actor to the stage
- Stage::GetCurrent().Add(third);
+ application.GetScene().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();
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();
Actor secondChild = Actor::New();
parent.Add(firstChild);
parent.Add(secondChild);
- Stage::GetCurrent().Add(parent);
+ application.GetScene().Add(parent);
// Create three actors and add them as the children of the first child actor
Actor firstGrandChild = Actor::New();
accAdaptor.HandleActionEnableEvent();
Actor first = Actor::New();
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
Actor second = Actor::New();
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
Actor third = Actor::New();
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(third);
// Set the focus order and description for the first actor
manager.SetFocusOrder(first, 1);
Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
accAdaptor.HandleActionEnableEvent();
+ accAdaptor.HandleActionNextEvent(true);
Actor first = Actor::New();
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
Actor second = Actor::New();
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
Actor third = Actor::New();
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(third);
// Set the focus order and description for the first actor
manager.SetFocusOrder(first, 1);
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();
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();
accAdaptor.HandleActionEnableEvent();
Actor first = Actor::New();
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
Actor second = Actor::New();
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
Actor third = Actor::New();
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(third);
// Set the focus order and description for the first actor
manager.SetFocusOrder(first, 1);
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();
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();
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Check that no actor is being focused yet.
DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Check that no actor is being focused yet.
DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
Actor secondChild = Actor::New();
parent.Add(firstChild);
parent.Add(secondChild);
- Stage::GetCurrent().Add(parent);
+ application.GetScene().Add(parent);
// Create three actors and add them as the children of the first child actor
Actor firstGrandChild = Actor::New();
END_TEST;
}
+int UtcDaliAccessibilityManagerSetAndGetFocusIndicatorWithFocusedActor(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline(" UtcDaliAccessibilityManagerSetAndGetFocusIndicatorWithFocusedActor");
+
+ AccessibilityManager manager = AccessibilityManager::Get();
+ DALI_TEST_CHECK(manager);
+
+ Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
+ Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
+ accAdaptor.HandleActionEnableEvent();
+
+ Actor defaultFocusIndicatorActor = manager.GetFocusIndicatorActor();
+ DALI_TEST_CHECK(defaultFocusIndicatorActor);
+
+ Actor focusedActor = Actor::New();
+ application.GetScene().Add( focusedActor );
+
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( focusedActor.GetChildCount(), 0u, TEST_LOCATION );
+
+ manager.SetFocusOrder( focusedActor, 1 );
+ manager.SetCurrentFocusActor( focusedActor );
+
+ DALI_TEST_EQUALS( focusedActor.GetChildCount(), 1u, TEST_LOCATION );
+ DALI_TEST_CHECK( focusedActor.GetChildAt(0) == defaultFocusIndicatorActor );
+
+ Actor newFocusIndicatorActor = Actor::New();
+ manager.SetFocusIndicatorActor( newFocusIndicatorActor );
+ DALI_TEST_CHECK(manager.GetFocusIndicatorActor() == newFocusIndicatorActor);
+ DALI_TEST_EQUALS( focusedActor.GetChildCount(), 1u, TEST_LOCATION );
+ DALI_TEST_CHECK( focusedActor.GetChildAt(0) == newFocusIndicatorActor );
+
+ // Disable Accessibility
+ Test::AccessibilityAdaptor::SetEnabled( accAdaptor, false );
+ accAdaptor.HandleActionEnableEvent();
+
+ DALI_TEST_EQUALS( focusedActor.GetChildCount(), 0u, TEST_LOCATION );
+
+ END_TEST;
+}
+
int UtcDaliAccessibilityManagerSignalFocusChanged(void)
{
ToolkitTestApplication application;
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Check that no actor is being focused yet.
DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Check that the wrap mode is disabled
DALI_TEST_CHECK(manager.GetWrapMode() == false);
AccessibilityManager manager = AccessibilityManager::Get();
DALI_TEST_CHECK( manager );
+ Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
+ Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
+ accAdaptor.HandleActionEnableEvent();
+
+ Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
+ button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
+ application.GetScene().Add(button);
+ manager.SetFocusOrder( button, 1 );
+ manager.SetCurrentFocusActor( button );
+
manager.ActionActivateSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback );
Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
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 );
+ application.GetScene().Add( dummyControl );
manager.SetCurrentFocusActor( dummyControl );
accessibilityAdaptor.HandleActionUpEvent();
manager.ActionDownSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback );
- DummyControl dummyControl = DummyControl::New(true);
- dummyControl.SetSize(480, 800);
- manager.SetFocusOrder( dummyControl, 1 );
- Stage::GetCurrent().Add( dummyControl );
- manager.SetCurrentFocusActor( dummyControl );
+ Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
+ button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
+ application.GetScene().Add(button);
+ manager.SetFocusOrder( button, 1 );
+ manager.SetCurrentFocusActor( button );
accessibilityAdaptor.HandleActionDownEvent();
END_TEST;
}
+
int UtcDaliAccessibilityManagerActionMoveToFirstSignalN(void)
{
ToolkitTestApplication application;
AccessibilityManagerSignalHandler callback;
+ AccessibilityManager manager = AccessibilityManager::Get();
+ DALI_TEST_CHECK( manager );
+
+ Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
+ button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
+ application.GetScene().Add(button);
+ manager.SetFocusOrder( button, 1 );
+ manager.SetCurrentFocusActor( button );
+
Dali::AccessibilityAdaptor accAdaptor = Dali::AccessibilityAdaptor::Get();
Test::AccessibilityAdaptor::SetEnabled( accAdaptor, true );
accAdaptor.HandleActionEnableEvent();
- AccessibilityManager manager = AccessibilityManager::Get();
- DALI_TEST_CHECK( manager );
-
manager.ActionZoomSignal().Connect( &callback, &AccessibilityManagerSignalHandler::Callback );
Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
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;
- 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;
bool Callback( AccessibilityManager& accessibilityManager, const Dali::TouchEvent& touchEvent )
{
mCalls++;
- mTouchEvent = touchEvent;
+ Dali::TouchEvent handle(touchEvent); // Ensure it's ref-counted
+ mTouchEvent = handle;
tet_infoline( "Signal called" );
return true;
}
private:
unsigned int mCalls; ///< Keeps track of how many times the signal has been called.
- Dali::TouchEvent mTouchEvent; ///< Stores the last touch event received.
+ Dali::TouchEvent mTouchEvent ; ///< Stores the last touch event received.
};
int UtcDaliAccessibilityManagerActionScrollSignalP(void)
Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
- TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
+ TouchPoint point( 0, PointState::STARTED, 100.0f, 200.0f );
accessibilityAdaptor.HandleActionScrollEvent( point, 0u );
DALI_TEST_EQUALS( callback.GetCalls(), 1u, TEST_LOCATION );
const TouchEvent& signalTouchEvent = callback.GetTouchEvent();
DALI_TEST_EQUALS( signalTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
- const TouchPoint& signalTouchPoint = signalTouchEvent.GetPoint( 0u );
- DALI_TEST_EQUALS( signalTouchPoint.state, TouchPoint::Started, TEST_LOCATION );
- DALI_TEST_EQUALS( signalTouchPoint.screen.x, 100.0f, TEST_LOCATION );
- DALI_TEST_EQUALS( signalTouchPoint.screen.y, 200.0f, TEST_LOCATION );
+ DALI_TEST_EQUALS( signalTouchEvent.GetState(0), PointState::STARTED, TEST_LOCATION );
+ DALI_TEST_EQUALS( signalTouchEvent.GetScreenPosition(0).x, 100.0f, TEST_LOCATION );
+ DALI_TEST_EQUALS( signalTouchEvent.GetScreenPosition(0).y, 200.0f, TEST_LOCATION );
END_TEST;
}
END_TEST;
}
-int UtcDaliAccessibilityManagerActionTouch(void)
-{
- ToolkitTestApplication application;
- tet_infoline( " UtcDaliAccessibilityManagerActionTouch" );
-
- AccessibilityManager manager = AccessibilityManager::Get();
- DALI_TEST_CHECK( manager );
-
- Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-
- DummyControl dummyControl = DummyControl::New(true);
- DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummyControl.GetImplementation());
- dummyControl.SetSize(480, 800);
- manager.SetFocusOrder( dummyControl, 1 );
- Stage::GetCurrent().Add( dummyControl );
- manager.SetCurrentFocusActor( dummyControl );
-
- TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
- accessibilityAdaptor.HandleActionTouchEvent( point, 0u );
-
- DALI_TEST_CHECK( dummyImpl.onAccTouchedCalled );
-
- END_TEST;
-}
-
-
int UtcDaliAccessibilityManagerHandlePanGesture(void)
{
// Pan gesture sent from adaptor to manager via AccessibilityGestureHandler
Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
DummyControl dummyControl = DummyControl::New(true);
- dummyControl.SetSize(480, 800);
- Stage::GetCurrent().Add( dummyControl );
+ dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
+ application.GetScene().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;
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 );
projects / platform / core / uifw / dali-toolkit.git / blobdiff