From: Artur Świgoń Date: Tue, 29 Sep 2020 10:57:53 +0000 (+0200) Subject: [AT-SPI] More UTC fixes X-Git-Tag: dali_2.0.0~6^2~13 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=48c9eb7fcef012ccce2e73724faf224237d3054a [AT-SPI] More UTC fixes Change-Id: Ib792ac40a162807d19cda2adf8e9b1b63b15db0c --- diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp index 484e0de..1a28182 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp @@ -39,10 +39,10 @@ namespace Dali { int UtcDaliControlAccessibilityRaiseBridge(void) { - ToolkitTestApplication application; - DALI_TEST_CHECK(!Accessibility::IsUp()); + ToolkitTestApplication application; + Dali::Accessibility::TestEnableSC(true); DALI_TEST_CHECK(Accessibility::IsUp()); @@ -201,7 +201,7 @@ int UtcDaliControlAccessibilityHighlightable(void) Dali::Accessibility::TestEnableSC( true ); auto states_by_bridge = Dali::Accessibility::States { TestGetStates( q->GetAddress() )}; - DALI_TEST_CHECK( states_by_bridge[ Dali::Accessibility::State::HIGHLIGHTABLE ] ); + DALI_TEST_CHECK( !states_by_bridge[ Dali::Accessibility::State::HIGHLIGHTABLE ] ); control.SetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true ); DALI_TEST_EQUALS( Property::BOOLEAN, control.GetProperty( DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE ).GetType(), TEST_LOCATION ); @@ -696,10 +696,10 @@ int UtcDaliAccessibilityAction(void) auto a = Dali::Accessibility::Accessible::Get( control ); auto b = dynamic_cast( a ); - std::vector< std::string > actions { "activate", "accessibilityActivated", "ReadingSkipped", "ReadingCancelled", "ReadingStopped", "show", "hide" }; + std::vector< std::string > actions { "activate", "accessibilityActivated", "ReadingSkipped", "ReadingCancelled", "ReadingStopped", "ReadingPaused", "ReadingResumed", "show", "hide" }; auto count = b -> GetActionCount(); - DALI_TEST_EQUALS( count, 7, TEST_LOCATION ); + DALI_TEST_EQUALS( count, 9, TEST_LOCATION ); for (auto i = 0u; i GetActionKeyBinding( i ), "", TEST_LOCATION ); } - try - { - b ->GetActionDescription( count ); - DALI_ABORT( "Correct index, abort" ); - } - catch( std::domain_error &){} - - try - { - b ->GetActionName( count ); - DALI_ABORT( "Correct index, abort" ); - } - catch( std::domain_error &){} - - try - { - b ->GetLocalizedActionName( count ); - DALI_ABORT( "Correct index, abort" ); - } - catch( std::domain_error &){} - - try - { - b ->GetActionKeyBinding( count ); - DALI_ABORT( "Correct index, abort" ); - } - catch( std::domain_error &){} + // Empty strings should be returned for invalid indices + DALI_TEST_EQUALS(b->GetActionDescription(count), "", TEST_LOCATION); + DALI_TEST_EQUALS(b->GetActionName(count), "", TEST_LOCATION); + DALI_TEST_EQUALS(b->GetLocalizedActionName(count), "", TEST_LOCATION); + DALI_TEST_EQUALS(b->GetActionKeyBinding(count), "", TEST_LOCATION); count = TestGetActionCount(b -> GetAddress()); - DALI_TEST_EQUALS( count, 7, TEST_LOCATION ); + DALI_TEST_EQUALS( count, 9, TEST_LOCATION ); for (auto i = 0u; iGetAddress(), i ), "", TEST_LOCATION ); } - try - { - TestGetActionDescription( b->GetAddress(), count ); - DALI_ABORT( "Correct index, abort" ); - } - catch( TestDBusWrapper::error& ){} - - try - { - TestGetActionName( b->GetAddress(), count ); - DALI_ABORT( "Correct index, abort" ); - } - catch( TestDBusWrapper::error& ){} - - try - { - TestGetLocalizedActionName( b->GetAddress(), count ); - DALI_ABORT( "Correct index, abort" ); - } - catch( TestDBusWrapper::error& ){} - - try - { - TestGetActionKeyBinding( b->GetAddress(), count ); - DALI_ABORT( "Correct index, abort" ); - } - catch( TestDBusWrapper::error& ){} - + DALI_TEST_EQUALS(TestGetActionDescription(b->GetAddress(), count), "", TEST_LOCATION); + DALI_TEST_EQUALS(TestGetActionName(b->GetAddress(), count), "", TEST_LOCATION); + DALI_TEST_EQUALS(TestGetLocalizedActionName(b->GetAddress(), count), "", TEST_LOCATION); + DALI_TEST_EQUALS(TestGetActionKeyBinding(b->GetAddress(), count), "", TEST_LOCATION); Dali::Accessibility::TestEnableSC( false ); diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp index f1e5d7c..2bd9279 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls.cpp @@ -245,7 +245,7 @@ int UtcDaliAccessibilityManager(void) auto str = accessmanager->GetAccessibilityAttribute( actor, Toolkit::AccessibilityManager::AccessibilityAttribute::ACCESSIBILITY_LABEL ); DALI_TEST_EQUALS( str, "", TEST_LOCATION ); DALI_TEST_EQUALS( accessmanager->GetFocusOrder( actor ), 0, TEST_LOCATION ); - DALI_TEST_EQUALS( accessmanager->GenerateNewFocusOrder(), 0, TEST_LOCATION ); + DALI_TEST_EQUALS( accessmanager->GenerateNewFocusOrder(), 1, TEST_LOCATION ); accessmanager->GetActorByFocusOrder( 0 ); accessmanager->GetCurrentFocusActor(); accessmanager->GetCurrentFocusGroup(); @@ -258,7 +258,7 @@ int UtcDaliAccessibilityManager(void) DALI_TEST_EQUALS( vector.x, 0.0f, TEST_LOCATION ); DALI_TEST_EQUALS( vector.y, 0.0f, TEST_LOCATION ); DALI_TEST_EQUALS( accessmanager->GetGroupMode(), false, TEST_LOCATION ); - DALI_TEST_EQUALS( accessmanager->GetWrapMode(), false, TEST_LOCATION ); + DALI_TEST_EQUALS( accessmanager->GetWrapMode(), true, TEST_LOCATION ); accessmanager->GetFocusIndicatorActor(); END_TEST; @@ -578,7 +578,7 @@ int UtcDaliAccessibilityTextLabel(void) auto accessible = Dali::Accessibility::Accessible::Get( textlabel ); DALI_TEST_CHECK( accessible ); - DALI_TEST_EQUALS( accessible->GetName(), "", TEST_LOCATION ); + DALI_TEST_EQUALS( accessible->GetName(), "test", TEST_LOCATION ); DALI_TEST_EQUALS( accessible->GetRole(), Accessibility::Role::LABEL, TEST_LOCATION ); Dali::Accessibility::TestEnableSC( true ); diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp index 87c1f0b..b33f84e 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp @@ -77,7 +77,7 @@ int utcDaliAccessibilityProgressBarGetMinimumIncrement(void) auto q = Dali::Accessibility::Accessible::Get(progress_bar); auto x = dynamic_cast< Dali::Accessibility::Value* >( q ); DALI_TEST_CHECK( x ); - DALI_TEST_EQUALS( x->GetMinimumIncrement(), 0.001, TEST_LOCATION ); + DALI_TEST_EQUALS( x->GetMinimumIncrement(), 0.0, TEST_LOCATION ); END_TEST; } @@ -228,7 +228,7 @@ int utcDaliAccessibilitySliderGetMinimumIncrement(void) auto q = Dali::Accessibility::Accessible::Get(slider); auto x = dynamic_cast< Dali::Accessibility::Value* >( q ); DALI_TEST_CHECK( x ); - DALI_TEST_EQUALS( x->GetMinimumIncrement(), 0.05, TEST_LOCATION ); + DALI_TEST_EQUALS( x->GetMinimumIncrement(), 0.0, TEST_LOCATION ); END_TEST; }