X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-test-application.cpp;h=349642c690e2b9910e099b37ecb44c635916a1e2;hb=26efc210fc636e51a4d3df9ae7fbcc1d2a8bac40;hp=53cd1d9fc17e5f1bf1354be02300aa09d00e148e;hpb=f3e8b0bf4eba4e2f76294c2ed3d83a4cc9ca4613;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 53cd1d9..349642c 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 @@ -33,15 +33,18 @@ using AdaptorImpl = Dali::Internal::Adaptor::Adaptor; ToolkitTestApplication::ToolkitTestApplication( size_t surfaceWidth, size_t surfaceHeight, float horizontalDpi, float verticalDpi ) : TestApplication( surfaceWidth, surfaceHeight, horizontalDpi, verticalDpi, ResourcePolicy::DALI_DISCARDS_ALL_DATA, false /* Do not Initialize Core */ ), + mMainWindow( new Dali::Window ), mAdaptor( &AdaptorImpl::New() ) // Need to create Adaptor first as many singletons in dali-adaptor need it { // Create Core next CreateCore(); + Dali::Accessibility::DBusWrapper::Install(std::unique_ptr(new Dali::Accessibility::TestDBusWrapper())); + // Override Scene creation in TestApplication by creating a window. // The window will create a Scene & surface and set up the scene's surface appropriately. - Window window( Window::New( PositionSize( 0, 0, surfaceWidth, surfaceHeight ), "" ) ); - mScene = AdaptorImpl::GetScene( window ); + *mMainWindow = Window::New( PositionSize( 0, 0, surfaceWidth, surfaceHeight ), "" ); + mScene = AdaptorImpl::GetScene( *mMainWindow ); mRenderSurface = dynamic_cast< TestRenderSurface* >( mScene.GetSurface() ); mScene.SetDpi( Vector2( horizontalDpi, verticalDpi ) ); @@ -52,7 +55,7 @@ ToolkitTestApplication::ToolkitTestApplication( size_t surfaceWidth, size_t surf Test::SetApplication( singletonService, *this ); // This will also emit the window created signals - AdaptorImpl::GetImpl( *mAdaptor ).Start( window ); + AdaptorImpl::GetImpl( *mAdaptor ).Start( *mMainWindow ); Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get(); lifecycleController.InitSignal().Emit();