X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-adaptor.cpp;h=f84726b3488c1675946ee8b7a841bcadebbb0ecf;hb=175d74ab98dd2f89726ce6594a08d65e0d01056f;hp=fc9f1e7d0ba6b0175c8f71876a73b9cb78bf8587;hpb=b3a97840ef9163145f3adc947cf1c6679911d754;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 fc9f1e7..f84726b 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
@@ -17,15 +17,14 @@
 
 #include <algorithm>
 
-#include <toolkit-window.h>
+#include <toolkit-window-impl.h>
 
 // Don't want to include the actual window.h which otherwise will be indirectly included by adaptor.h.
 #define DALI_WINDOW_H
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
 
-#include <dali/integration-api/adaptors/scene-holder.h>
 #include <toolkit-scene-holder-impl.h>
-
 #include <toolkit-adaptor-impl.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/scene.h>
@@ -96,12 +95,7 @@ Adaptor::~Adaptor()
 
 void Adaptor::Start( Dali::Window window )
 {
-  if ( window )
-  {
-    mWindows.push_back( window );
-
-    mSceneHolders.emplace_back( static_cast<SceneHolder*>( &window.GetBaseObject() ) );
-  }
+  AddWindow( &GetImplementation( window ) );
 }
 
 Integration::Scene Adaptor::GetScene( Dali::Window window )
@@ -135,17 +129,88 @@ Dali::RenderSurfaceInterface& Adaptor::GetSurface()
 {
   DALI_ASSERT_ALWAYS( ! mWindows.empty() );
 
-  return reinterpret_cast < Dali::RenderSurfaceInterface& >( mWindows.front().GetRenderSurface() );
+  return reinterpret_cast < Dali::RenderSurfaceInterface& >( mWindows.front()->GetRenderSurface() );
 }
 
 Dali::WindowContainer Adaptor::GetWindows()
 {
-  return mWindows;
+  Dali::WindowContainer windows;
+
+  for ( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter )
+  {
+    // Downcast to Dali::Window
+    Dali::Window window( dynamic_cast<Dali::Internal::Adaptor::Window*>( *iter ) );
+    if ( window )
+    {
+      windows.push_back( window );
+    }
+  }
+
+  return windows;
 }
 
 Dali::SceneHolderList Adaptor::GetSceneHolders()
 {
-  return mSceneHolders;
+  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 );
+  }
+}
+
+void Adaptor::RegisterProcessor( Integration::Processor& processor )
+{
+  Integration::Core& core = mTestApplication->GetCore();
+  core.RegisterProcessor( processor );
+}
+
+void Adaptor::UnregisterProcessor( Integration::Processor& processor )
+{
+  Integration::Core& core = mTestApplication->GetCore();
+  core.UnregisterProcessor( processor );
+}
+
+void Adaptor::SetApplication( Dali::TestApplication& testApplication )
+{
+  mTestApplication = &testApplication;
 }
 
 Dali::Adaptor::AdaptorSignalType& Adaptor::ResizedSignal()
@@ -309,4 +374,14 @@ const LogFactoryInterface& Adaptor::GetLogFactory()
   return *gLogFactory;
 }
 
+void Adaptor::RegisterProcessor( Integration::Processor& processor )
+{
+  mImpl->RegisterProcessor( processor );
+}
+
+void Adaptor::UnregisterProcessor( Integration::Processor& processor )
+{
+  mImpl->UnregisterProcessor( processor );
+}
+
 } // namespace Dali