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=8f3095fd877afd93d20d8f64c1c9b745446d486d;hp=5890d58de9c41d740fc843a144aecddbde4b28bf;hb=7018f61b640b6fcf9cb576b537bafcb6bb8240e8;hpb=81529cb3b54f998306def4db0ba3f5f5a65c0c30 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 5890d58..8f3095f 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) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -29,35 +29,11 @@ #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 @@ -196,6 +172,23 @@ void Adaptor::RemoveWindow( Internal::Adaptor::SceneHolder* window ) } } +void Adaptor::RegisterProcessor( Integration::Processor& processor, bool postProcessor ) +{ + Integration::Core& core = mTestApplication->GetCore(); + core.RegisterProcessor( processor, postProcessor ); +} + +void Adaptor::UnregisterProcessor( Integration::Processor& processor, bool postProcessor ) +{ + Integration::Core& core = mTestApplication->GetCore(); + core.UnregisterProcessor( processor, postProcessor ); +} + +void Adaptor::SetApplication( Dali::TestApplication& testApplication ) +{ + mTestApplication = &testApplication; +} + Dali::Adaptor::AdaptorSignalType& Adaptor::ResizedSignal() { return mResizedSignal; @@ -348,6 +341,24 @@ void Adaptor::SceneCreated() { } +class LogFactory : public LogFactoryInterface +{ +public: + virtual void InstallLogFunction() const + { + Dali::Integration::Log::LogFunction logFunction(&ToolkitTestApplication::LogMessage); + Dali::Integration::Log::InstallLogFunction(logFunction); + } + + LogFactory() + { + } + virtual ~LogFactory() + { + } +}; + +LogFactory* gLogFactory = NULL; const LogFactoryInterface& Adaptor::GetLogFactory() { if( gLogFactory == NULL ) @@ -357,4 +368,14 @@ const LogFactoryInterface& Adaptor::GetLogFactory() return *gLogFactory; } +void Adaptor::RegisterProcessor( Integration::Processor& processor, bool postProcessor) +{ + mImpl->RegisterProcessor( processor, postProcessor ); +} + +void Adaptor::UnregisterProcessor( Integration::Processor& processor, bool postProcessor) +{ + mImpl->UnregisterProcessor( processor, postProcessor ); +} + } // namespace Dali