Applying changes to Scene::New()

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

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.h
index 68e4ecc..7f57f55 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TOOLKIT_SINGLETON_SERVICE_H__
-#define __DALI_TOOLKIT_TOOLKIT_SINGLETON_SERVICE_H__
+#ifndef DALI_TOOLKIT_TEST_SINGLETON_SERVICE_H
+#define DALI_TOOLKIT_TEST_SINGLETON_SERVICE_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -15,43 +15,16 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-// EXTERNAL INCLUDES
-
-#define __DALI_SINGELTON_SERVICE_H__
-#include <typeinfo>
-#include <dali/public-api/object/base-handle.h>
-
-// INTERNAL INCLUDES
-
-namespace Dali
-{
-
-namespace Internal DALI_INTERNAL
-{
-namespace Adaptor
-{
-class SingletonService;
-}
-}
+#include <dali/devel-api/adaptor-framework/singleton-service.h>
+#include "test-application.h"
 
-class SingletonService : public BaseHandle
+namespace Test
 {
-public:
-  SingletonService();
-  static Dali::SingletonService New();
-  static SingletonService Get();
-  ~SingletonService();
-  void Register( const std::type_info& info, BaseHandle singleton );
-  void UnregisterAll();
-  BaseHandle GetSingleton( const std::type_info& info ) const;
 
-public: // Not intended for application developers
-  SingletonService( Internal::Adaptor::SingletonService* singletonService );
-};
+void SetApplication( Dali::SingletonService singletonService, TestApplication& testApplication );
 
-} // namespace Dali
+} // Test
 
-#endif // __DALI_TOOLKIT_TOOLKIT_SINGLETON_SERVICE_H__
+#endif //DALI_TOOLKIT_TEST_SINGLETON_SERVICE_H