X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-adaptor.cpp;h=7c50cc7d268f98a24639ae192c981db7287811b0;hp=eb1f2b898abfa64db7ef32e61ec3602eb40523d2;hb=7dbe383e1d72909ceb2ef46e33b880243911df7e;hpb=eb3f729d9b7ca6fd7e9af953380b41eef4fc0ecb diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp index eb1f2b8..7c50cc7 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,70 +15,219 @@ * */ -// CLASS HEADER -#include +#include -#include +#include +// Don't want to include the actual window.h which otherwise will be indirectly included by adaptor.h. +#define DALI_WINDOW_H +#include +#include + +#include #include #include +#include #include namespace Dali { +namespace +{ + +/////////////////////////////////////////////////////////////////////////////// +// +// LogFactoryStub +// +/////////////////////////////////////////////////////////////////////////////// + +class LogFactory : public LogFactoryInterface +{ +public: + LogFactory() = default; + virtual ~LogFactory() = default; + +private: + void InstallLogFunction() const override + { + Dali::Integration::Log::InstallLogFunction( &TestApplication::LogMessage ); + } +}; +LogFactory* gLogFactory = NULL; // For some reason, destroying this when the Adaptor is destroyed causes a crash in some test cases when running all of them. +} //unnamed namespace + namespace Internal { namespace Adaptor { -bool Adaptor::mAvailable = false; -Vector Adaptor::mCallbacks = Vector(); +/////////////////////////////////////////////////////////////////////////////// +// +// Dali::Internal::Adaptor::Adaptor Stub +// +/////////////////////////////////////////////////////////////////////////////// + +Dali::Adaptor* gAdaptor = nullptr; + +Dali::Adaptor& Adaptor::New() +{ + DALI_ASSERT_ALWAYS( ! gAdaptor ); + gAdaptor = new Dali::Adaptor; + return *gAdaptor; +} Dali::Adaptor& Adaptor::Get() { - Dali::Adaptor* adaptor = new Dali::Adaptor; - Adaptor::mAvailable = true; - return *adaptor; + DALI_ASSERT_ALWAYS( gAdaptor ); + return *gAdaptor; } -Dali::RenderSurface& Adaptor::GetSurface() +Adaptor::Adaptor() { - Dali::RenderSurface *renderSurface = new Dali::TestRenderSurface; - return *renderSurface; } -Dali::Adaptor::AdaptorSignalType& Adaptor::AdaptorSignal() +Adaptor::~Adaptor() { - Dali::Adaptor::AdaptorSignalType* signal = new Dali::Adaptor::AdaptorSignalType; - return *signal; + gAdaptor = nullptr; } -} // namespace Adaptor -} // namespace Internal +void Adaptor::Start( Dali::Window window ) +{ + AddWindow( &GetImplementation( window ) ); +} -Adaptor& Adaptor::New( Window window ) +Integration::Scene Adaptor::GetScene( Dali::Window window ) { - return Internal::Adaptor::Adaptor::Get(); + return window.GetScene(); } -Adaptor& Adaptor::New( Window window, Configuration::ContextLoss configuration ) +bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue ) { - return Internal::Adaptor::Adaptor::Get(); + mCallbacks.PushBack( callback ); + return true; } -Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface& surface ) +void Adaptor::RemoveIdle( CallbackBase* callback ) { - return Internal::Adaptor::Adaptor::Get(); + mCallbacks.Erase( std::find_if( mCallbacks.Begin(), mCallbacks.End(), + [ &callback ] ( CallbackBase* current ) { return callback == current; } ) ); } -Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface& surface, Configuration::ContextLoss configuration ) +void Adaptor::RunIdles() +{ + for( auto& callback : mCallbacks ) + { + CallbackBase::Execute( *callback ); + } + + mCallbacks.Clear(); +} + +Dali::RenderSurfaceInterface& Adaptor::GetSurface() +{ + DALI_ASSERT_ALWAYS( ! mWindows.empty() ); + + return reinterpret_cast < Dali::RenderSurfaceInterface& >( mWindows.front()->GetRenderSurface() ); +} + +Dali::WindowContainer Adaptor::GetWindows() +{ + Dali::WindowContainer windows; + + for ( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter ) + { + // Downcast to Dali::Window + Dali::Window window( dynamic_cast( *iter ) ); + if ( window ) + { + windows.push_back( window ); + } + } + + return windows; +} + +Dali::SceneHolderList Adaptor::GetSceneHolders() +{ + Dali::SceneHolderList sceneHolderList; + + for( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter ) + { + sceneHolderList.push_back( Dali::Integration::SceneHolder( *iter ) ); + } + + return sceneHolderList; +} + +Dali::Internal::Adaptor::SceneHolder* Adaptor::GetWindow( Dali::Actor& actor ) +{ + Dali::Integration::Scene scene = Dali::Integration::Scene::Get( actor ); + + for( auto window : mWindows ) + { + if ( scene == window->GetScene() ) + { + return window; + } + } + + return nullptr; +} + +void Adaptor::AddWindow( Internal::Adaptor::SceneHolder* window ) +{ + if ( window ) + { + mWindows.push_back( window ); + + Dali::Integration::SceneHolder newWindow( window ); + mWindowCreatedSignal.Emit( newWindow ); + } +} + +void Adaptor::RemoveWindow( Internal::Adaptor::SceneHolder* window ) +{ + auto iter = std::find( mWindows.begin(), mWindows.end(), window ); + if( iter != mWindows.end() ) + { + mWindows.erase( iter ); + } +} + +Dali::Adaptor::AdaptorSignalType& Adaptor::ResizedSignal() +{ + return mResizedSignal; +} + +Dali::Adaptor::AdaptorSignalType& Adaptor::LanguageChangedSignal() +{ + return mLanguageChangedSignal; +} + +Dali::Adaptor::WindowCreatedSignalType& Adaptor::WindowCreatedSignal() +{ + return mWindowCreatedSignal; +} + +} // namespace Adaptor +} // namespace Internal + +/////////////////////////////////////////////////////////////////////////////// +// +// Dali::Adaptor Stub +// +/////////////////////////////////////////////////////////////////////////////// + +Adaptor::Adaptor() +: mImpl( new Internal::Adaptor::Adaptor ) { - return Internal::Adaptor::Adaptor::Get(); } Adaptor::~Adaptor() { + Internal::Adaptor::gAdaptor = nullptr; + delete mImpl; } void Adaptor::Start() @@ -99,53 +248,50 @@ void Adaptor::Stop() bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue ) { - const bool isAvailable = IsAvailable(); - - if( isAvailable ) - { - Internal::Adaptor::Adaptor::mCallbacks.PushBack( callback ); - } - - return isAvailable; + return mImpl->AddIdle( callback, hasReturnValue ); } void Adaptor::RemoveIdle( CallbackBase* callback ) { - const bool isAvailable = IsAvailable(); + mImpl->RemoveIdle( callback ); +} - if( isAvailable ) - { - for( Vector::Iterator it = Internal::Adaptor::Adaptor::mCallbacks.Begin(), - endIt = Internal::Adaptor::Adaptor::mCallbacks.End(); - it != endIt; - ++it ) - { - if( callback == *it ) - { - Internal::Adaptor::Adaptor::mCallbacks.Remove( it ); - return; - } - } - } +void Adaptor::ReplaceSurface( Window window, Dali::RenderSurfaceInterface& surface ) +{ } -void Adaptor::ReplaceSurface( Any nativeWindow, Dali::RenderSurface& surface ) +void Adaptor::ReplaceSurface( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface& surface ) { } Adaptor::AdaptorSignalType& Adaptor::ResizedSignal() { - return Internal::Adaptor::Adaptor::AdaptorSignal(); + return mImpl->ResizedSignal(); } Adaptor::AdaptorSignalType& Adaptor::LanguageChangedSignal() { - return Internal::Adaptor::Adaptor::AdaptorSignal(); + return mImpl->LanguageChangedSignal(); +} + +Adaptor::WindowCreatedSignalType& Adaptor::WindowCreatedSignal() +{ + return mImpl->WindowCreatedSignal(); +} + +Dali::RenderSurfaceInterface& Adaptor::GetSurface() +{ + return mImpl->GetSurface(); } -RenderSurface& Adaptor::GetSurface() +Dali::WindowContainer Adaptor::GetWindows() const { - return Internal::Adaptor::Adaptor::GetSurface(); + return mImpl->GetWindows(); +} + +Dali::SceneHolderList Adaptor::GetSceneHolders() const +{ + return mImpl->GetSceneHolders(); } Any Adaptor::GetNativeWindowHandle() @@ -154,15 +300,16 @@ Any Adaptor::GetNativeWindowHandle() return window; } -void Adaptor::ReleaseSurfaceLock() +Any Adaptor::GetNativeWindowHandle( Actor actor ) { + return GetNativeWindowHandle(); } -void Adaptor::SetRenderRefreshRate( unsigned int numberOfVSyncsPerRender ) +void Adaptor::ReleaseSurfaceLock() { } -void Adaptor::SetUseHardwareVSync(bool useHardware) +void Adaptor::SetRenderRefreshRate( unsigned int numberOfVSyncsPerRender ) { } @@ -173,7 +320,7 @@ Adaptor& Adaptor::Get() bool Adaptor::IsAvailable() { - return Internal::Adaptor::Adaptor::mAvailable; + return Internal::Adaptor::gAdaptor; } void Adaptor::NotifySceneCreated() @@ -184,10 +331,6 @@ void Adaptor::NotifyLanguageChanged() { } -void Adaptor::SetMinimumPinchDistance(float distance) -{ -} - void Adaptor::FeedTouchPoint( TouchPoint& point, int timeStamp ) { } @@ -204,33 +347,6 @@ void Adaptor::SceneCreated() { } -void Adaptor::SetViewMode( ViewMode mode ) -{ -} - -void Adaptor::SetStereoBase( float stereoBase ) -{ -} - - -class LogFactory : public LogFactoryInterface -{ -public: - virtual void InstallLogFunction() const - { - Dali::Integration::Log::LogFunction logFunction(&TestApplication::LogMessage); - Dali::Integration::Log::InstallLogFunction(logFunction); - } - - LogFactory() - { - } - virtual ~LogFactory() - { - } -}; - -LogFactory* gLogFactory = NULL; const LogFactoryInterface& Adaptor::GetLogFactory() { if( gLogFactory == NULL ) @@ -240,9 +356,4 @@ const LogFactoryInterface& Adaptor::GetLogFactory() return *gLogFactory; } -Adaptor::Adaptor() -: mImpl( NULL ) -{ -} - } // namespace Dali