(AutomatedTests) Synchronise TestSingletonService with Adaptor

Change-Id: Ie534cf1d54b58e1aaa62464e18f4a30f40b29313

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 73cd4c8..8ac2d0f 100644 (file)
--- 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
@@ -40,6 +40,7 @@ public:
   static Dali::SingletonService New();
   static Dali::SingletonService Get();
   void Register( const std::type_info& info, BaseHandle singleton );
   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:
   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;
 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();
 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 );
 }
 
   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 );
 BaseHandle SingletonService::GetSingleton( const std::type_info& info ) const
 {
   return GetImplementation( *this ).GetSingleton( info );

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 956925e..68e4ecc 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
@@ -41,9 +41,11 @@ class SingletonService : public BaseHandle
 {
 public:
   SingletonService();
 {
 public:
   SingletonService();

+  static Dali::SingletonService New();

   static SingletonService Get();
   ~SingletonService();
   void Register( const std::type_info& info, BaseHandle singleton );
   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
   BaseHandle GetSingleton( const std::type_info& info ) const;
 
 public: // Not intended for application developers