#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>
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;
{
test_return_value = TET_PASS;
//DBusWrapper::Install({}) is a de-install
- //DBusWrapper::Install({}); // FIXME
+ DBusWrapper::Install({});
}
namespace Dali {
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 );
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);
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 );