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-impl.h;h=dd7f469256f45b84126253c7cfd7e82643745942;hp=e49b3587725bb8939e110673c0f404a9d4973cc5;hb=0e8dfa9c961af84b18edf2e3307840b0d94fb430;hpb=8ae521ab64a3922f3419fbbfb83dde57e6135cf5

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
index e49b358..dd7f469 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
@@ -27,6 +27,11 @@ class DisplayConnection;
 class ThreadSynchronizationInterface;
 class Window;
 
+namespace Integration
+{
+class Scene;
+}
+
 using WindowContainer = std::vector<Window>;
 
 namespace Internal
@@ -53,22 +58,39 @@ namespace Internal
 namespace Adaptor
 {
 
-class Adaptor: public BaseObject
+class Adaptor
 {
 public:
+  static Dali::Adaptor& New();
   static Dali::Adaptor& Get();
   Adaptor();
   ~Adaptor();
 
-public:
-  static Dali::RenderSurfaceInterface& GetSurface();
-  static Dali::WindowContainer GetWindows();
-  static Dali::Adaptor::AdaptorSignalType& AdaptorSignal();
-  static Dali::Adaptor::WindowCreatedSignalType& WindowCreatedSignal();
-  static bool mAvailable;
-  static Vector<CallbackBase*> mCallbacks;
-  static Dali::WindowContainer mWindows;
-  static Dali::Adaptor::WindowCreatedSignalType* mWindowCreatedSignal;
+  void Start( Dali::Window window );
+
+  bool AddIdle( CallbackBase* callback, bool hasReturnValue );
+  void RemoveIdle( CallbackBase* callback );
+  void RunIdles();
+
+  static Integration::Scene GetScene( Dali::Window window );
+
+  Dali::RenderSurfaceInterface& GetSurface();
+  Dali::WindowContainer GetWindows();
+
+  Dali::Adaptor::AdaptorSignalType& ResizedSignal();
+  Dali::Adaptor::AdaptorSignalType& LanguageChangedSignal();
+  Dali::Adaptor::WindowCreatedSignalType& WindowCreatedSignal();
+
+  static Adaptor& GetImpl( Dali::Adaptor& adaptor ) { return *adaptor.mImpl; }
+  static const Adaptor& GetImpl( const Dali::Adaptor& adaptor ) { return *adaptor.mImpl; }
+
+private:
+
+  Vector<CallbackBase*> mCallbacks;
+  Dali::WindowContainer mWindows;
+  Dali::Adaptor::AdaptorSignalType mResizedSignal;
+  Dali::Adaptor::AdaptorSignalType mLanguageChangedSignal;
+  Dali::Adaptor::WindowCreatedSignalType mWindowCreatedSignal;
 };
 
 } // namespace Adaptor