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=dcf0560ab189ec2c1c875ab5c78f34ec5c24523e;hp=4b25c5da0f4e9ea71e35a349ab532c92b7009921;hb=65194fe250e7933d0cd4896a41cccb905f098881;hpb=260c832bfaa0294e74a4f96d321f149adf09a3ce 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 4b25c5d..dcf0560 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) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -21,6 +21,8 @@ #include #include +#include +#include namespace Dali { @@ -95,7 +97,7 @@ void Adaptor::Stop() { } -bool Adaptor::AddIdle( CallbackBase* callback ) +bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue ) { const bool isAvailable = IsAvailable(); @@ -202,12 +204,31 @@ void Adaptor::SceneCreated() { } -void Adaptor::SetViewMode( ViewMode mode ) +class LogFactory : public LogFactoryInterface { -} +public: + virtual void InstallLogFunction() const + { + Dali::Integration::Log::LogFunction logFunction(&TestApplication::LogMessage); + Dali::Integration::Log::InstallLogFunction(logFunction); + } + + LogFactory() + { + } + virtual ~LogFactory() + { + } +}; -void Adaptor::SetStereoBase( float stereoBase ) +LogFactory* gLogFactory = NULL; +const LogFactoryInterface& Adaptor::GetLogFactory() { + if( gLogFactory == NULL ) + { + gLogFactory = new LogFactory; + } + return *gLogFactory; } Adaptor::Adaptor()