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=a354847ed179781be1e40d6a2f686c802c64faa9;hp=25d014976635a425066795a3df303bcf5e907a74;hb=bf58973c37b31d52707463a1e9cdecdbe91099f6;hpb=ad110f27c01af7e617df158891eef5cf60bf22e6 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp index 25d0149..a354847 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 #include +#include #include #include @@ -282,9 +283,9 @@ int UtcDaliAccessibilityManagerGetActorByFocusOrder(void) 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()); @@ -327,12 +328,12 @@ int UtcDaliAccessibilityManagerSetAndGetCurrentFocusActor(void) // 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(); @@ -356,7 +357,7 @@ int UtcDaliAccessibilityManagerSetAndGetCurrentFocusActor(void) 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.SetProperty( Actor::Property::VISIBLE,false); @@ -425,7 +426,7 @@ int UtcDaliAccessibilityManagerGetCurrentFocusGroup(void) 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(); @@ -491,13 +492,13 @@ int UtcDaliAccessibilityManagerGetCurrentFocusOrder(void) 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); @@ -553,13 +554,13 @@ int UtcDaliAccessibilityManagerMoveFocusForward(void) 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); @@ -670,13 +671,13 @@ int UtcDaliAccessibilityManagerMoveFocusBackward(void) 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); @@ -789,12 +790,12 @@ int UtcDaliAccessibilityManagerClearFocus(void) // 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()); @@ -827,12 +828,12 @@ int UtcDaliAccessibilityManagerReset(void) // 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()); @@ -874,7 +875,7 @@ int UtcDaliAccessibilityManagerFocusGroup(void) 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(); @@ -991,7 +992,7 @@ int UtcDaliAccessibilityManagerSetAndGetFocusIndicatorWithFocusedActor(void) DALI_TEST_CHECK(defaultFocusIndicatorActor); Actor focusedActor = Actor::New(); - Stage::GetCurrent().Add( focusedActor ); + application.GetScene().Add( focusedActor ); application.SendNotification(); application.Render(); @@ -1035,12 +1036,12 @@ int UtcDaliAccessibilityManagerSignalFocusChanged(void) // 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()); @@ -1086,12 +1087,12 @@ int UtcDaliAccessibilityManagerSignalFocusOvershot(void) // 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); @@ -1316,7 +1317,7 @@ int UtcDaliAccessibilityManagerActionActivateSignalP(void) Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New(); button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) ); - Stage::GetCurrent().Add(button); + application.GetScene().Add(button); manager.SetFocusOrder( button, 1 ); manager.SetCurrentFocusActor( button ); @@ -1526,7 +1527,7 @@ int UtcDaliAccessibilityManagerActionUpSignalP(void) DummyControl dummyControl = DummyControl::New(true); 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(); @@ -1570,7 +1571,7 @@ int UtcDaliAccessibilityManagerActionDownSignalP(void) Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New(); button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) ); - Stage::GetCurrent().Add(button); + application.GetScene().Add(button); manager.SetFocusOrder( button, 1 ); manager.SetCurrentFocusActor( button ); @@ -2098,7 +2099,7 @@ int UtcDaliAccessibilityManagerActionZoomSignalP(void) Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New(); button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) ); - Stage::GetCurrent().Add(button); + application.GetScene().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; @@ -2236,7 +2221,8 @@ public: 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; } @@ -2253,7 +2239,7 @@ public: 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) @@ -2278,11 +2264,10 @@ int UtcDaliAccessibilityManagerActionScrollSignalP(void) 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; } @@ -2318,7 +2303,7 @@ int UtcDaliAccessibilityManagerActionTouch(void) Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) ); manager.SetFocusOrder( dummyControl, 1 ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); manager.SetCurrentFocusActor( dummyControl ); TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f ); @@ -2343,7 +2328,7 @@ int UtcDaliAccessibilityManagerHandlePanGesture(void) Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get(); DummyControl dummyControl = DummyControl::New(true); dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); AccessibilityGestureEvent panGestureEvent(AccessibilityGestureEvent::Started); panGestureEvent.previousPosition = Vector2(0.f, 0.f);