Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-ObjectRegistry.cpp

diff --git a/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp b/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
index e959910..6c506c9 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
+++ b/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
@@ -126,23 +126,6 @@ struct TestLayerCallback
   bool& mSignalVerified;
 };
 
-struct TestLightActorCallback
-{
-  TestLightActorCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived)
-  {
-  }
-  void operator()(BaseHandle object)
-  {
-    tet_infoline("Verifying TestLightActorCallback()");
-    LightActor actor = LightActor::DownCast(object);
-    if(actor)
-    {
-      mSignalVerified = true;
-    }
-  }
-  bool& mSignalVerified;
-};
 
 struct TestMeshActorCallback
 {
@@ -162,23 +145,6 @@ struct TestMeshActorCallback
   bool& mSignalVerified;
 };
 
-struct TestModelCallback
-{
-  TestModelCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived)
-  {
-  }
-  void operator()(BaseHandle object)
-  {
-    tet_infoline("Verifying TestModelCallback()");
-    Model actor = Model::DownCast(object);
-    if(actor)
-    {
-      mSignalVerified = true;
-    }
-  }
-  bool& mSignalVerified;
-};
 
 struct TestTextActorCallback
 {
@@ -359,30 +325,6 @@ int UtcDaliObjectRegistrySignalLayerCreated(void)
   END_TEST;
 }
 
-int UtcDaliObjectRegistrySignalLightActorCreated(void)
-{
-  TestApplication application;
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-
-  bool verified = false;
-  TestLightActorCallback test(verified);
-
-  Dali::RefObject* objectPointer = NULL;
-  TestObjectDestroyedCallback test2(verified, objectPointer);
-
-  registry.ObjectCreatedSignal().Connect(&application, test);
-  registry.ObjectDestroyedSignal().Connect(&application, test2);
-
-  {
-    LightActor actor = LightActor::New();
-    DALI_TEST_CHECK( test.mSignalVerified );
-
-    verified = false;
-    objectPointer = actor.GetObjectPtr();
-  }
-  DALI_TEST_CHECK( test.mSignalVerified );
-  END_TEST;
-}
 
 int UtcDaliObjectRegistrySignalMeshActorCreated(void)
 {
@@ -413,55 +355,6 @@ int UtcDaliObjectRegistrySignalMeshActorCreated(void)
   END_TEST;
 }
 
-int UtcDaliObjectRegistrySignalModelCreated(void)
-{
-  TestApplication application;
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-
-  bool verified = false;
-  TestModelCallback test(verified);
-
-  Dali::RefObject* objectPointer = NULL;
-  TestObjectDestroyedCallback test2(verified, objectPointer);
-
-  registry.ObjectCreatedSignal().Connect(&application, test);
-  registry.ObjectDestroyedSignal().Connect(&application, test2);
-
-  {
-    Model model = Model::New("blah");
-    DALI_TEST_CHECK( test.mSignalVerified );
-
-    verified = false;
-    objectPointer = model.GetObjectPtr();
-  }
-  DALI_TEST_CHECK( test.mSignalVerified );
-  END_TEST;
-}
-
-int UtcDaliObjectRegistrySignalTextActorCreated(void)
-{
-  TestApplication application;
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-
-  bool verified = false;
-  TestTextActorCallback test(verified);
-
-  Dali::RefObject* objectPointer = NULL;
-  TestObjectDestroyedCallback test2(verified, objectPointer);
-
-  registry.ObjectCreatedSignal().Connect(&application, test);
-  registry.ObjectDestroyedSignal().Connect(&application, test2);
-
-  {
-    TextActor actor = TextActor::New("Hello");
-    DALI_TEST_CHECK( test.mSignalVerified );
-
-    verified = false;
-    objectPointer = actor.GetObjectPtr();
-  }
-  DALI_TEST_CHECK( test.mSignalVerified );
-  END_TEST;
-}
 
 int UtcDaliObjectRegistrySignalAnimationCreated(void)
 {