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-singleton-service.cpp;h=8ac2d0fd7ad41aa1525b42eaeb0949c621bd2336;hp=2f6a046e30bfd22c91a387a6e732fc69550924d1;hb=8e237937b6f2445f672d5d930c1111da25f82617;hpb=7e315a440bad7033d19fefa8f9952d625ee6f076

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
index 2f6a046..8ac2d0f 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
@@ -19,7 +19,7 @@
 
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali
@@ -40,6 +40,7 @@ public:
   static Dali::SingletonService New();
   static Dali::SingletonService Get();
   void Register( const std::type_info& info, BaseHandle singleton );
+  void UnregisterAll();
   BaseHandle GetSingleton( const std::type_info& info ) const;
 
 private:
@@ -85,6 +86,11 @@ void SingletonService::Register( const std::type_info& info, BaseHandle singleto
   }
 }
 
+void SingletonService::UnregisterAll()
+{
+  mSingletonContainer.clear();
+}
+
 BaseHandle SingletonService::GetSingleton( const std::type_info& info ) const
 {
   BaseHandle object;
@@ -134,6 +140,11 @@ SingletonService::SingletonService()
 {
 }
 
+SingletonService SingletonService::New()
+{
+  return Internal::Adaptor::SingletonService::New();
+}
+
 SingletonService SingletonService::Get()
 {
   return Internal::Adaptor::SingletonService::Get();
@@ -148,6 +159,11 @@ void SingletonService::Register( const std::type_info& info, BaseHandle singleto
   GetImplementation( *this ).Register( info, singleton );
 }
 
+void SingletonService::UnregisterAll()
+{
+  GetImplementation( *this ).UnregisterAll();
+}
+
 BaseHandle SingletonService::GetSingleton( const std::type_info& info ) const
 {
   return GetImplementation( *this ).GetSingleton( info );