[dali_2.3.24] Merge branch 'devel/master'

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

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 7dd21b5..b9e94ed 100644 (file)
--- 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
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEST_APPLICATION_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -23,6 +23,13 @@
 
 // INTERNAL INCLUDES
 #include <dali-test-suite-utils.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <toolkit-adaptor-impl.h>
+#include <dali/devel-api/adaptor-framework/accessibility.h>
+#include "test-application.h"
+
+//#undef assert
 
 namespace Dali
 {
@@ -44,7 +51,7 @@ public:
                           float  horizontalDpi = DEFAULT_HORIZONTAL_DPI,
                           float  verticalDpi   = DEFAULT_VERTICAL_DPI );
 
-  ~ToolkitTestApplication();
+  ~ToolkitTestApplication() override;
 
   /**
    * @brief Executes the idle callbacks.
@@ -54,9 +61,18 @@ public:
    */
   void RunIdles();
 
-private:
+  Dali::Window GetWindow()
+  {
+    return mMainWindow;
+  }
 
-  std::unique_ptr<Dali::Window> mMainWindow;
+  Dali::Adaptor& GetAdaptor()
+  {
+    return *mAdaptor;
+  }
+
+private:
+  Dali::Window mMainWindow;
   std::unique_ptr< Adaptor > mAdaptor;
 };