Revert "[Tizen](ATSPI) squashed implementation"

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-adaptor.cpp

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..9b5d8cf 100644 (file)
--- 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,14 +17,13 @@
 
 #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/adaptors/scene-holder.h>
-#include <toolkit-scene-holder-impl.h>
 
 #include <toolkit-adaptor-impl.h>
 #include <dali/integration-api/debug.h>
@@ -99,8 +98,7 @@ void Adaptor::Start( Dali::Window window )
   if ( window )
   {
     mWindows.push_back( window );
-
-    mSceneHolders.emplace_back( static_cast<SceneHolder*>( &window.GetBaseObject() ) );
+    mWindowCreatedSignal.Emit( window );
   }
 }
 
@@ -135,17 +133,24 @@ 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;
 
-Dali::SceneHolderList Adaptor::GetSceneHolders()
-{
-  return mSceneHolders;
+  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::Adaptor::AdaptorSignalType& Adaptor::ResizedSignal()
@@ -242,11 +247,6 @@ Dali::WindowContainer Adaptor::GetWindows() const
   return mImpl->GetWindows();
 }
 
-Dali::SceneHolderList Adaptor::GetSceneHolders() const
-{
-  return mImpl->GetSceneHolders();
-}
-
 Any Adaptor::GetNativeWindowHandle()
 {
   Any window;