Change-Id: I4ac3ef9666ab3a18537988884c1f5f6548868cf9
#include <dali-toolkit-test-suite-utils.h>
#include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h>
#include <dali-toolkit-test-suite-utils.h>
#include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h>
+#include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/devel-api/adaptor-framework/accessibility.h>
#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/devel-api/adaptor-framework/accessibility.h>
#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
using namespace Dali::Toolkit;
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;
void utc_dali_accessibility_controls_bridge_up_startup(void)
{
test_return_value = TET_UNDEF;
{
test_return_value = TET_PASS;
//DBusWrapper::Install({}) is a de-install
{
test_return_value = TET_PASS;
//DBusWrapper::Install({}) is a de-install
- //DBusWrapper::Install({}); // FIXME
+ DBusWrapper::Install({});
TestGetIndexInParent( child_1_accessible -> GetAddress() );
DALI_ABORT("Object has parent, test abort");
}
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");
}
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 );
DALI_TEST_EQUALS( parent_accessible -> GetChildCount(), 0, TEST_LOCATION );
child_1_accessible -> GetIndexInParent();
DALI_ABORT("Object has parent, test abort");
}
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);
parent.Add(child_1);
parent.Add(child_2);
TestGetActionDescription( b->GetAddress(), count );
DALI_ABORT( "Correct index, abort" );
}
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" );
}
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" );
}
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" );
}
try
{
TestGetActionKeyBinding( b->GetAddress(), count );
DALI_ABORT( "Correct index, abort" );
}
- catch( Dali::Accessibility::TestDBusWrapper::error ){}
+ catch( TestDBusWrapper::error& ){}
Dali::Accessibility::TestEnableSC( false );
Dali::Accessibility::TestEnableSC( false );
using namespace Dali::Toolkit;
using namespace Dali::Toolkit;
-//using DBusWrapper = Dali::Accessibility::DBusWrapper; // FIXME
-
void utc_dali_accessibility_controls_startup(void)
{
test_return_value = TET_UNDEF;
void utc_dali_accessibility_controls_startup(void)
{
test_return_value = TET_UNDEF;
{
test_return_value = TET_PASS;
//DBusWrapper::Install({}) is a de-install
{
test_return_value = TET_PASS;
//DBusWrapper::Install({}) is a de-install
- //DBusWrapper::Install({}); // FIXME
+ DBusWrapper::Install({});
}
int UtcDaliControlPropertyAccessibilityTranslationDomain(void)
}
int UtcDaliControlPropertyAccessibilityTranslationDomain(void)
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
dali2-core
PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
dali2-core
../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-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
../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
// INTERNAL INCLUDES
#include <dali-test-suite-utils.h>
#include <dali/devel-api/text-abstraction/font-client.h>
// INTERNAL INCLUDES
#include <dali-test-suite-utils.h>
#include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <toolkit-adaptor-impl.h>
#include <toolkit-lifecycle-controller.h>
#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <toolkit-adaptor-impl.h>
#include <toolkit-lifecycle-controller.h>
// Core needs to be initialized next before we start the adaptor
InitializeCore();
// 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 );
// This will also emit the window created signals
AdaptorImpl::GetImpl( *mAdaptor ).Start( *mMainWindow );