From cb36eef8199cd838f5123efc500106c52bbc4d98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= Date: Tue, 22 Sep 2020 15:27:06 +0200 Subject: [PATCH] [AT-SPI] Migrate Accessibility tests to dali-toolkit-internal Change-Id: I129a7bdf1673466b9657a9876f3e1e8afc5308a2 --- .../tct-dali-toolkit-accessibility-core.cpp | 51 ------- .../src/dali-toolkit-internal/CMakeLists.txt | 6 + .../accessibility-test-utils.cpp} | 4 +- .../accessibility-test-utils.h} | 0 .../utc-Dali-Accessibility-Accessible.cpp | 4 +- .../utc-Dali-Accessibility-Controls-BridgeUp.cpp | 161 +++++++++++---------- .../utc-Dali-Accessibility-Controls.cpp | 92 ++++++------ .../utc-Dali-Accessibility-Text.cpp | 60 ++++---- .../utc-Dali-Accessibility-Value.cpp | 4 + 9 files changed, 176 insertions(+), 206 deletions(-) delete mode 100644 automated-tests/src/dali-toolkit-accessibility/tct-dali-toolkit-accessibility-core.cpp rename automated-tests/src/{dali-toolkit-accessibility/dali-toolkit-accessibility-test-utils.cpp => dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp} (99%) rename automated-tests/src/{dali-toolkit-accessibility/dali-toolkit-accessibility-test-utils.h => dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h} (100%) rename automated-tests/src/{dali-toolkit-accessibility => dali-toolkit-internal}/utc-Dali-Accessibility-Accessible.cpp (90%) rename automated-tests/src/{dali-toolkit-accessibility => dali-toolkit-internal}/utc-Dali-Accessibility-Controls-BridgeUp.cpp (79%) rename automated-tests/src/{dali-toolkit-accessibility => dali-toolkit-internal}/utc-Dali-Accessibility-Controls.cpp (89%) rename automated-tests/src/{dali-toolkit-accessibility => dali-toolkit-internal}/utc-Dali-Accessibility-Text.cpp (94%) rename automated-tests/src/{dali-toolkit-accessibility => dali-toolkit-internal}/utc-Dali-Accessibility-Value.cpp (98%) diff --git a/automated-tests/src/dali-toolkit-accessibility/tct-dali-toolkit-accessibility-core.cpp b/automated-tests/src/dali-toolkit-accessibility/tct-dali-toolkit-accessibility-core.cpp deleted file mode 100644 index 77c02c6..0000000 --- a/automated-tests/src/dali-toolkit-accessibility/tct-dali-toolkit-accessibility-core.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include -#include -#include "tct-dali-toolkit-accessibility-core.h" - -int main(int argc, char * const argv[]) -{ - int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT; - - const char* optString = "sf"; - bool optRerunFailed(true); - bool optRunSerially(false); - - int nextOpt = 0; - do - { - nextOpt = getopt( argc, argv, optString ); - switch(nextOpt) - { - case 'f': - optRerunFailed = false; - break; - case 's': - optRunSerially = true; - break; - case '?': - TestHarness::Usage(argv[0]); - exit(TestHarness::EXIT_STATUS_BAD_ARGUMENT); - break; - } - } while( nextOpt != -1 ); - - if( optind == argc ) // no testcase name in argument list - { - if( optRunSerially ) - { - result = TestHarness::RunAll( argv[0], tc_array ); - } - else - { - result = TestHarness::RunAllInParallel( argv[0], tc_array, optRerunFailed ); - } - } - else - { - // optind is index of next argument - interpret as testcase name - result = TestHarness::FindAndRunTestCase(tc_array, argv[optind]); - } - return result; -} diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt index 59cddc8..b7fb71a 100755 --- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt @@ -8,6 +8,11 @@ SET(CAPI_LIB "dali-toolkit-internal") # List of test case sources (Only these get parsed for test cases) SET(TC_SOURCES utc-Dali-AddOns.cpp + utc-Dali-Accessibility-Accessible.cpp + utc-Dali-Accessibility-Controls.cpp + utc-Dali-Accessibility-Controls-BridgeUp.cpp + utc-Dali-Accessibility-Text.cpp + utc-Dali-Accessibility-Value.cpp utc-Dali-BidirectionalSupport.cpp utc-Dali-ColorConversion.cpp utc-Dali-Control-internal.cpp @@ -76,6 +81,7 @@ LIST(APPEND TC_SOURCES dali-toolkit-test-utils/toolkit-text-utils.cpp dali-toolkit-test-utils/dummy-visual.cpp dali-toolkit-test-utils/test-addon-manager.cpp + dali-toolkit-test-utils/accessibility-test-utils.cpp ) PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED diff --git a/automated-tests/src/dali-toolkit-accessibility/dali-toolkit-accessibility-test-utils.cpp b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp similarity index 99% rename from automated-tests/src/dali-toolkit-accessibility/dali-toolkit-accessibility-test-utils.cpp rename to automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp index ea23826..39433b4 100644 --- a/automated-tests/src/dali-toolkit-accessibility/dali-toolkit-accessibility-test-utils.cpp +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace Dali { @@ -282,4 +282,4 @@ namespace Dali { return false; } } -} \ No newline at end of file +} diff --git a/automated-tests/src/dali-toolkit-accessibility/dali-toolkit-accessibility-test-utils.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h similarity index 100% rename from automated-tests/src/dali-toolkit-accessibility/dali-toolkit-accessibility-test-utils.h rename to automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h diff --git a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Accessible.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp similarity index 90% rename from automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Accessible.cpp rename to automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp index 1d8ff59..9c4f611 100644 --- a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Accessible.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp @@ -23,6 +23,7 @@ #include #include +#include void utc_dali_toolkit_accessibility_accessible_startup(void) { @@ -52,7 +53,8 @@ int utcDaliAccessibilityCheckLabelText(void) ToolkitTestApplication application; auto check_box_button = Toolkit::CheckBoxButton::New(); - check_box_button.SetLabelText( "button" ); + //check_box_button.SetLabelText( "button" ); + check_box_button.SetProperty(Toolkit::Button::Property::LABEL, "button"); auto q = Dali::Accessibility::Accessible::Get( check_box_button ); DALI_TEST_CHECK( q ); DALI_TEST_EQUALS( q->GetName(), "button", TEST_LOCATION ); diff --git a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Controls-BridgeUp.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp similarity index 79% rename from automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Controls-BridgeUp.cpp rename to automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp index d678d76..caddd7d 100644 --- a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Controls-BridgeUp.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp @@ -1,14 +1,19 @@ #include -#include +#include #include #include +#include +#include #include #include +#include #include using namespace Dali::Toolkit; -using DBusWrapper = Dali::Accessibility::DBusWrapper; +//using DBusWrapper = Dali::Accessibility::DBusWrapper; // FIXME + +namespace Dali::Accessibility::TestDBusWrapper { struct error {}; } // FIXME void utc_dali_accessibility_controls_bridge_up_startup(void) { @@ -19,7 +24,7 @@ void utc_dali_accessibility_controls_bridge_up_cleanup(void) { test_return_value = TET_PASS; //DBusWrapper::Install({}) is a de-install - DBusWrapper::Install({}); + //DBusWrapper::Install({}); // FIXME } namespace Dali { @@ -75,7 +80,7 @@ int UtcDaliControlAccessibilityName(void) DALI_TEST_EQUALS( "Accessibility_Name" , q->GetName(), TEST_LOCATION ); DALI_TEST_EQUALS( control.GetProperty( DevelControl::Property::ACCESSIBILITY_NAME ).Get< std::string >() , "Accessibility_Name", TEST_LOCATION ); - control.AccessibilityGetNameSignal().Connect( [] (std::string &accessibility_name) { + DevelControl::AccessibilityGetNameSignal(control).Connect( [] (std::string &accessibility_name) { accessibility_name = "Accessibility_Name_With_Callback"; } ); DALI_TEST_EQUALS( "Accessibility_Name_With_Callback" , q->GetName(), TEST_LOCATION ); @@ -100,13 +105,13 @@ int UtcDaliControlAccessibilityDescription(void) DALI_TEST_EQUALS( "" , q->GetDescription(), TEST_LOCATION ); - control.SetProperty( Control::Property::ACCESSIBILITY_DESCRIPTION, "Accessibility_Description" ); + control.SetProperty( DevelControl::Property::ACCESSIBILITY_DESCRIPTION, "Accessibility_Description" ); DALI_TEST_EQUALS( "Accessibility_Description" , q->GetDescription(), TEST_LOCATION ); - auto property = control.GetProperty( Control::Property::ACCESSIBILITY_DESCRIPTION ).Get(); + auto property = control.GetProperty( DevelControl::Property::ACCESSIBILITY_DESCRIPTION ).Get(); DALI_TEST_EQUALS( "Accessibility_Description", property, TEST_LOCATION ); - control.AccessibilityGetDescriptionSignal().Connect( [] (std::string &accessibility_description) { + DevelControl::AccessibilityGetDescriptionSignal(control).Connect( [] (std::string &accessibility_description) { accessibility_description = "Accessibility_Description_With_Callback"; } ); DALI_TEST_EQUALS( "Accessibility_Description_With_Callback" , q->GetDescription(), TEST_LOCATION ); @@ -128,7 +133,7 @@ int UtcDaliControlAccessibilityRole(void) auto role_unknown = Dali::Accessibility::Role::UNKNOWN; auto role_pushbutton = Dali::Accessibility::Role::PUSH_BUTTON; - DALI_TEST_EQUALS( role_unknown,control.GetProperty( Control::Property::ACCESSIBILITY_ROLE ).Get< Dali::Accessibility::Role >(), TEST_LOCATION ); + DALI_TEST_EQUALS( role_unknown,control.GetProperty( DevelControl::Property::ACCESSIBILITY_ROLE ).Get< Dali::Accessibility::Role >(), TEST_LOCATION ); auto q = Dali::Accessibility::Accessible::Get( control ); DALI_TEST_EQUALS( role_unknown , q->GetRole(), TEST_LOCATION); @@ -140,7 +145,7 @@ int UtcDaliControlAccessibilityRole(void) DALI_TEST_EQUALS( "unknown" , TestGetRoleName( q->GetAddress() ), TEST_LOCATION ); DALI_TEST_EQUALS( "unknown" , TestGetLocalizedRoleName( q->GetAddress() ), TEST_LOCATION ); - control.SetProperty( Control::Property::ACCESSIBILITY_ROLE, role_pushbutton ); + control.SetProperty( DevelControl::Property::ACCESSIBILITY_ROLE, role_pushbutton ); DALI_TEST_EQUALS( static_cast< uint32_t >( role_pushbutton ), TestGetRole( q->GetAddress() ), TEST_LOCATION ); DALI_TEST_EQUALS( "push button" ,TestGetRoleName( q->GetAddress() ), TEST_LOCATION ); @@ -164,7 +169,7 @@ int UtcDaliControlAccessibilityState(void) Dali::Accessibility::TestEnableSC( true ); auto states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )}; - auto states = control.GetAccessibilityStates(); + auto states = DevelControl::GetAccessibilityStates(control); DALI_TEST_CHECK( states_by_bridge == states ); Dali::Accessibility::TestEnableSC( false ); @@ -176,7 +181,7 @@ int UtcDaliControlAccessibilityModal(void) { ToolkitTestApplication application; auto control = TextSelectionPopup::New( NULL ); - auto states = control.GetAccessibilityStates(); + auto states = DevelControl::GetAccessibilityStates(control); DALI_TEST_CHECK( states[ Dali::Accessibility::State::MODAL ] ); @@ -188,7 +193,7 @@ int UtcDaliControlAccessibilityHighlightable(void) ToolkitTestApplication application; auto control = Control::New(); - auto noneset = control.GetProperty( Control::Property::ACCESSIBILITY_HIGHLIGHTABLE ); + auto noneset = control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ); DALI_TEST_EQUALS( Property::NONE, noneset.GetType(), TEST_LOCATION ); auto q = Dali::Accessibility::Accessible::Get( control ); @@ -198,16 +203,16 @@ int UtcDaliControlAccessibilityHighlightable(void) auto states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )}; DALI_TEST_CHECK( states_by_bridge[ Dali::Accessibility::State::HIGHLIGHTABLE ] ); - control.SetProperty( Control::Property::ACCESSIBILITY_HIGHLIGHTABLE, true ); - DALI_TEST_EQUALS( Property::BOOLEAN, control.GetProperty( Control::Property::ACCESSIBILITY_HIGHLIGHTABLE ).GetType(), TEST_LOCATION ); - DALI_TEST_EQUALS( true, control.GetProperty( Control::Property::ACCESSIBILITY_HIGHLIGHTABLE ).Get< bool >(), TEST_LOCATION ); + control.SetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true ); + DALI_TEST_EQUALS( Property::BOOLEAN, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).GetType(), TEST_LOCATION ); + DALI_TEST_EQUALS( true, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).Get< bool >(), TEST_LOCATION ); states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )}; DALI_TEST_CHECK( states_by_bridge[ Dali::Accessibility::State::HIGHLIGHTABLE ] ); - control.SetProperty( Control::Property::ACCESSIBILITY_HIGHLIGHTABLE, false ); - DALI_TEST_EQUALS( Property::BOOLEAN, control.GetProperty( Control::Property::ACCESSIBILITY_HIGHLIGHTABLE ).GetType(), TEST_LOCATION ); - DALI_TEST_EQUALS( false, control.GetProperty( Control::Property::ACCESSIBILITY_HIGHLIGHTABLE ).Get< bool >(), TEST_LOCATION ); + control.SetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, false ); + DALI_TEST_EQUALS( Property::BOOLEAN, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).GetType(), TEST_LOCATION ); + DALI_TEST_EQUALS( false, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).Get< bool >(), TEST_LOCATION ); states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )}; DALI_TEST_CHECK( !states_by_bridge[ Dali::Accessibility::State::HIGHLIGHTABLE ] ); @@ -238,7 +243,7 @@ int UtcDaliControlAccessibilityHighlightBridgeUp(void) DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] ); DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] ); - DALI_TEST_EQUALS( true, controla.GrabAccessibilityHighlight(), TEST_LOCATION ); + DALI_TEST_EQUALS( true, DevelControl::GrabAccessibilityHighlight(controla), TEST_LOCATION ); states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )}; states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )}; @@ -246,8 +251,8 @@ int UtcDaliControlAccessibilityHighlightBridgeUp(void) DALI_TEST_CHECK( states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] ); DALI_TEST_CHECK( !states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] ); - DALI_TEST_EQUALS( true, controlb.GrabAccessibilityHighlight(), TEST_LOCATION ); - DALI_TEST_EQUALS( true, controlb.GrabAccessibilityHighlight(), TEST_LOCATION ); + DALI_TEST_EQUALS( true, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION ); + DALI_TEST_EQUALS( true, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION ); states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )}; states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )}; @@ -255,7 +260,7 @@ int UtcDaliControlAccessibilityHighlightBridgeUp(void) DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] ); DALI_TEST_CHECK( states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] ); - DALI_TEST_EQUALS( false, controla.ClearAccessibilityHighlight(), TEST_LOCATION ); + DALI_TEST_EQUALS( false, DevelControl::ClearAccessibilityHighlight(controla), TEST_LOCATION ); states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )}; states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )}; @@ -263,7 +268,7 @@ int UtcDaliControlAccessibilityHighlightBridgeUp(void) DALI_TEST_CHECK( !states_by_bridge_a[ Dali::Accessibility::State::HIGHLIGHTED ] ); DALI_TEST_CHECK( states_by_bridge_b[ Dali::Accessibility::State::HIGHLIGHTED ] ); - DALI_TEST_EQUALS( true, controlb.ClearAccessibilityHighlight(), TEST_LOCATION ); + DALI_TEST_EQUALS( true, DevelControl::ClearAccessibilityHighlight(controlb), TEST_LOCATION ); states_by_bridge_a = Dali::Accessibility::States { TestGetStates( a->GetAddress() )}; states_by_bridge_b = Dali::Accessibility::States { TestGetStates( b->GetAddress() )}; @@ -309,33 +314,33 @@ int utcDaliAccessibilityControlAttributes(void) std::string value; - auto attributes = check_box_button.GetProperty( Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES ); + auto attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES ); auto attributes_map = attributes.GetMap(); auto position = attributes_map->Find( "access_key1" ); DALI_TEST_CHECK( !position ); - check_box_button.AppendAccessibilityAttribute( "access_key1", "access_value1" ); - attributes = check_box_button.GetProperty( Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES ); + DevelControl::AppendAccessibilityAttribute( check_box_button, "access_key1", "access_value1" ); + attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES ); attributes_map = attributes.GetMap(); DALI_TEST_EQUALS( (attributes_map->Find( "access_key1" ))->Get(), "access_value1", TEST_LOCATION ); - check_box_button.AppendAccessibilityAttribute( "access_key2", "access_value2_a" ); - attributes = check_box_button.GetProperty( Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES ); + DevelControl::AppendAccessibilityAttribute( check_box_button, "access_key2", "access_value2_a" ); + attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES ); attributes_map = attributes.GetMap(); DALI_TEST_EQUALS( (attributes_map->Find( "access_key1" ))->Get(), "access_value1", TEST_LOCATION ); DALI_TEST_EQUALS( (attributes_map->Find( "access_key2" ))->Get(), "access_value2_a", TEST_LOCATION ); - check_box_button.AppendAccessibilityAttribute( "access_key2", "access_value2_b" ); - attributes = check_box_button.GetProperty( Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES ); + DevelControl::AppendAccessibilityAttribute( check_box_button, "access_key2", "access_value2_b" ); + attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES ); attributes_map = attributes.GetMap(); DALI_TEST_EQUALS( (attributes_map->Find( "access_key2" ))->Get(), "access_value2_b", TEST_LOCATION ); - check_box_button.RemoveAccessibilityAttribute( "access_key2" ); - attributes = check_box_button.GetProperty( Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES ); + DevelControl::RemoveAccessibilityAttribute( check_box_button, "access_key2" ); + attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES ); attributes_map = attributes.GetMap(); // In case when we are removing one of attributes the property is setting for NONE type. @@ -355,8 +360,8 @@ int utcDaliAccessibilityControlAttributes(void) for (auto it : attribute_map_bridge) DALI_TEST_EQUALS( (attributes_map->Find( it.first ))->Get(), it.second, TEST_LOCATION ); - check_box_button.ClearAccessibilityAttributes(); - attributes = check_box_button.GetProperty( Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES ); + DevelControl::ClearAccessibilityAttributes(check_box_button); + attributes = check_box_button.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES ); attributes_map = attributes.GetMap(); position = attributes_map->Find( "access_key1" ); @@ -375,19 +380,19 @@ int UtcDaliControlReadingInfoType(void) ToolkitTestApplication application; auto control = Control::New(); - auto reading_info_type = control.GetAccessibilityReadingInfoType(); - reading_info_type[Dali::Accessibility::ReadingInfoType::Description] = true; - reading_info_type[Dali::Accessibility::ReadingInfoType::State] = true; - reading_info_type[Dali::Accessibility::ReadingInfoType::Name] = true; - reading_info_type[Dali::Accessibility::ReadingInfoType::Role] = true; + auto reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control); + reading_info_type[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = true; + reading_info_type[Dali::Accessibility::ReadingInfoType::STATE] = true; + reading_info_type[Dali::Accessibility::ReadingInfoType::NAME] = true; + reading_info_type[Dali::Accessibility::ReadingInfoType::ROLE] = true; - control.SetAccessibilityReadingInfoType(reading_info_type); + DevelControl::SetAccessibilityReadingInfoType(control, reading_info_type); - auto q = control.GetProperty( Toolkit::Control::Property::ACCESSIBILITY_ATTRIBUTES ); + auto q = control.GetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES ); auto z = q.GetMap(); DALI_TEST_EQUALS( (z->Find( "reading_info_type" ))->Get(), "name|role|description|state", TEST_LOCATION ); - reading_info_type = control.GetAccessibilityReadingInfoType(); + reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control); for ( auto i = 0u; i < 4; ++i) DALI_TEST_CHECK ( reading_info_type[ static_cast< Dali::Accessibility::ReadingInfoType >( i ) ]); @@ -401,24 +406,24 @@ int UtcDaliControlDoGesture(void) Dali::Accessibility::TestEnableSC( true ); auto accessible = Dali::Accessibility::Accessible::Get( control ); - auto gesture_one = Dali::Accessibility::GestureInfo { Dali::Accessibility::Gesture::OneFingerFlickLeft, 600, 100, 500, 500, Dali::Accessibility::GestureState::Begin, 1000 }; - auto gesture_two = Dali::Accessibility::GestureInfo { Dali::Accessibility::Gesture::OneFingerFlickRight, 600, 100, 500, 500, Dali::Accessibility::GestureState::Begin, 1000 }; + auto gesture_one = Dali::Accessibility::GestureInfo { Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 }; + auto gesture_two = Dali::Accessibility::GestureInfo { Dali::Accessibility::Gesture::ONE_FINGER_FLICK_RIGHT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 }; DALI_TEST_CHECK( !accessible->DoGesture( gesture_one ) ); - DALI_TEST_CHECK( !TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::OneFingerFlickLeft, 600, 100, 500, 500, Dali::Accessibility::GestureState::Begin, 1000 ) ); + DALI_TEST_CHECK( !TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 ) ); - control.AccessibilityDoGestureSignal().Connect( [] ( std::pair< Dali::Accessibility::GestureInfo, bool > &gesture ) { - if ( gesture.first.type == Dali::Accessibility::Gesture::OneFingerFlickLeft ) + DevelControl::AccessibilityDoGestureSignal(control).Connect( [] ( std::pair< Dali::Accessibility::GestureInfo, bool > &gesture ) { + if ( gesture.first.type == Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT ) gesture.second = true; else gesture.second = false; } ); DALI_TEST_CHECK( accessible->DoGesture( gesture_one ) ); - DALI_TEST_CHECK( TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::OneFingerFlickLeft, 600, 100, 500, 500, Dali::Accessibility::GestureState::Begin, 1000 ) ); + DALI_TEST_CHECK( TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_LEFT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 ) ); DALI_TEST_CHECK( !accessible->DoGesture( gesture_two ) ); - DALI_TEST_CHECK( !TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::OneFingerFlickRight, 600, 100, 500, 500, Dali::Accessibility::GestureState::Begin, 1000 ) ); + DALI_TEST_CHECK( !TestDoGesture( accessible->GetAddress(), Dali::Accessibility::Gesture::ONE_FINGER_FLICK_RIGHT, 600, 100, 500, 500, Dali::Accessibility::GestureState::BEGIN, 1000 ) ); Dali::Accessibility::TestEnableSC( false ); @@ -430,18 +435,18 @@ int UtcDaliAccessibilityRelation(void) ToolkitTestApplication application; Dali::Accessibility::TestEnableSC( true ); - auto rel = Accessibility::RelationType::FlowsTo; + auto rel = Accessibility::RelationType::FLOWS_TO; auto number = static_cast< size_t >( rel ); auto control = Control::New(); auto destination1 = Control::New(); auto destination2 = Control::New(); - control.AppendAccessibilityRelation( destination1, rel ); - auto relations = control.GetAccessibilityRelations(); + DevelControl::AppendAccessibilityRelation( control, destination1, rel ); + auto relations = DevelControl::GetAccessibilityRelations(control); DALI_TEST_CHECK( relations[ number ].size() == 1 ); - control.AppendAccessibilityRelation( destination2, rel ); - relations = control.GetAccessibilityRelations(); + DevelControl::AppendAccessibilityRelation( control, destination2, rel ); + relations = DevelControl::GetAccessibilityRelations(control); DALI_TEST_CHECK( relations[ number ].size() == 2 ); auto accessible = Dali::Accessibility::Accessible::Get( control ); @@ -459,12 +464,12 @@ int UtcDaliAccessibilityRelation(void) DALI_TEST_CHECK( relationset[0].targets[0] == std::get<1>( relationset_bridge[0] )[0] || relationset[0].targets[1] == std::get<1>( relationset_bridge[0] )[0] ); DALI_TEST_CHECK( relationset[0].targets[0] == std::get<1>( relationset_bridge[0] )[1] || relationset[0].targets[1] == std::get<1>( relationset_bridge[0] )[1] ); - control.RemoveAccessibilityRelation(destination2,rel); - relations = control.GetAccessibilityRelations(); + DevelControl::RemoveAccessibilityRelation(control,destination2,rel); + relations = DevelControl::GetAccessibilityRelations(control); DALI_TEST_CHECK( relations[ number ].size() == 1 ); - control.ClearAccessibilityRelations(); - relations = control.GetAccessibilityRelations(); + DevelControl::ClearAccessibilityRelations(control); + relations = DevelControl::GetAccessibilityRelations(control); DALI_TEST_CHECK( relations[ number ].size() == 0 ); Dali::Accessibility::TestEnableSC( false ); @@ -538,8 +543,8 @@ int UtcDaliAccessibilityGetLayer(void) auto accessible_obj = Dali::Accessibility::Accessible::Get( control ); auto accessible_component = dynamic_cast(accessible_obj); DALI_TEST_CHECK( accessible_component ); - DALI_TEST_EQUALS( Dali::Accessibility::ComponentLayer::Window, accessible_component -> GetLayer(), TEST_LOCATION ); - DALI_TEST_EQUALS( Dali::Accessibility::ComponentLayer::Window, TestGetLayer( accessible_component -> GetAddress() ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::Accessibility::ComponentLayer::WINDOW, accessible_component -> GetLayer(), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::Accessibility::ComponentLayer::WINDOW, TestGetLayer( accessible_component -> GetAddress() ), TEST_LOCATION ); Dali::Accessibility::TestEnableSC( false ); @@ -558,8 +563,8 @@ int UtcDaliAccessibilityGrabFocus(void) Stage::GetCurrent().Add( controla ); Stage::GetCurrent().Add( controlb ); - controla.SetKeyboardFocusable( true ); - controlb.SetKeyboardFocusable( true ); + controla.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true); + controlb.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true); auto a = Dali::Accessibility::Accessible::Get( controla ); auto b = Dali::Accessibility::Accessible::Get( controlb ); @@ -603,8 +608,8 @@ int UtcDaliAccessibilityGetExtents(void) auto control = Control::New(); Stage::GetCurrent().GetRootLayer().Add( control ); - control.SetPosition(Vector3(10,10,100)); - control.SetSize( Vector2( 10, 10 ) ); + control.SetProperty(Actor::Property::POSITION, Vector3(10, 10, 100)); + control.SetProperty(Actor::Property::SIZE, Vector2(10, 10)); application.SendNotification(); application.Render( 1 ); @@ -612,11 +617,11 @@ int UtcDaliAccessibilityGetExtents(void) auto a = Dali::Accessibility::Accessible::Get( control ); auto a_component = dynamic_cast( a ); - auto extents = a_component->GetExtents(Dali::Accessibility::CoordType::Screen); - DALI_TEST_EQUALS( extents.position.x, 5, TEST_LOCATION ); - DALI_TEST_EQUALS( extents.position.y, 5, TEST_LOCATION ); - DALI_TEST_EQUALS( extents.size.height, 10, TEST_LOCATION ); - DALI_TEST_EQUALS( extents.size.width, 10, TEST_LOCATION ); + auto extents = a_component->GetExtents(Dali::Accessibility::CoordType::SCREEN); + DALI_TEST_EQUALS( extents.x, 5.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( extents.y, 5.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION ); auto bridge_extents = TestGetExtents( a_component -> GetAddress() ); DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 5, TEST_LOCATION ); @@ -628,11 +633,11 @@ int UtcDaliAccessibilityGetExtents(void) application.SendNotification(); application.Render( 1 ); - extents = a_component->GetExtents(Dali::Accessibility::CoordType::Screen); - DALI_TEST_EQUALS( extents.position.x, 10, TEST_LOCATION ); - DALI_TEST_EQUALS( extents.position.y, 10, TEST_LOCATION ); - DALI_TEST_EQUALS( extents.size.height, 10, TEST_LOCATION ); - DALI_TEST_EQUALS( extents.size.width, 10, TEST_LOCATION ); + extents = a_component->GetExtents(Dali::Accessibility::CoordType::SCREEN); + DALI_TEST_EQUALS( extents.x, 10.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( extents.y, 10.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION ); bridge_extents = TestGetExtents( a_component -> GetAddress() ); DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 10, TEST_LOCATION ); @@ -794,16 +799,16 @@ int UtcDaliAccessibilityDoAction(void) DALI_TEST_CHECK( b -> DoAction( actions[4] ) ); DALI_TEST_CHECK( b -> DoAction( actions[4] ) ); - control.AccessibilityReadingSkippedSignal().Connect( [] () { + DevelControl::AccessibilityReadingSkippedSignal(control).Connect( [] () { actions_done[ 1 ] = true; } ); - control.AccessibilityReadingCancelledSignal().Connect( [] () { + DevelControl::AccessibilityReadingCancelledSignal(control).Connect( [] () { actions_done[ 2 ] = true; } ); - control.AccessibilityReadingStoppedSignal().Connect( [] () { + DevelControl::AccessibilityReadingStoppedSignal(control).Connect( [] () { actions_done[ 3 ] = true; } ); - control.AccessibilityActivateSignal().Connect( [] () { + DevelControl::AccessibilityActivateSignal(control).Connect( [] () { actions_done[ 0 ] = true; } ); diff --git a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Controls.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp similarity index 89% rename from automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Controls.cpp rename to automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp index bdfdc1b..43c3707 100644 --- a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Controls.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp @@ -1,10 +1,14 @@ #include -#include +#include #include +#include +#include +#include + using namespace Dali::Toolkit; -using DBusWrapper = Dali::Accessibility::DBusWrapper; +//using DBusWrapper = Dali::Accessibility::DBusWrapper; // FIXME void utc_dali_accessibility_controls_startup(void) { @@ -15,7 +19,7 @@ void utc_dali_accessibility_controls_cleanup(void) { test_return_value = TET_PASS; //DBusWrapper::Install({}) is a de-install - DBusWrapper::Install({}); + //DBusWrapper::Install({}); // FIXME } int UtcDaliControlPropertyAccessibilityTranslationDomain(void) @@ -24,7 +28,7 @@ int UtcDaliControlPropertyAccessibilityTranslationDomain(void) auto control = Control::New(); - auto accessibility_translation_domain = Control::Property::ACCESSIBILITY_TRANSLATION_DOMAIN; + auto accessibility_translation_domain = DevelControl::Property::ACCESSIBILITY_TRANSLATION_DOMAIN; DALI_TEST_EQUALS( Property::NONE , control.GetProperty( accessibility_translation_domain ).GetType(), TEST_LOCATION ); control.SetProperty( accessibility_translation_domain, "translation_domain_test_1" ); @@ -44,10 +48,10 @@ int UtcDaliControlAccessibilityHighlight(void) auto controla = Control::New(); auto controlb = Control::New(); - DALI_TEST_EQUALS( false, controla.GrabAccessibilityHighlight(), TEST_LOCATION ); - DALI_TEST_EQUALS( false, controlb.GrabAccessibilityHighlight(), TEST_LOCATION ); - DALI_TEST_EQUALS( false, controla.ClearAccessibilityHighlight(), TEST_LOCATION ); - DALI_TEST_EQUALS( false, controlb.ClearAccessibilityHighlight(), TEST_LOCATION ); + DALI_TEST_EQUALS( false, DevelControl::GrabAccessibilityHighlight(controla), TEST_LOCATION ); + DALI_TEST_EQUALS( false, DevelControl::GrabAccessibilityHighlight(controlb), TEST_LOCATION ); + DALI_TEST_EQUALS( false, DevelControl::ClearAccessibilityHighlight(controla), TEST_LOCATION ); + DALI_TEST_EQUALS( false, DevelControl::ClearAccessibilityHighlight(controlb), TEST_LOCATION ); END_TEST; } @@ -62,7 +66,7 @@ int UtcDaliAccessibilityToolBarConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( toolbar ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ToolBar, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::TOOL_BAR, TEST_LOCATION ); END_TEST; } @@ -76,7 +80,7 @@ int UtcDaliAccessibilityPushButtonConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( pushbutton ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::PushButton, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::PUSH_BUTTON, TEST_LOCATION ); END_TEST; } @@ -94,14 +98,14 @@ int UtcDaliAccessibilityPushButtonStates(void) Dali::Accessibility::TestEnableSC( true ); auto states = accessible->GetStates(); - DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::Pressed ] ), false, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::PRESSED ] ), false, TEST_LOCATION ); // auto button = dynamic_cast( accessible ) ; pushbutton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true ); pushbutton.SetProperty( Toolkit::Button::Property::SELECTED, true ); states = accessible->GetStates(); - DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::Pressed ] ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::PRESSED ] ), true, TEST_LOCATION ); Dali::Accessibility::TestEnableSC( false ); @@ -118,7 +122,7 @@ int UtcDaliAccessibilityToggleButtonConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( togglebutton ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ToggleButton, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::TOGGLE_BUTTON, TEST_LOCATION ); END_TEST; } @@ -133,7 +137,7 @@ int UtcDaliAccessibilityTextSelectionPopupConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( textselectionpopup ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Dialog, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::DIALOG, TEST_LOCATION ); END_TEST; } @@ -147,7 +151,7 @@ int UtcDaliAccessibilityAlignmentConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( alignment ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Filler, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION ); END_TEST; } @@ -166,11 +170,11 @@ int UtcDaliAccessibilityRadioButtonStates(void) auto states = accessible->GetStates(); DALI_TEST_CHECK( states ); - DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::Checked ] ), false, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::CHECKED ] ), false, TEST_LOCATION ); radiobutton.SetProperty( Toolkit::RadioButton::Property::SELECTED, true ); states = accessible->GetStates(); DALI_TEST_CHECK( states ); - DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::Checked ] ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::CHECKED ] ), true, TEST_LOCATION ); Dali::Accessibility::TestEnableSC( false ); @@ -186,7 +190,7 @@ int UtcDaliAccessibilityFlexContainerConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( flexcontainer ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Filler, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION ); END_TEST; } @@ -204,10 +208,10 @@ int UtcDaliAccessibilityCheckBoxButton(void) Dali::Accessibility::TestEnableSC( true ); auto states = accessible->GetStates(); - DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::Checked ] ), false, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::CHECKED ] ), false, TEST_LOCATION ); checkboxbutton.SetProperty( Toolkit::CheckBoxButton::Property::SELECTED, true ); states = accessible->GetStates(); - DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::Checked ] ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::CHECKED ] ), true, TEST_LOCATION ); Dali::Accessibility::TestEnableSC( false ); @@ -224,7 +228,7 @@ int UtcDaliAccessibilityTextSelectionConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( textselectiontoolbar ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ToolBar, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::TOOL_BAR, TEST_LOCATION ); END_TEST; } @@ -268,7 +272,7 @@ int UtcDaliAccessibilityModel3dViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( model3dview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Image, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::IMAGE, TEST_LOCATION ); END_TEST; } @@ -284,7 +288,7 @@ int UtcDaliAccessibilityEffectsViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( effectsview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Filler, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION ); END_TEST; } @@ -299,7 +303,7 @@ int UtcDaliAccessibilitySuperBlurViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( superblurview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Filler, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION ); END_TEST; } @@ -313,7 +317,7 @@ int UtcDaliAccessibilityImageViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( imageview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Image, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::IMAGE, TEST_LOCATION ); END_TEST; } @@ -369,7 +373,7 @@ int UtcDaliAccessibilityPageTurnViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( pageturnlandscapeview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::PageTabList, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::PAGE_TAB_LIST, TEST_LOCATION ); END_TEST; } @@ -383,7 +387,7 @@ int UtcDaliAccessibilityGaussianBlurViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( gaussianblurview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Filler, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION ); END_TEST; } @@ -397,7 +401,7 @@ int UtcDaliAccessibilityShadowViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( shadowview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Filler, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION ); END_TEST; } @@ -413,7 +417,7 @@ int UtcDaliAccessibilityScrollableConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( scrollview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ScrollPane, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::SCROLL_PANE, TEST_LOCATION ); END_TEST; } @@ -428,7 +432,7 @@ int UtcDaliAccessibilityMagnifierConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( magnifier ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Filler, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::FILLER, TEST_LOCATION ); END_TEST; } @@ -442,7 +446,7 @@ int UtcDaliAccessibilityTableViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( tableview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Table, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::TABLE, TEST_LOCATION ); END_TEST; } @@ -457,7 +461,7 @@ int UtcDaliAccessibilityBloomViewConstructor(void) auto accessible = Dali::Accessibility::Accessible::Get( bloomview ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Animation, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ANIMATION, TEST_LOCATION ); END_TEST; } @@ -470,16 +474,16 @@ int UtcDaliAccessibilityTextField(void) auto textfield = TextField::New(); DALI_TEST_CHECK( textfield ); - textfield.SetName( "test" ); - DALI_TEST_EQUALS( textfield.GetName(), "test", TEST_LOCATION ); + textfield.SetProperty(Actor::Property::NAME, "test" ); + DALI_TEST_EQUALS( textfield.GetProperty(Actor::Property::NAME), "test", TEST_LOCATION ); auto accessible = Dali::Accessibility::Accessible::Get( textfield ); DALI_TEST_CHECK( accessible ); DALI_TEST_EQUALS( accessible->GetName(), "", TEST_LOCATION ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Entry, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ENTRY, TEST_LOCATION ); auto states = accessible->GetStates(); - DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::Editable ] ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::EDITABLE ] ), true, TEST_LOCATION ); Dali::Accessibility::TestEnableSC( true ); @@ -519,16 +523,16 @@ int UtcDaliAccessibilityTextEditor(void) auto texteditor = TextEditor::New(); DALI_TEST_CHECK( texteditor ); - texteditor.SetName( "test" ); - DALI_TEST_EQUALS( texteditor.GetName(), "test", TEST_LOCATION ); + texteditor.SetProperty(Actor::Property::NAME, "test" ); + DALI_TEST_EQUALS( texteditor.GetProperty(Actor::Property::NAME), "test", TEST_LOCATION ); auto accessible = Dali::Accessibility::Accessible::Get( texteditor ); DALI_TEST_CHECK( accessible ); DALI_TEST_EQUALS( accessible->GetName(), "", TEST_LOCATION ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Entry, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::ENTRY, TEST_LOCATION ); auto states = accessible->GetStates(); - DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::Editable ] ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( static_cast< unsigned int >( states[ Accessibility::State::EDITABLE ] ), true, TEST_LOCATION ); Dali::Accessibility::TestEnableSC( true ); @@ -567,14 +571,14 @@ int UtcDaliAccessibilityTextLabel(void) auto textlabel = TextLabel::New(); DALI_TEST_CHECK( textlabel ); - textlabel.SetName( "test" ); - DALI_TEST_EQUALS( textlabel.GetName(), "test", TEST_LOCATION ); + textlabel.SetProperty(Actor::Property::NAME, "test" ); + DALI_TEST_EQUALS( textlabel.GetProperty(Actor::Property::NAME), "test", TEST_LOCATION ); auto accessible = Dali::Accessibility::Accessible::Get( textlabel ); DALI_TEST_CHECK( accessible ); DALI_TEST_EQUALS( accessible->GetName(), "", TEST_LOCATION ); - DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::Label, TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::LABEL, TEST_LOCATION ); Dali::Accessibility::TestEnableSC( true ); @@ -627,4 +631,4 @@ int UtcDaliAccessibilityVideoViewConstructor(void) DALI_TEST_EQUALS( accessible->GetRole(), Dali::Accessibility::Role::VIDEO, TEST_LOCATION ); END_TEST; -} \ No newline at end of file +} diff --git a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Text.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Text.cpp similarity index 94% rename from automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Text.cpp rename to automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Text.cpp index 72af462..5d5a9a2 100644 --- a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Text.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Text.cpp @@ -40,9 +40,9 @@ int utcDaliAccessibilityTextEditorGetName(void) ToolkitTestApplication application; auto editor = Dali::Toolkit::TextEditor::New(); - DALI_TEST_EQUALS( editor.GetName(), "", TEST_LOCATION ); - editor.SetName("editor"); - DALI_TEST_EQUALS( editor.GetName(), "editor", TEST_LOCATION ); + DALI_TEST_EQUALS( editor.GetProperty(Actor::Property::NAME), "", TEST_LOCATION ); + editor.SetProperty(Actor::Property::NAME, "editor"); + DALI_TEST_EQUALS( editor.GetProperty(Actor::Property::NAME), "editor", TEST_LOCATION ); END_TEST; } @@ -93,43 +93,43 @@ int utcDaliAccessibilityTextEditorGetTextAtOffset(void) DALI_TEST_CHECK( x ); if( x ) { - auto range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::Line ); + auto range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, "", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION ); editor.SetProperty( Toolkit::TextEditor::Property::TEXT, "text editor test sentence" ); - range = x->GetTextAtOffset( 5, Dali::Accessibility::TextBoundary::Character ); + range = x->GetTextAtOffset( 5, Dali::Accessibility::TextBoundary::CHARACTER ); DALI_TEST_EQUALS( range.content, "e", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 5, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 6, TEST_LOCATION ); editor.SetProperty( Toolkit::TextEditor::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 3, Dali::Accessibility::TextBoundary::Word ); + range = x->GetTextAtOffset( 3, Dali::Accessibility::TextBoundary::WORD ); DALI_TEST_EQUALS( range.content, "sentence", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 28, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 36, TEST_LOCATION ); editor.SetProperty( Toolkit::TextEditor::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 4, Dali::Accessibility::TextBoundary::Word ); + range = x->GetTextAtOffset( 4, Dali::Accessibility::TextBoundary::WORD ); DALI_TEST_EQUALS( range.content, "", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION ); editor.SetProperty( Toolkit::TextEditor::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, "text \n", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 9, TEST_LOCATION ); editor.SetProperty( Toolkit::TextEditor::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 6, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 6, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, " editor \n", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 14, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 24, TEST_LOCATION ); editor.SetProperty( Toolkit::TextEditor::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 8, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 8, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, " test sentence", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 25, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 39, TEST_LOCATION ); @@ -198,9 +198,9 @@ int utcDaliAccessibilityTextFieldGetName(void) ToolkitTestApplication application; auto field = Toolkit::TextField::New(); - DALI_TEST_EQUALS( field.GetName(), "", TEST_LOCATION ); - field.SetName("field"); - DALI_TEST_EQUALS( field.GetName(), "field", TEST_LOCATION ); + DALI_TEST_EQUALS( field.GetProperty(Actor::Property::NAME), "", TEST_LOCATION ); + field.SetProperty(Actor::Property::NAME, "field"); + DALI_TEST_EQUALS( field.GetProperty(Actor::Property::NAME), "field", TEST_LOCATION ); END_TEST; } @@ -251,43 +251,43 @@ int utcDaliAccessibilityTextFieldGetTextAtOffset(void) DALI_TEST_CHECK( x ); if( x ) { - auto range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::Line ); + auto range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, "", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION ); field.SetProperty( Toolkit::TextField::Property::TEXT, "text editor test sentence" ); - range = x->GetTextAtOffset( 5, Dali::Accessibility::TextBoundary::Character ); + range = x->GetTextAtOffset( 5, Dali::Accessibility::TextBoundary::CHARACTER ); DALI_TEST_EQUALS( range.content, "e", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 5, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 6, TEST_LOCATION ); field.SetProperty( Toolkit::TextField::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 3, Dali::Accessibility::TextBoundary::Word ); + range = x->GetTextAtOffset( 3, Dali::Accessibility::TextBoundary::WORD ); DALI_TEST_EQUALS( range.content, "sentence", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 28, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 36, TEST_LOCATION ); field.SetProperty( Toolkit::TextField::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 4, Dali::Accessibility::TextBoundary::Word ); + range = x->GetTextAtOffset( 4, Dali::Accessibility::TextBoundary::WORD ); DALI_TEST_EQUALS( range.content, "", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION ); field.SetProperty( Toolkit::TextField::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, "text \n", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 9, TEST_LOCATION ); field.SetProperty( Toolkit::TextField::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 6, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 6, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, " editor \n", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 14, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 24, TEST_LOCATION ); field.SetProperty( Toolkit::TextField::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 8, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 8, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, " test sentence", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 25, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 39, TEST_LOCATION ); @@ -356,9 +356,9 @@ int utcDaliAccessibilityTextLabelGetName(void) ToolkitTestApplication application; auto label = Toolkit::TextLabel::New(); - DALI_TEST_EQUALS( label.GetName(), "", TEST_LOCATION ); - label.SetName("label"); - DALI_TEST_EQUALS( label.GetName(), "label", TEST_LOCATION ); + DALI_TEST_EQUALS( label.GetProperty(Actor::Property::NAME), "", TEST_LOCATION ); + label.SetProperty(Actor::Property::NAME, "label"); + DALI_TEST_EQUALS( label.GetProperty(Actor::Property::NAME), "label", TEST_LOCATION ); END_TEST; } @@ -409,43 +409,43 @@ int utcDaliAccessibilityTextLabelGetTextAtOffset(void) DALI_TEST_CHECK( x ); if( x ) { - auto range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::Line ); + auto range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, "", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION ); label.SetProperty( Toolkit::TextLabel::Property::TEXT, "text editor test sentence" ); - range = x->GetTextAtOffset( 5, Dali::Accessibility::TextBoundary::Character ); + range = x->GetTextAtOffset( 5, Dali::Accessibility::TextBoundary::CHARACTER ); DALI_TEST_EQUALS( range.content, "e", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 5, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 6, TEST_LOCATION ); label.SetProperty( Toolkit::TextLabel::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 3, Dali::Accessibility::TextBoundary::Word ); + range = x->GetTextAtOffset( 3, Dali::Accessibility::TextBoundary::WORD ); DALI_TEST_EQUALS( range.content, "sentence", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 28, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 36, TEST_LOCATION ); label.SetProperty( Toolkit::TextLabel::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 4, Dali::Accessibility::TextBoundary::Word ); + range = x->GetTextAtOffset( 4, Dali::Accessibility::TextBoundary::WORD ); DALI_TEST_EQUALS( range.content, "", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 0, TEST_LOCATION ); label.SetProperty( Toolkit::TextLabel::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 0, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, "text \n", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 0, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 9, TEST_LOCATION ); label.SetProperty( Toolkit::TextLabel::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 6, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 6, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, " editor \n", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 14, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 24, TEST_LOCATION ); label.SetProperty( Toolkit::TextLabel::Property::TEXT, "text \n\n\n\n\n\n editor \n\n test sentence" ); - range = x->GetTextAtOffset( 8, Dali::Accessibility::TextBoundary::Line ); + range = x->GetTextAtOffset( 8, Dali::Accessibility::TextBoundary::LINE ); DALI_TEST_EQUALS( range.content, " test sentence", TEST_LOCATION ); DALI_TEST_EQUALS( range.startOffset, 25, TEST_LOCATION ); DALI_TEST_EQUALS( range.endOffset, 39, TEST_LOCATION ); diff --git a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Value.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp similarity index 98% rename from automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Value.cpp rename to automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp index 479d8c2..0b26c3f 100644 --- a/automated-tests/src/dali-toolkit-accessibility/utc-Dali-Accessibility-Value.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp @@ -20,9 +20,13 @@ #include #include +#include #include #include +#include + +#include using namespace Dali::Accessibility; -- 2.7.4