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-test-application.h;h=49a4c6f137b199c980d56fa354fa7fb15e26ebbb;hp=de2d0c4f86ac2d7f827da3724c1fef4f8d696d29;hb=20abe349f228817dbaaa95609373896a3cabe921;hpb=68b0edb7de863b5198ec0afeac0a7e351dd6bd24

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
index de2d0c4..49a4c6f 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
@@ -18,19 +18,29 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <memory>
+
 // INTERNAL INCLUDES
 #include <dali-test-suite-utils.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <toolkit-adaptor-impl.h>
-#include <toolkit-singleton-service.h>
-#include <toolkit-lifecycle-controller.h>
+#include <dali/devel-api/adaptor-framework/accessibility.h>
+#include "test-application.h"
+
+//#undef assert
 
 namespace Dali
 {
 
+class Adaptor;
+class Window;
+
 /**
  * Adds some functionality on top of TestApplication that is required by the Toolkit.
+ *
+ * This includes creation and destruction of the Adaptor and Window classes.
  */
 class ToolkitTestApplication : public TestApplication
 {
@@ -39,53 +49,9 @@ public:
   ToolkitTestApplication( size_t surfaceWidth  = DEFAULT_SURFACE_WIDTH,
                           size_t surfaceHeight = DEFAULT_SURFACE_HEIGHT,
                           float  horizontalDpi = DEFAULT_HORIZONTAL_DPI,
-                          float  verticalDpi   = DEFAULT_VERTICAL_DPI )
-  : TestApplication( surfaceWidth, surfaceHeight, horizontalDpi, verticalDpi )
-  {
-    auto singletonService = SingletonService::Get();
-    Test::SetApplication( singletonService, *this );
-
-    // set the DPI value for font rendering
-    Dali::TextAbstraction::FontClient fontClient = Dali::TextAbstraction::FontClient::Get();
-    if( fontClient )
-    {
-      fontClient.SetDpi( mDpi.x, mDpi.y );
-    }
-
-    bool isAdaptorAvailable = Dali::Internal::Adaptor::Adaptor::Get().IsAvailable();
-    if ( isAdaptorAvailable )
-    {
-      Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get();
-      lifecycleController.InitSignal().Emit();
-
-      Dali::Window window = Dali::Internal::Adaptor::Adaptor::mWindows.front();
-      if ( window )
-      {
-        Dali::Internal::Adaptor::Adaptor::WindowCreatedSignal().Emit( window );
-      }
-    }
-  }
+                          float  verticalDpi   = DEFAULT_VERTICAL_DPI );
 
-  ~ToolkitTestApplication()
-  {
-    // Need to delete core before we delete the adaptor.
-    delete mCore;
-    mCore = NULL;
-  }
-
-  //ToolkitOrientation& GetOrientation()
-  //{
-  //return mOrientation;
-  //}
-
-  /**
-   * @brief Creates an adaptor implementation for those controls like the
-   * text-field and the text-editor which connects a callback to the idle signal.
-   */
-  void CreateAdaptor()
-  {
-    Adaptor::Get();
-  }
+  ~ToolkitTestApplication() override;
 
   /**
    * @brief Executes the idle callbacks.
@@ -93,26 +59,12 @@ public:
    * Some controls like the text-field and the text-editor connect callbacks to the
    * idle signal.
    */
-  void RunIdles()
-  {
-    if( Adaptor::IsAvailable() )
-    {
-      for( Vector<CallbackBase*>::Iterator it = Internal::Adaptor::Adaptor::mCallbacks.Begin(),
-             endIt = Internal::Adaptor::Adaptor::mCallbacks.End();
-           it != endIt;
-           ++it )
-      {
-        CallbackBase* callback = *it;
-
-        CallbackBase::Execute( *callback );
-      }
-
-      Internal::Adaptor::Adaptor::mCallbacks.Clear();
-    }
-  }
+  void RunIdles();
 
 private:
-  //ToolkitOrientation mOrientation;
+
+  std::unique_ptr<Dali::Window> mMainWindow;
+  std::unique_ptr< Adaptor > mAdaptor;
 };
 
 } // namespace Dali