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=8cd215b1437827f99422ac9d536f9764e856757c;hp=9ba46caaf33964354161e77a9f726129d419acbd;hb=d07dc4c4a6067ba3080184d862bca40a90d1789c;hpb=2d1ba388f9a941d273e95d729b9662cc1cdad822 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 9ba46ca..8cd215b1 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 @@ -15,9 +15,11 @@ * */ -#include "toolkit-accessibility-adaptor.h" - #include +#include +#include +#include +#include namespace Dali { @@ -42,17 +44,60 @@ public: // Creation & Destruction public: + // Functions to modify mock returns: + + void MockSetReadPosition( Vector2& position ); + + void SetEnabled(bool enabled) + { + mIsEnabled = enabled; + } + + void SendPanGesture( const Dali::Integration::PanGestureEvent& panEvent ); + +public: + bool IsEnabled() const; void SetActionHandler(Dali::AccessibilityActionHandler& handler); void SetGestureHandler(Dali::AccessibilityGestureHandler& handler); -public: // Signals + Vector2 GetReadPosition() const; + + bool HandleActionNextEvent(bool); + bool HandleActionPreviousEvent(bool); + bool HandleActionActivateEvent(); + bool HandleActionReadEvent(unsigned int x, unsigned int y, bool allowReadAgain); + bool HandleActionReadNextEvent(bool); + bool HandleActionReadPreviousEvent(bool); + bool HandleActionUpEvent(); + bool HandleActionDownEvent(); + bool HandleActionClearFocusEvent(); + bool HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp); + bool HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp); + bool HandleActionBackEvent(); + bool HandleActionEnableEvent(); + bool HandleActionDisableEvent(); + bool HandleActionScrollUpEvent(); + bool HandleActionScrollDownEvent(); + bool HandleActionPageLeftEvent(); + bool HandleActionPageRightEvent(); + bool HandleActionPageUpEvent(); + bool HandleActionPageDownEvent(); + bool HandleActionMoveToFirstEvent(); + bool HandleActionMoveToLastEvent(); + bool HandleActionReadFromTopEvent(); + bool HandleActionReadFromNextEvent(); + bool HandleActionZoomEvent(); + bool HandleActionReadIndicatorInformationEvent(); + bool HandleActionReadPauseResumeEvent(); + bool HandleActionStartStopEvent(); private: bool mIsEnabled; Dali::AccessibilityActionHandler* mActionHandler; Dali::AccessibilityGestureHandler* mGestureHandler; + Vector2 mReadPosition; static Dali::AccessibilityAdaptor mToolkitAccessibilityAdaptor; }; @@ -62,7 +107,7 @@ Dali::AccessibilityAdaptor AccessibilityAdaptor::mToolkitAccessibilityAdaptor; Dali::AccessibilityAdaptor AccessibilityAdaptor::Get() { - if( ! mToolkitAccessibilityAdaptor ) + if( !mToolkitAccessibilityAdaptor ) { mToolkitAccessibilityAdaptor = Dali::AccessibilityAdaptor( new Dali::Internal::Adaptor::AccessibilityAdaptor() ); } @@ -70,7 +115,10 @@ Dali::AccessibilityAdaptor AccessibilityAdaptor::Get() } AccessibilityAdaptor::AccessibilityAdaptor() -: mIsEnabled(false) +: mIsEnabled(false), + mActionHandler(NULL), + mGestureHandler(NULL), + mReadPosition( 0.0f, 0.0f ) { } @@ -78,11 +126,26 @@ AccessibilityAdaptor::~AccessibilityAdaptor() { } +Vector2 AccessibilityAdaptor::GetReadPosition() const +{ + return mReadPosition; +} + +void AccessibilityAdaptor::MockSetReadPosition( Vector2& position ) +{ + mReadPosition = position; +} + bool AccessibilityAdaptor::IsEnabled() const { return mIsEnabled; } +void AccessibilityAdaptor::SendPanGesture( const Integration::PanGestureEvent& panEvent ) +{ + mGestureHandler->HandlePanGesture( panEvent ); +} + void AccessibilityAdaptor::SetActionHandler(Dali::AccessibilityActionHandler& handler) { mActionHandler = &handler; @@ -93,12 +156,274 @@ void AccessibilityAdaptor::SetGestureHandler(Dali::AccessibilityGestureHandler& mGestureHandler = &handler; } +bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback) +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionNext( true ); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionPreviousEvent(bool allowEndFeedback) +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionPrevious( true ); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionActivateEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionActivate(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionReadEvent(unsigned int x, unsigned int y, bool allowReadAgain) +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionRead( allowReadAgain ); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback) +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionReadNext( true ); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionReadPreviousEvent(bool allowEndFeedback) +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionReadPrevious( true ); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionUpEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionUp(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionDownEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionDown(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionClearFocusEvent() +{ + if( mActionHandler ) + { + return mActionHandler->ClearAccessibilityFocus(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp) +{ + if( mActionHandler ) + { + Dali::TouchEvent touchEvent; + touchEvent.points.push_back( point ); + return mActionHandler->AccessibilityActionScroll( touchEvent ); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp) +{ + if( mActionHandler ) + { + Dali::TouchEvent touchEvent; + touchEvent.points.push_back( point ); + return mActionHandler->AccessibilityActionTouch( touchEvent ); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionBackEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionBack(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionEnableEvent() +{ + if( mActionHandler ) + { + return mActionHandler->ChangeAccessibilityStatus(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionDisableEvent() +{ + if( mActionHandler ) + { + return mActionHandler->ChangeAccessibilityStatus(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionScrollUpEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionScrollUp(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionScrollDownEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionScrollDown(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionPageLeftEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionPageLeft(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionPageRightEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionPageRight(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionPageUpEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionPageUp(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionPageDownEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionPageDown(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionMoveToFirstEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionMoveToFirst(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionMoveToLastEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionMoveToLast(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionReadFromTopEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionReadFromTop(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionReadFromNextEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionReadFromNext(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionZoomEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionZoom(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionReadIndicatorInformation(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionReadPauseResume(); + } + return false; +} + +bool AccessibilityAdaptor::HandleActionStartStopEvent() +{ + if( mActionHandler ) + { + return mActionHandler->AccessibilityActionStartStop(); + } + return false; +} + static Internal::Adaptor::AccessibilityAdaptor& GetImplementation(Dali::AccessibilityAdaptor& adaptor) { BaseObject& handle = adaptor.GetBaseObject(); return static_cast(handle); } +static const Internal::Adaptor::AccessibilityAdaptor& GetImplementation(const Dali::AccessibilityAdaptor& adaptor) +{ + const BaseObject& handle = adaptor.GetBaseObject(); + return static_cast(handle); +} + } // namespace Adaptor } // namespace Internal @@ -118,16 +443,16 @@ AccessibilityAdaptor::~AccessibilityAdaptor() { } +// Methods: + Vector2 AccessibilityAdaptor::GetReadPosition() const { - //return Internal::Adaptor::GetImplementation(*this).GetReadPosition(); - return Vector2::ZERO; + return Internal::Adaptor::GetImplementation(*this).GetReadPosition(); } bool AccessibilityAdaptor::IsEnabled() const { - //return Internal::Adaptor::GetImplementation(*this).IsEnabled(); - return false; + return Internal::Adaptor::GetImplementation(*this).IsEnabled(); } void AccessibilityAdaptor::SetActionHandler(AccessibilityActionHandler& handler) @@ -140,139 +465,144 @@ void AccessibilityAdaptor::SetGestureHandler(AccessibilityGestureHandler& handle Internal::Adaptor::GetImplementation(*this).SetGestureHandler(handler); } -bool AccessibilityAdaptor::HandleActionNextEvent() +bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback) { - return true; //Internal::Adaptor::GetImplementation(*this).HandleActionNextEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionNextEvent(allowEndFeedback); } -bool AccessibilityAdaptor::HandleActionPreviousEvent() +bool AccessibilityAdaptor::HandleActionPreviousEvent(bool allowEndFeedback) { - return true; //Internal::Adaptor::GetImplementation(*this).HandleActionPreviousEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionPreviousEvent(allowEndFeedback); } bool AccessibilityAdaptor::HandleActionActivateEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionActivateEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionActivateEvent(); } bool AccessibilityAdaptor::HandleActionReadEvent(unsigned int x, unsigned int y, bool allowReadAgain) { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionReadEvent(x, y, allowReadAgain); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadEvent( x, y, allowReadAgain ); } -bool AccessibilityAdaptor::HandleActionReadNextEvent() +bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback) { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionReadNextEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadNextEvent(allowEndFeedback); } -bool AccessibilityAdaptor::HandleActionReadPreviousEvent() +bool AccessibilityAdaptor::HandleActionReadPreviousEvent(bool allowEndFeedback) { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionReadPreviousEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadPreviousEvent(allowEndFeedback); } bool AccessibilityAdaptor::HandleActionUpEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionUpEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionUpEvent(); } bool AccessibilityAdaptor::HandleActionDownEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionDownEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionDownEvent(); } bool AccessibilityAdaptor::HandleActionClearFocusEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).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 true;//Internal::Adaptor::GetImplementation(*this).HandleActionScrollEvent(point, timeStamp); + return Internal::Adaptor::GetImplementation(*this).HandleActionScrollEvent(point, timeStamp); +} + +bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp) +{ + return Internal::Adaptor::GetImplementation(*this).HandleActionTouchEvent(point, timeStamp); } bool AccessibilityAdaptor::HandleActionBackEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionBackEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionBackEvent(); } void AccessibilityAdaptor::HandleActionEnableEvent() { - //Internal::Adaptor::GetImplementation(*this).HandleActionEnableEvent(); + Internal::Adaptor::GetImplementation(*this).HandleActionEnableEvent(); } void AccessibilityAdaptor::HandleActionDisableEvent() { - //Internal::Adaptor::GetImplementation(*this).HandleActionDisableEvent(); + Internal::Adaptor::GetImplementation(*this).HandleActionDisableEvent(); } bool AccessibilityAdaptor::HandleActionScrollUpEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionScrollUpEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionScrollUpEvent(); } bool AccessibilityAdaptor::HandleActionScrollDownEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionScrollDownEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionScrollDownEvent(); } bool AccessibilityAdaptor::HandleActionPageLeftEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionPageLeftEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionPageLeftEvent(); } bool AccessibilityAdaptor::HandleActionPageRightEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionPageRightEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionPageRightEvent(); } bool AccessibilityAdaptor::HandleActionPageUpEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionPageUpEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionPageUpEvent(); } bool AccessibilityAdaptor::HandleActionPageDownEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionPageDownEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionPageDownEvent(); } bool AccessibilityAdaptor::HandleActionMoveToFirstEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionMoveToFirstEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionMoveToFirstEvent(); } bool AccessibilityAdaptor::HandleActionMoveToLastEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionMoveToLastEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionMoveToLastEvent(); } bool AccessibilityAdaptor::HandleActionReadFromTopEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionReadFromTopEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadFromTopEvent(); } bool AccessibilityAdaptor::HandleActionReadFromNextEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionReadFromNextEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadFromNextEvent(); } bool AccessibilityAdaptor::HandleActionZoomEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionZoomEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionZoomEvent(); } bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionReadIndicatorInformationEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadIndicatorInformationEvent(); } bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionReadPauseResumeEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionReadPauseResumeEvent(); } bool AccessibilityAdaptor::HandleActionStartStopEvent() { - return true;//Internal::Adaptor::GetImplementation(*this).HandleActionStartStopEvent(); + return Internal::Adaptor::GetImplementation(*this).HandleActionStartStopEvent(); } AccessibilityAdaptor::AccessibilityAdaptor( Internal::Adaptor::AccessibilityAdaptor* adaptor ) @@ -281,3 +611,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::Integration::PanGestureEvent& panEvent ) +{ + Dali::Internal::Adaptor::GetImplementation(adaptor).SendPanGesture( panEvent ); +} + +} // namespace AccessibilityAdaptor +} // namespace Test