projects / platform / core / uifw / dali-core.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge "Remove unsafe new-delete pair from program and change unoptimal resizes to...
[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-CameraActor.cpp
diff --git a/automated-tests/src/dali/utc-Dali-CameraActor.cpp b/automated-tests/src/dali/utc-Dali-CameraActor.cpp
index c86d8e3..1a87e87 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-CameraActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-CameraActor.cpp
@@ -164,18 +164,18 @@ int UtcDaliCameraActorSetCameraOffStage(void)
 
   float value;
   std::string sValue;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(value);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(value);
   DALI_TEST_EQUALS(TEST_ASPECT_RATIO, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(value);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(value);
   DALI_TEST_EQUALS(TEST_FIELD_OF_VIEW, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(TEST_NEAR_PLANE_DISTANCE, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(TEST_FAR_PLANE_DISTANCE, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::PROJECTION_MODE).Get(sValue);
+  actor.GetProperty(CameraActor::Property::PROJECTION_MODE).Get(sValue);
   DALI_TEST_EQUALS("PERSPECTIVE_PROJECTION", sValue, TEST_LOCATION);
   bool bValue;
-  actor.GetProperty(CameraActor::INVERT_Y_AXIS).Get(bValue);
+  actor.GetProperty(CameraActor::Property::INVERT_Y_AXIS).Get(bValue);
   DALI_TEST_EQUALS(false, bValue, TEST_LOCATION);
   END_TEST;
 }
@@ -212,21 +212,21 @@ int UtcDaliCameraActorSetCameraOnStage(void)
   DALI_TEST_EQUALS(false, actor.GetInvertYAxis(), TEST_LOCATION);
 
   std::string sValue;
-  actor.GetProperty(CameraActor::TYPE).Get(sValue);
+  actor.GetProperty(CameraActor::Property::TYPE).Get(sValue);
   DALI_TEST_EQUALS(sValue, "LOOK_AT_TARGET", TEST_LOCATION);
 
   float value;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(value);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(value);
   DALI_TEST_EQUALS(TEST_ASPECT_RATIO, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(value);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(value);
   DALI_TEST_EQUALS(TEST_FIELD_OF_VIEW, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(TEST_NEAR_PLANE_DISTANCE, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(TEST_FAR_PLANE_DISTANCE, value, FLOAT_EPSILON, TEST_LOCATION);
 
   bool bValue;
-  actor.GetProperty(CameraActor::INVERT_Y_AXIS).Get(bValue);
+  actor.GetProperty(CameraActor::Property::INVERT_Y_AXIS).Get(bValue);
   DALI_TEST_EQUALS(false, bValue, TEST_LOCATION);
   END_TEST;
 }
@@ -243,11 +243,11 @@ int UtcDaliCameraActorGetCamera(void)
 
   DALI_TEST_EQUALS(actor.GetAspectRatio(), TEST_ASPECT_RATIO, FLOAT_EPSILON, TEST_LOCATION);
 
-  actor.SetProperty(CameraActor::TYPE, "FREE_LOOK");
-  actor.SetProperty(CameraActor::ASPECT_RATIO, TEST_ASPECT_RATIO);
-  actor.SetProperty(CameraActor::FIELD_OF_VIEW, TEST_FIELD_OF_VIEW);
-  actor.SetProperty(CameraActor::NEAR_PLANE_DISTANCE, TEST_NEAR_PLANE_DISTANCE);
-  actor.SetProperty(CameraActor::FAR_PLANE_DISTANCE, TEST_FAR_PLANE_DISTANCE);
+  actor.SetProperty(CameraActor::Property::TYPE, "FREE_LOOK");
+  actor.SetProperty(CameraActor::Property::ASPECT_RATIO, TEST_ASPECT_RATIO);
+  actor.SetProperty(CameraActor::Property::FIELD_OF_VIEW, TEST_FIELD_OF_VIEW);
+  actor.SetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE, TEST_NEAR_PLANE_DISTANCE);
+  actor.SetProperty(CameraActor::Property::FAR_PLANE_DISTANCE, TEST_FAR_PLANE_DISTANCE);
 
   DALI_TEST_EQUALS(Camera::FREE_LOOK, actor.GetType(), TEST_LOCATION);
   DALI_TEST_EQUALS(TEST_ASPECT_RATIO, actor.GetAspectRatio(), FLOAT_EPSILON, TEST_LOCATION);
@@ -269,24 +269,24 @@ int UtcDaliCameraActorDefaultProperties(void)
   application.Render(0);
   application.SendNotification();
   bool bValue;
-  actor.GetProperty(CameraActor::INVERT_Y_AXIS).Get(bValue);
+  actor.GetProperty(CameraActor::Property::INVERT_Y_AXIS).Get(bValue);
   DALI_TEST_EQUALS(false, bValue, TEST_LOCATION);
 
   std::vector<Property::Index> indices ;
-  indices.push_back(CameraActor::TYPE);
-  indices.push_back(CameraActor::PROJECTION_MODE);
-  indices.push_back(CameraActor::FIELD_OF_VIEW       );
-  indices.push_back(CameraActor::ASPECT_RATIO    );
-  indices.push_back(CameraActor::NEAR_PLANE_DISTANCE      );
-  indices.push_back(CameraActor::FAR_PLANE_DISTANCE       );
-  indices.push_back(CameraActor::LEFT_PLANE_DISTANCE      );
-  indices.push_back(CameraActor::RIGHT_PLANE_DISTANCE       );
-  indices.push_back(CameraActor::TOP_PLANE_DISTANCE      );
-  indices.push_back(CameraActor::BOTTOM_PLANE_DISTANCE       );
-  indices.push_back(CameraActor::TARGET_POSITION );
-  indices.push_back(CameraActor::PROJECTION_MATRIX );
-  indices.push_back(CameraActor::VIEW_MATRIX);
-  indices.push_back(CameraActor::INVERT_Y_AXIS );
+  indices.push_back(CameraActor::Property::TYPE);
+  indices.push_back(CameraActor::Property::PROJECTION_MODE);
+  indices.push_back(CameraActor::Property::FIELD_OF_VIEW);
+  indices.push_back(CameraActor::Property::ASPECT_RATIO);
+  indices.push_back(CameraActor::Property::NEAR_PLANE_DISTANCE);
+  indices.push_back(CameraActor::Property::FAR_PLANE_DISTANCE);
+  indices.push_back(CameraActor::Property::LEFT_PLANE_DISTANCE);
+  indices.push_back(CameraActor::Property::RIGHT_PLANE_DISTANCE);
+  indices.push_back(CameraActor::Property::TOP_PLANE_DISTANCE);
+  indices.push_back(CameraActor::Property::BOTTOM_PLANE_DISTANCE);
+  indices.push_back(CameraActor::Property::TARGET_POSITION);
+  indices.push_back(CameraActor::Property::PROJECTION_MATRIX);
+  indices.push_back(CameraActor::Property::VIEW_MATRIX);
+  indices.push_back(CameraActor::Property::INVERT_Y_AXIS);
 
   DALI_TEST_CHECK(actor.GetPropertyCount() == ( Actor::New().GetPropertyCount() + indices.size() ) );
 
@@ -297,8 +297,8 @@ int UtcDaliCameraActorDefaultProperties(void)
 
     switch(*iter)
     {
-      if ( ( *iter == CameraActor::PROJECTION_MATRIX ) ||
-           ( *iter == CameraActor::VIEW_MATRIX ) )
+      if ( ( *iter == CameraActor::Property::PROJECTION_MATRIX ) ||
+           ( *iter == CameraActor::Property::VIEW_MATRIX ) )
       {
         DALI_TEST_CHECK( ! actor.IsPropertyWritable(*iter) );
       }
@@ -314,7 +314,7 @@ int UtcDaliCameraActorDefaultProperties(void)
   // set/get one of them
   const float newAspect = TEST_ASPECT_RATIO * 2.f;
 
-  actor.SetProperty( CameraActor::ASPECT_RATIO, Property::Value(newAspect) );
+  actor.SetProperty( CameraActor::Property::ASPECT_RATIO, Property::Value(newAspect) );
   application.Render();
   application.SendNotification();
   application.Render();
@@ -338,7 +338,7 @@ int UtcDaliCameraActorSetTarget(void)
   DALI_TEST_EQUALS( actor.GetTargetPosition(), target, TEST_LOCATION );
 
   Vector3 value;
-  actor.GetProperty(CameraActor::TARGET_POSITION).Get(value);
+  actor.GetProperty(CameraActor::Property::TARGET_POSITION).Get(value);
   DALI_TEST_EQUALS(target, value, FLOAT_EPSILON, TEST_LOCATION);
   END_TEST;
 }
@@ -356,7 +356,7 @@ int UtcDaliCameraActorSetType01(void)
   DALI_TEST_EQUALS( actor.GetType(), Dali::Camera::LOOK_AT_TARGET, TEST_LOCATION );
 
   std::string sValue;
-  actor.GetProperty(CameraActor::TYPE).Get(sValue);
+  actor.GetProperty(CameraActor::Property::TYPE).Get(sValue);
   std::string result("LOOK_AT_TARGET");
   DALI_TEST_EQUALS(result, sValue, TEST_LOCATION);
   END_TEST;
@@ -376,7 +376,7 @@ int UtcDaliCameraActorSetType02(void)
   }
   catch ( Dali::DaliException& e )
   {
-    tet_printf("Assertion %s test at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
+    DALI_TEST_PRINT_ASSERT( e );
     DALI_TEST_ASSERT(e, "camera", TEST_LOCATION);
   }
 
@@ -388,7 +388,7 @@ int UtcDaliCameraActorSetType02(void)
   }
   catch ( Dali::DaliException& e )
   {
-    tet_printf("Assertion %s test at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
+    DALI_TEST_PRINT_ASSERT( e );
     DALI_TEST_ASSERT(e, "camera", TEST_LOCATION);
   }
 
@@ -412,7 +412,7 @@ int UtcDaliCameraActorSetFieldOfView(void)
   DALI_TEST_EQUALS( actor.GetFieldOfView(), fov, TEST_LOCATION );
 
   float value;
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(value);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(value);
   DALI_TEST_EQUALS(fov, value, FLOAT_EPSILON, TEST_LOCATION);
   END_TEST;
 }
@@ -430,7 +430,7 @@ int UtcDaliCameraActorSetAspectRatio(void)
   DALI_TEST_EQUALS( actor.GetAspectRatio(), aspect, TEST_LOCATION );
 
   float value;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(value);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(value);
   DALI_TEST_EQUALS(aspect, value, FLOAT_EPSILON, TEST_LOCATION);
   END_TEST;
 }
@@ -447,7 +447,7 @@ int UtcDaliCameraActorSetNearClippingPlane(void)
   DALI_TEST_EQUALS( actor.GetNearClippingPlane(), 400.0f, TEST_LOCATION );
 
   float value;
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(400.0f, value, FLOAT_EPSILON, TEST_LOCATION);
   END_TEST;
 }
@@ -464,7 +464,7 @@ int UtcDaliCameraActorSetFarClippingPlane(void)
   DALI_TEST_EQUALS( actor.GetFarClippingPlane(), 4000.0f, TEST_LOCATION );
 
   float value;
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(4000.0f, value, FLOAT_EPSILON, TEST_LOCATION);
   END_TEST;
 }
@@ -483,7 +483,7 @@ int UtcDaliCameraActorSetTargetPosition(void)
   DALI_TEST_EQUALS( actor.GetTargetPosition(), target, TEST_LOCATION );
 
   Vector3 value;
-  actor.GetProperty(CameraActor::TARGET_POSITION).Get(value);
+  actor.GetProperty(CameraActor::Property::TARGET_POSITION).Get(value);
   DALI_TEST_EQUALS(target, value, FLOAT_EPSILON, TEST_LOCATION);
   END_TEST;
 }
@@ -501,7 +501,7 @@ int UtcDaliCameraActorSetInvertYAxis(void)
   DALI_TEST_EQUALS( actor.GetInvertYAxis(), true, TEST_LOCATION );
 
   bool bValue;
-  actor.GetProperty(CameraActor::INVERT_Y_AXIS).Get(bValue);
+  actor.GetProperty(CameraActor::Property::INVERT_Y_AXIS).Get(bValue);
   DALI_TEST_EQUALS(true, bValue, TEST_LOCATION);
   END_TEST;
 }
@@ -511,7 +511,7 @@ int UtcDaliCameraActorModelView(void)
   TestApplication application;
   tet_infoline("Testing Dali::CameraActor Test view application");
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -531,7 +531,7 @@ int UtcDaliCameraActorModelView(void)
   CameraActor cameraActor = task.GetCameraActor();
 
   Matrix viewMatrix(false);
-  cameraActor.GetProperty(CameraActor::VIEW_MATRIX).Get( viewMatrix );
+  cameraActor.GetProperty(CameraActor::Property::VIEW_MATRIX).Get( viewMatrix );
   Matrix::Multiply(resultMatrix, resultMatrix, viewMatrix);
 
   DALI_TEST_CHECK( application.GetGlAbstraction().CheckUniformValue( "uModelView", resultMatrix ) );
@@ -549,19 +549,19 @@ int UtcDaliCameraActorSetPerspectiveProjection(void)
   DALI_TEST_CHECK(actor);
 
   float value;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(value);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(value);
   DALI_TEST_EQUALS(0.666666f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(value);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(value);
   DALI_TEST_EQUALS(0.489957f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(150.f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(4245.f, value, FLOAT_EPSILON, TEST_LOCATION);
 
   DALI_TEST_EQUALS((int)actor.GetProjectionMode(), (int)Dali::Camera::PERSPECTIVE_PROJECTION, TEST_LOCATION);
 
   std::string stringValue;
-  actor.GetProperty(CameraActor::PROJECTION_MODE).Get(stringValue);
+  actor.GetProperty(CameraActor::Property::PROJECTION_MODE).Get(stringValue);
   DALI_TEST_EQUALS(stringValue, "PERSPECTIVE_PROJECTION", TEST_LOCATION);
   END_TEST;
 }
@@ -586,10 +586,10 @@ int UtcDaliCameraActorSetOrthographicProjection01(void)
   float defaultFieldOfView;
   float defaultNearPlaneDistance;
   float defaultFarPlaneDistance;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(defaultAspectRatio);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(defaultFieldOfView);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(defaultNearPlaneDistance);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(defaultFarPlaneDistance);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(defaultAspectRatio);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(defaultFieldOfView);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(defaultNearPlaneDistance);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(defaultFarPlaneDistance);
   Vector3 defaultPos = actor.GetCurrentPosition();
 
   actor.SetOrthographicProjection( Size( 1080.0f, 1920.0f ) );
@@ -600,22 +600,22 @@ int UtcDaliCameraActorSetOrthographicProjection01(void)
   application.SendNotification();
 
   float value;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(value);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(value);
   DALI_TEST_EQUALS(defaultAspectRatio, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(value);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(value);
   DALI_TEST_EQUALS(defaultFieldOfView, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(defaultNearPlaneDistance, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(defaultFarPlaneDistance, value, FLOAT_EPSILON, TEST_LOCATION);
 
-  actor.GetProperty(CameraActor::LEFT_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::LEFT_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(-540.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::RIGHT_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::RIGHT_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS( 540.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::TOP_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::TOP_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(960.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::BOTTOM_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::BOTTOM_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(-960.0f, value, FLOAT_EPSILON, TEST_LOCATION);
 
   Vector3 pos = actor.GetCurrentPosition();
@@ -638,30 +638,30 @@ int UtcDaliCameraActorSetOrthographicProjection02(void)
   float defaultFieldOfView;
   float defaultNearPlaneDistance;
   float defaultFarPlaneDistance;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(defaultAspectRatio);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(defaultFieldOfView);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(defaultNearPlaneDistance);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(defaultFarPlaneDistance);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(defaultAspectRatio);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(defaultFieldOfView);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(defaultNearPlaneDistance);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(defaultFarPlaneDistance);
 
   actor.SetOrthographicProjection( -100.0f, 200.0f, -300.0f, 500.0f, 400.0f, 4000.0f );
 
   float value;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(value);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(value);
   DALI_TEST_EQUALS(defaultAspectRatio, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(value);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(value);
   DALI_TEST_EQUALS(defaultFieldOfView, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(400.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(4000.0f, value, FLOAT_EPSILON, TEST_LOCATION);
 
-  actor.GetProperty(CameraActor::LEFT_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::LEFT_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(-100.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::RIGHT_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::RIGHT_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS( 200.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::TOP_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::TOP_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(-300.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::BOTTOM_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::BOTTOM_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS( 500.0f, value, FLOAT_EPSILON, TEST_LOCATION);
 
   DALI_TEST_EQUALS((int)actor.GetProjectionMode(), (int)Dali::Camera::ORTHOGRAPHIC_PROJECTION, TEST_LOCATION);
@@ -682,42 +682,42 @@ int UtcDaliCameraActorSetOrthographicProjection03(void)
   float defaultFieldOfView;
   float defaultNearPlaneDistance;
   float defaultFarPlaneDistance;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(defaultAspectRatio);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(defaultFieldOfView);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(defaultNearPlaneDistance);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(defaultFarPlaneDistance);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(defaultAspectRatio);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(defaultFieldOfView);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(defaultNearPlaneDistance);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(defaultFarPlaneDistance);
 
   actor.SetProjectionMode(Dali::Camera::ORTHOGRAPHIC_PROJECTION);
 
-  actor.SetProperty(CameraActor::LEFT_PLANE_DISTANCE, -100.0f);
-  actor.SetProperty(CameraActor::RIGHT_PLANE_DISTANCE, 200.0f);
-  actor.SetProperty(CameraActor::TOP_PLANE_DISTANCE, -300.0f);
-  actor.SetProperty(CameraActor::BOTTOM_PLANE_DISTANCE, 500.0f);
+  actor.SetProperty(CameraActor::Property::LEFT_PLANE_DISTANCE, -100.0f);
+  actor.SetProperty(CameraActor::Property::RIGHT_PLANE_DISTANCE, 200.0f);
+  actor.SetProperty(CameraActor::Property::TOP_PLANE_DISTANCE, -300.0f);
+  actor.SetProperty(CameraActor::Property::BOTTOM_PLANE_DISTANCE, 500.0f);
   actor.SetNearClippingPlane( 400.0f );
   actor.SetFarClippingPlane( 4000.0f );
 
   float value;
-  actor.GetProperty(CameraActor::ASPECT_RATIO).Get(value);
+  actor.GetProperty(CameraActor::Property::ASPECT_RATIO).Get(value);
   DALI_TEST_EQUALS(defaultAspectRatio, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FIELD_OF_VIEW).Get(value);
+  actor.GetProperty(CameraActor::Property::FIELD_OF_VIEW).Get(value);
   DALI_TEST_EQUALS(defaultFieldOfView, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::NEAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::NEAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(400.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::FAR_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::FAR_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(4000.0f, value, FLOAT_EPSILON, TEST_LOCATION);
 
-  actor.GetProperty(CameraActor::LEFT_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::LEFT_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(-100.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::RIGHT_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::RIGHT_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS( 200.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::TOP_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::TOP_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS(-300.0f, value, FLOAT_EPSILON, TEST_LOCATION);
-  actor.GetProperty(CameraActor::BOTTOM_PLANE_DISTANCE).Get(value);
+  actor.GetProperty(CameraActor::Property::BOTTOM_PLANE_DISTANCE).Get(value);
   DALI_TEST_EQUALS( 500.0f, value, FLOAT_EPSILON, TEST_LOCATION);
 
   DALI_TEST_EQUALS((int)actor.GetProjectionMode(), (int)Dali::Camera::ORTHOGRAPHIC_PROJECTION, TEST_LOCATION);
   std::string stringValue;
-  actor.GetProperty(CameraActor::PROJECTION_MODE).Get(stringValue);
+  actor.GetProperty(CameraActor::Property::PROJECTION_MODE).Get(stringValue);
   DALI_TEST_EQUALS(stringValue, "ORTHOGRAPHIC_PROJECTION", TEST_LOCATION);
   END_TEST;
 }
@@ -734,7 +734,7 @@ int UtcDaliCameraActorReadProjectionMatrix(void)
   application.Render(0);
   application.Render();
   application.SendNotification();
-  Image image = CreateBitmapImage();
+  Image image = CreateBufferImage();
   ImageActor imageActor = ImageActor::New( image );
   imageActor.SetSize(100.0f, 100.0f);
   Stage::GetCurrent().Add(imageActor);
@@ -742,8 +742,8 @@ int UtcDaliCameraActorReadProjectionMatrix(void)
   Matrix projectionMatrix;
   Matrix viewMatrix;
 
-  camera.GetProperty(CameraActor::CameraActor::PROJECTION_MATRIX).Get(projectionMatrix);
-  camera.GetProperty(CameraActor::CameraActor::VIEW_MATRIX).Get(viewMatrix);
+  camera.GetProperty(CameraActor::CameraActor::Property::PROJECTION_MATRIX).Get(projectionMatrix);
+  camera.GetProperty(CameraActor::CameraActor::Property::VIEW_MATRIX).Get(viewMatrix);
 
   ShaderEffect shaderEffect = ShaderEffect::New( RENDER_SHADOW_VERTEX_SOURCE, RENDER_SHADOW_FRAGMENT_SOURCE);
   imageActor.SetShaderEffect(shaderEffect);
@@ -754,8 +754,8 @@ int UtcDaliCameraActorReadProjectionMatrix(void)
   Property::Index projectionMatrixPropertyIndex = shaderEffect.GetPropertyIndex(SHADER_LIGHT_CAMERA_PROJECTION_MATRIX_PROPERTY_NAME);
   Property::Index viewMatrixPropertyIndex = shaderEffect.GetPropertyIndex(SHADER_LIGHT_CAMERA_VIEW_MATRIX_PROPERTY_NAME);
 
-  Constraint projectionMatrixConstraint = Constraint::New<Dali::Matrix>( projectionMatrixPropertyIndex, Source( camera, CameraActor::PROJECTION_MATRIX ), EqualToConstraint());
-  Constraint viewMatrixConstraint = Constraint::New<Dali::Matrix>( viewMatrixPropertyIndex, Source( camera, CameraActor::VIEW_MATRIX ), EqualToConstraint());
+  Constraint projectionMatrixConstraint = Constraint::New<Dali::Matrix>( projectionMatrixPropertyIndex, Source( camera, CameraActor::Property::PROJECTION_MATRIX ), EqualToConstraint());
+  Constraint viewMatrixConstraint = Constraint::New<Dali::Matrix>( viewMatrixPropertyIndex, Source( camera, CameraActor::Property::VIEW_MATRIX ), EqualToConstraint());
 
   shaderEffect.ApplyConstraint(projectionMatrixConstraint);
   shaderEffect.ApplyConstraint(viewMatrixConstraint);
@@ -780,7 +780,7 @@ int UtcDaliCameraActorAnimatedProperties(void)
   actor.SetSize(100.0f, 100.0f);
   Stage::GetCurrent().Add(actor);
 
-  actor.ApplyConstraint(Constraint::New<Dali::Vector3>( Actor::POSITION, Source( camera, Actor::POSITION), EqualToConstraint()));
+  actor.ApplyConstraint(Constraint::New<Dali::Vector3>( Actor::Property::POSITION, Source( camera, Actor::Property::POSITION), EqualToConstraint()));
 
   camera.SetPosition(100.0f, 200.0f, 300.0f);
   application.SendNotification();
@@ -819,10 +819,10 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews01(void)
   target.SetPosition(targetPosition);
 
   Constraint cameraOrientationConstraint =
-    Constraint::New<Quaternion> ( Actor::ROTATION,
-                                  Source( target, Actor::WORLD_POSITION ),
-                                  Source( freeLookCameraActor,  Actor::WORLD_POSITION ),
-                                  Source( target, Actor::WORLD_ROTATION ),
+    Constraint::New<Quaternion> ( Actor::Property::ROTATION,
+                                  Source( target, Actor::Property::WORLD_POSITION ),
+                                  Source( freeLookCameraActor,  Actor::Property::WORLD_POSITION ),
+                                  Source( target, Actor::Property::WORLD_ROTATION ),
                                   &LookAt );
   freeLookCameraActor.ApplyConstraint( cameraOrientationConstraint );
 
@@ -855,8 +855,8 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews01(void)
         application.Render();
         Matrix freeLookViewMatrix;
         Matrix lookAtViewMatrix;
-        freeLookCameraActor.GetProperty(CameraActor::CameraActor::VIEW_MATRIX).Get(freeLookViewMatrix);
-        lookAtCameraActor.GetProperty(CameraActor::CameraActor::VIEW_MATRIX).Get(lookAtViewMatrix);
+        freeLookCameraActor.GetProperty(CameraActor::CameraActor::Property::VIEW_MATRIX).Get(freeLookViewMatrix);
+        lookAtCameraActor.GetProperty(CameraActor::CameraActor::Property::VIEW_MATRIX).Get(lookAtViewMatrix);
 
         DALI_TEST_EQUALS( freeLookViewMatrix, lookAtViewMatrix, 0.01, TEST_LOCATION );
       }
@@ -881,10 +881,10 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews02(void)
   target.SetPosition(targetPosition);
 
   Constraint cameraOrientationConstraint =
-    Constraint::New<Quaternion> ( Actor::ROTATION,
-                                  Source( target, Actor::WORLD_POSITION ),
-                                  Source( freeLookCameraActor,  Actor::WORLD_POSITION ),
-                                  Source( target, Actor::WORLD_ROTATION ),
+    Constraint::New<Quaternion> ( Actor::Property::ROTATION,
+                                  Source( target, Actor::Property::WORLD_POSITION ),
+                                  Source( freeLookCameraActor,  Actor::Property::WORLD_POSITION ),
+                                  Source( target, Actor::Property::WORLD_ROTATION ),
                                   &LookAt );
   freeLookCameraActor.ApplyConstraint( cameraOrientationConstraint );
 
@@ -917,8 +917,8 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews02(void)
         application.Render();
         Matrix freeLookViewMatrix;
         Matrix lookAtViewMatrix;
-        freeLookCameraActor.GetProperty(CameraActor::CameraActor::VIEW_MATRIX).Get(freeLookViewMatrix);
-        lookAtCameraActor.GetProperty(CameraActor::CameraActor::VIEW_MATRIX).Get(lookAtViewMatrix);
+        freeLookCameraActor.GetProperty(CameraActor::CameraActor::Property::VIEW_MATRIX).Get(freeLookViewMatrix);
+        lookAtCameraActor.GetProperty(CameraActor::CameraActor::Property::VIEW_MATRIX).Get(lookAtViewMatrix);
 
         Matrix freeLookWorld = freeLookCameraActor.GetCurrentWorldMatrix();
 
@@ -941,12 +941,6 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews03(void)
 
   Vector3 targetPosition(Vector3::ZERO);
 
-  CameraActor lookAtCameraActor = CameraActor::New(stageSize);
-  lookAtCameraActor.SetType(Camera::LOOK_AT_TARGET);
-  lookAtCameraActor.SetTargetPosition(targetPosition);
-  lookAtCameraActor.SetParentOrigin(ParentOrigin::CENTER);
-  stage.Add(lookAtCameraActor);
-
   Vector3 cameraOffset( 0.f, 0.f, 100.f );
 
   CameraActor freeLookCameraActor = CameraActor::New(stageSize);
@@ -958,15 +952,14 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews03(void)
   freeLookCameraActor.SetRotation(cameraOrientation);
 
   Actor cameraAnchor = Actor::New();
-  cameraAnchor.Add(lookAtCameraActor);
+  cameraAnchor.Add(freeLookCameraActor);
   stage.Add(cameraAnchor);
 
-
   for( float angle = 1.f; angle <= 180.f; angle += 1.f )
   {
     Quaternion rotation(Radian(Degree(angle)), Vector3::YAXIS);
 
-    lookAtCameraActor.SetPosition( rotation.Rotate( cameraOffset ) );
+    freeLookCameraActor.SetPosition( rotation.Rotate( cameraOffset ) );
     cameraAnchor.SetRotation( rotation );
 
     application.SendNotification();
@@ -975,7 +968,7 @@ int UtcDaliCameraActorCheckLookAtAndFreeLookViews03(void)
     application.Render();
 
     Matrix freeLookViewMatrix;
-    freeLookCameraActor.GetProperty(CameraActor::CameraActor::VIEW_MATRIX).Get(freeLookViewMatrix);
+    freeLookCameraActor.GetProperty(CameraActor::CameraActor::Property::VIEW_MATRIX).Get(freeLookViewMatrix);
 
     Matrix freeLookWorld = freeLookCameraActor.GetCurrentWorldMatrix();
 
Domain: Graphics System / DALi;