From a1d8151d48f5de5e02670b0f519ce87ad98781cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= Date: Mon, 28 Sep 2020 18:33:33 +0200 Subject: [PATCH] [AT-SPI] UTC fixes Change-Id: I4ac3ef9666ab3a18537988884c1f5f6548868cf9 --- .../utc-Dali-Accessibility-Controls-BridgeUp.cpp | 21 +++++++++------------ .../utc-Dali-Accessibility-Controls.cpp | 4 +--- .../src/dali-toolkit-styling/CMakeLists.txt | 1 + .../src/dali-toolkit-third-party/CMakeLists.txt | 1 - .../toolkit-test-application.cpp | 2 ++ 5 files changed, 13 insertions(+), 16 deletions(-) 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 01edef0..484e0de 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 @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -13,10 +14,6 @@ using namespace Dali::Toolkit; -//using DBusWrapper = Dali::Accessibility::DBusWrapper; // FIXME - -namespace Dali::Accessibility::TestDBusWrapper { struct error {}; } // FIXME - void utc_dali_accessibility_controls_bridge_up_startup(void) { test_return_value = TET_UNDEF; @@ -27,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({}); // FIXME + DBusWrapper::Install({}); } namespace Dali { @@ -501,14 +498,14 @@ int UtcDaliAccessibilityParentChildren(void) TestGetIndexInParent( child_1_accessible -> GetAddress() ); DALI_ABORT("Object has parent, test abort"); } - catch(Accessibility::TestDBusWrapper::error &){} + catch(TestDBusWrapper::error &){} try { TestGetChildAtIndex( parent_accessible -> GetAddress(), -1 ); DALI_ABORT("Positive index, test abort"); } - catch(Accessibility::TestDBusWrapper::error &){} + catch(TestDBusWrapper::error &){} DALI_TEST_EQUALS( parent_accessible -> GetChildCount(), 0, TEST_LOCATION ); @@ -517,7 +514,7 @@ int UtcDaliAccessibilityParentChildren(void) child_1_accessible -> GetIndexInParent(); DALI_ABORT("Object has parent, test abort"); } - catch (std::domain_error &){} + catch (Dali::DaliException &){} parent.Add(child_1); parent.Add(child_2); @@ -757,28 +754,28 @@ int UtcDaliAccessibilityAction(void) TestGetActionDescription( b->GetAddress(), count ); DALI_ABORT( "Correct index, abort" ); } - catch( Dali::Accessibility::TestDBusWrapper::error ){} + catch( TestDBusWrapper::error& ){} try { TestGetActionName( b->GetAddress(), count ); DALI_ABORT( "Correct index, abort" ); } - catch( Dali::Accessibility::TestDBusWrapper::error ){} + catch( TestDBusWrapper::error& ){} try { TestGetLocalizedActionName( b->GetAddress(), count ); DALI_ABORT( "Correct index, abort" ); } - catch( Dali::Accessibility::TestDBusWrapper::error ){} + catch( TestDBusWrapper::error& ){} try { TestGetActionKeyBinding( b->GetAddress(), count ); DALI_ABORT( "Correct index, abort" ); } - catch( Dali::Accessibility::TestDBusWrapper::error ){} + catch( TestDBusWrapper::error& ){} 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 dd13f0a..f1e5d7c 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 @@ -10,8 +10,6 @@ using namespace Dali::Toolkit; -//using DBusWrapper = Dali::Accessibility::DBusWrapper; // FIXME - void utc_dali_accessibility_controls_startup(void) { test_return_value = TET_UNDEF; @@ -22,7 +20,7 @@ void utc_dali_accessibility_controls_cleanup(void) { test_return_value = TET_PASS; //DBusWrapper::Install({}) is a de-install - //DBusWrapper::Install({}); // FIXME + DBusWrapper::Install({}); } int UtcDaliControlPropertyAccessibilityTranslationDomain(void) diff --git a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt index 9b2c626..bda1454 100644 --- a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt @@ -54,6 +54,7 @@ LIST(APPEND TC_SOURCES PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED dali2-core + dali2-adaptor dali2-toolkit ) diff --git a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt index f15cbaf..e089fc6 100644 --- a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt @@ -21,7 +21,6 @@ LIST(APPEND TC_SOURCES ../dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.cpp ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp index 3e3a0d2..48173fd 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp @@ -21,6 +21,7 @@ // INTERNAL INCLUDES #include #include +#include #include #include #include @@ -46,6 +47,7 @@ ToolkitTestApplication::ToolkitTestApplication( size_t surfaceWidth, size_t surf // Core needs to be initialized next before we start the adaptor InitializeCore(); + Accessibility::Accessible::SetObjectRegistry(mCore->GetObjectRegistry()); // This will also emit the window created signals AdaptorImpl::GetImpl( *mAdaptor ).Start( *mMainWindow ); -- 2.7.4