X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-ObjectRegistry.cpp;h=8e5ebc178a9546a0cf374d08cc24c8f7e0df9171;hb=55827866fcb8c7ee47581ac4335a3390472090e8;hp=ea8ac3c59a8a0a95505928b6f69039c50f25d5f6;hpb=297b3e7049f05c62fa5f619d13ce1488e14f9233;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp b/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
index ea8ac3c..8e5ebc1 100644
--- a/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
+++ b/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
@@ -23,8 +23,6 @@
 
 using namespace Dali;
 
-#include "mesh-builder.h"
-
 namespace
 {
 
@@ -90,24 +88,6 @@ struct TestCameraActorCallback
   bool& mSignalVerified;
 };
 
-struct TestImageActorCallback
-{
-  TestImageActorCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived)
-  {
-  }
-  void operator()(BaseHandle object)
-  {
-    tet_infoline("Verifying TestImageActorCallback()");
-    ImageActor actor = ImageActor::DownCast(object);
-    if(actor)
-    {
-      mSignalVerified = true;
-    }
-  }
-  bool& mSignalVerified;
-};
-
 struct TestLayerCallback
 {
   TestLayerCallback(bool& signalReceived)
@@ -126,25 +106,6 @@ struct TestLayerCallback
   bool& mSignalVerified;
 };
 
-
-struct TestMeshActorCallback
-{
-  TestMeshActorCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived)
-  {
-  }
-  void operator()(BaseHandle object)
-  {
-    tet_infoline("Verifying TestMeshActorCallback()");
-    MeshActor actor = MeshActor::DownCast(object);
-    if(actor)
-    {
-      mSignalVerified = true;
-    }
-  }
-  bool& mSignalVerified;
-};
-
 struct TestAnimationCallback
 {
   TestAnimationCallback(bool& signalReceived)
@@ -163,30 +124,8 @@ struct TestAnimationCallback
   bool& mSignalVerified;
 };
 
-struct TestShaderEffectCallback
-{
-  TestShaderEffectCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived)
-  {
-  }
-  void operator()(BaseHandle object)
-  {
-    tet_infoline("Verifying TestShaderEffectCallback()");
-    ShaderEffect actor = ShaderEffect::DownCast(object);
-    if(actor)
-    {
-      mSignalVerified = true;
-    }
-  }
-  bool& mSignalVerified;
-};
-
-
 } // anonymous namespace
 
-
-
-
 int UtcDaliObjectRegistryGet(void)
 {
   TestApplication application;
@@ -198,7 +137,16 @@ int UtcDaliObjectRegistryGet(void)
   END_TEST;
 }
 
+int UtcDaliObjectRegistryCopyConstructor(void)
+{
+  TestApplication application;
 
+  ObjectRegistry myRegistry;
+  ObjectRegistry anotherRegistry( myRegistry );
+
+  DALI_TEST_EQUALS( myRegistry, anotherRegistry, TEST_LOCATION );
+  END_TEST;
+}
 
 int UtcDaliObjectRegistrySignalActorCreated(void)
 {
@@ -253,34 +201,6 @@ int UtcDaliObjectRegistrySignalCameraCreated(void)
   END_TEST;
 }
 
-int UtcDaliObjectRegistrySignalImageActorCreated(void)
-{
-  TestApplication application;
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-
-  static const char* TestImageFilename = "icon_wrt.png";
-  Image image = ResourceImage::New(TestImageFilename);
-
-  bool verified = false;
-  TestImageActorCallback test(verified);
-
-  Dali::RefObject* objectPointer = NULL;
-  TestObjectDestroyedCallback test2(verified, objectPointer);
-
-  registry.ObjectCreatedSignal().Connect(&application, test);
-  registry.ObjectDestroyedSignal().Connect(&application, test2);
-
-  {
-    ImageActor actor = ImageActor::New(image);
-    DALI_TEST_CHECK( test.mSignalVerified );
-
-    verified = false;
-    objectPointer = actor.GetObjectPtr();
-  }
-  DALI_TEST_CHECK( test.mSignalVerified );
-  END_TEST;
-}
-
 int UtcDaliObjectRegistrySignalLayerCreated(void)
 {
   TestApplication application;
@@ -306,37 +226,6 @@ int UtcDaliObjectRegistrySignalLayerCreated(void)
   END_TEST;
 }
 
-
-int UtcDaliObjectRegistrySignalMeshActorCreated(void)
-{
-  TestApplication application;
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-
-  bool verified = false;
-  TestMeshActorCallback test(verified);
-
-  Dali::RefObject* objectPointer = NULL;
-  TestObjectDestroyedCallback test2(verified, objectPointer);
-
-  registry.ObjectCreatedSignal().Connect(&application, test);
-  registry.ObjectDestroyedSignal().Connect(&application, test2);
-
-  Mesh mesh = ConstructMesh(60);
-
-  {
-    MeshActor actor = MeshActor::New(mesh);
-
-    DALI_TEST_CHECK(actor);
-    DALI_TEST_CHECK( test.mSignalVerified );
-
-    verified = false;
-    objectPointer = actor.GetObjectPtr();
-  }
-  DALI_TEST_CHECK( test.mSignalVerified );
-  END_TEST;
-}
-
-
 int UtcDaliObjectRegistrySignalAnimationCreated(void)
 {
   TestApplication application;
@@ -361,41 +250,3 @@ int UtcDaliObjectRegistrySignalAnimationCreated(void)
   DALI_TEST_CHECK( test.mSignalVerified );
   END_TEST;
 }
-
-int UtcDaliObjectRegistrySignalShaderEffectCreated(void)
-{
-  TestApplication application;
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-
-  static const char* VertexSource =
-  "void main()\n"
-  "{\n"
-  "  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\n"
-  "  vTexCoord = aTexCoord;\n"
-  "}\n";
-
-  static const char* FragmentSource =
-  "void main()\n"
-  "{\n"
-  "  gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n"
-  "}\n";
-
-  bool verified = false;
-  TestShaderEffectCallback test(verified);
-
-  Dali::RefObject* objectPointer = NULL;
-  TestObjectDestroyedCallback test2(verified, objectPointer);
-
-  registry.ObjectCreatedSignal().Connect(&application, test);
-  registry.ObjectDestroyedSignal().Connect(&application, test2);
-
-  {
-    ShaderEffect effect = ShaderEffect::New( VertexSource, FragmentSource );
-    DALI_TEST_CHECK( test.mSignalVerified );
-
-    verified = false;
-    objectPointer = effect.GetObjectPtr();
-  }
-  DALI_TEST_CHECK( test.mSignalVerified );
-  END_TEST;
-}