X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-accessibility-adaptor.cpp;h=72d4106012618747f35dbb0eeeb3e95ef2128b46;hp=5820806e1b5c7b70ebada2af0a92252654c8f406;hb=04807c7be2d762bb23e3865fd2642ace1b3f1855;hpb=f15d6d9faf301bfbc0bdc7dfc9716dc665e76d2a diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp index 5820806..72d4106 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -15,11 +15,12 @@ * */ -#include "toolkit-accessibility-adaptor.h" - -#include #include +#include #include +#include +#include +#include namespace Dali { @@ -48,6 +49,13 @@ public: void MockSetReadPosition( Vector2& position ); + void SetEnabled(bool enabled) + { + mIsEnabled = enabled; + } + + void SendPanGesture( const AccessibilityGestureEvent& panEvent ); + public: bool IsEnabled() const; @@ -56,16 +64,16 @@ public: Vector2 GetReadPosition() const; - bool HandleActionNextEvent(); - bool HandleActionPreviousEvent(); + bool HandleActionNextEvent(bool); + bool HandleActionPreviousEvent(bool); bool HandleActionActivateEvent(); bool HandleActionReadEvent(unsigned int x, unsigned int y, bool allowReadAgain); - bool HandleActionReadNextEvent(); - bool HandleActionReadPreviousEvent(); + bool HandleActionReadNextEvent(bool); + bool HandleActionReadPreviousEvent(bool); bool HandleActionUpEvent(); bool HandleActionDownEvent(); bool HandleActionClearFocusEvent(); - bool HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp); + bool HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp); bool HandleActionBackEvent(); bool HandleActionEnableEvent(); bool HandleActionDisableEvent(); @@ -80,12 +88,9 @@ public: bool HandleActionReadFromTopEvent(); bool HandleActionReadFromNextEvent(); bool HandleActionZoomEvent(); - bool HandleActionReadIndicatorInformationEvent(); bool HandleActionReadPauseResumeEvent(); bool HandleActionStartStopEvent(); -public: // Signals - private: bool mIsEnabled; @@ -110,6 +115,8 @@ Dali::AccessibilityAdaptor AccessibilityAdaptor::Get() AccessibilityAdaptor::AccessibilityAdaptor() : mIsEnabled(false), + mActionHandler(NULL), + mGestureHandler(NULL), mReadPosition( 0.0f, 0.0f ) { } @@ -133,6 +140,11 @@ bool AccessibilityAdaptor::IsEnabled() const return mIsEnabled; } +void AccessibilityAdaptor::SendPanGesture( const AccessibilityGestureEvent& panEvent ) +{ + mGestureHandler->HandlePanGesture( panEvent ); +} + void AccessibilityAdaptor::SetActionHandler(Dali::AccessibilityActionHandler& handler) { mActionHandler = &handler; @@ -143,7 +155,7 @@ void AccessibilityAdaptor::SetGestureHandler(Dali::AccessibilityGestureHandler& mGestureHandler = &handler; } -bool AccessibilityAdaptor::HandleActionNextEvent() +bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback) { if( mActionHandler ) { @@ -152,7 +164,7 @@ bool AccessibilityAdaptor::HandleActionNextEvent() return false; } -bool AccessibilityAdaptor::HandleActionPreviousEvent() +bool AccessibilityAdaptor::HandleActionPreviousEvent(bool allowEndFeedback) { if( mActionHandler ) { @@ -179,7 +191,7 @@ bool AccessibilityAdaptor::HandleActionReadEvent(unsigned int x, unsigned int y, return false; } -bool AccessibilityAdaptor::HandleActionReadNextEvent() +bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback) { if( mActionHandler ) { @@ -188,7 +200,7 @@ bool AccessibilityAdaptor::HandleActionReadNextEvent() return false; } -bool AccessibilityAdaptor::HandleActionReadPreviousEvent() +bool AccessibilityAdaptor::HandleActionReadPreviousEvent(bool allowEndFeedback) { if( mActionHandler ) { @@ -224,13 +236,12 @@ bool AccessibilityAdaptor::HandleActionClearFocusEvent() return false; } -bool AccessibilityAdaptor::HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp) +bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp) { if( mActionHandler ) { - Dali::TouchEvent touchEvent; - touchEvent.points.push_back( point ); - return mActionHandler->AccessibilityActionScroll( touchEvent ); + Dali::TouchEvent touch = Integration::NewTouchEvent(timeStamp, point); + return mActionHandler->AccessibilityActionScroll( touch ); } return false; } @@ -361,15 +372,6 @@ bool AccessibilityAdaptor::HandleActionZoomEvent() return false; } -bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent() -{ - if( mActionHandler ) - { - return mActionHandler->AccessibilityActionReadIndicatorInformation(); - } - return false; -} - bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent() { if( mActionHandler ) @@ -419,13 +421,6 @@ AccessibilityAdaptor::~AccessibilityAdaptor() { } -// Mock setup: - -void AccessibilityAdaptor::MockSetReadPosition( Vector2& position ) -{ - Internal::Adaptor::GetImplementation(*this).MockSetReadPosition( position ); -} - // Methods: Vector2 AccessibilityAdaptor::GetReadPosition() const @@ -435,8 +430,7 @@ Vector2 AccessibilityAdaptor::GetReadPosition() const bool AccessibilityAdaptor::IsEnabled() const { - //return Internal::Adaptor::GetImplementation(*this).IsEnabled(); - return false; + return Internal::Adaptor::GetImplementation(*this).IsEnabled(); } void AccessibilityAdaptor::SetActionHandler(AccessibilityActionHandler& handler) @@ -449,14 +443,14 @@ void AccessibilityAdaptor::SetGestureHandler(AccessibilityGestureHandler& handle Internal::Adaptor::GetImplementation(*this).SetGestureHandler(handler); } -bool AccessibilityAdaptor::HandleActionNextEvent() +bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback) { - return Internal::Adaptor::GetImplementation(*this).HandleActionNextEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionNextEvent(allowEndFeedback); } -bool AccessibilityAdaptor::HandleActionPreviousEvent() +bool AccessibilityAdaptor::HandleActionPreviousEvent(bool allowEndFeedback) { - return Internal::Adaptor::GetImplementation(*this).HandleActionPreviousEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionPreviousEvent(allowEndFeedback); } bool AccessibilityAdaptor::HandleActionActivateEvent() @@ -469,14 +463,14 @@ bool AccessibilityAdaptor::HandleActionReadEvent(unsigned int x, unsigned int y, return Internal::Adaptor::GetImplementation(*this).HandleActionReadEvent( x, y, allowReadAgain ); } -bool AccessibilityAdaptor::HandleActionReadNextEvent() +bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback) { - return Internal::Adaptor::GetImplementation(*this).HandleActionReadNextEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadNextEvent(allowEndFeedback); } -bool AccessibilityAdaptor::HandleActionReadPreviousEvent() +bool AccessibilityAdaptor::HandleActionReadPreviousEvent(bool allowEndFeedback) { - return Internal::Adaptor::GetImplementation(*this).HandleActionReadPreviousEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadPreviousEvent(allowEndFeedback); } bool AccessibilityAdaptor::HandleActionUpEvent() @@ -494,7 +488,7 @@ bool AccessibilityAdaptor::HandleActionClearFocusEvent() return Internal::Adaptor::GetImplementation(*this).HandleActionClearFocusEvent(); } -bool AccessibilityAdaptor::HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp) +bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp) { return Internal::Adaptor::GetImplementation(*this).HandleActionScrollEvent(point, timeStamp); } @@ -569,11 +563,6 @@ bool AccessibilityAdaptor::HandleActionZoomEvent() return Internal::Adaptor::GetImplementation(*this).HandleActionZoomEvent(); } -bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent() -{ - return Internal::Adaptor::GetImplementation(*this).HandleActionReadIndicatorInformationEvent(); -} - bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent() { return Internal::Adaptor::GetImplementation(*this).HandleActionReadPauseResumeEvent(); @@ -590,3 +579,29 @@ AccessibilityAdaptor::AccessibilityAdaptor( Internal::Adaptor::AccessibilityAdap } } // namespace Dali + + +namespace Test +{ +namespace AccessibilityAdaptor +{ + +// Mock setup: + +void MockSetReadPosition( Dali::AccessibilityAdaptor adaptor, Dali::Vector2& position ) +{ + Dali::Internal::Adaptor::GetImplementation(adaptor).MockSetReadPosition( position ); +} + +void SetEnabled( Dali::AccessibilityAdaptor adaptor, bool enabled ) +{ + Dali::Internal::Adaptor::GetImplementation(adaptor).SetEnabled(enabled); +} + +void SendPanGesture( Dali::AccessibilityAdaptor adaptor, const Dali::AccessibilityGestureEvent& panEvent ) +{ + Dali::Internal::Adaptor::GetImplementation(adaptor).SendPanGesture( panEvent ); +} + +} // namespace AccessibilityAdaptor +} // namespace Test