Formatting automated-tests
[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-Handle.cpp
index 24a4000..a950104 100644 (file)
  *
  */
 
-#include <iostream>
-#include <typeinfo>
-#include <stdlib.h>
-#include <dali/public-api/dali-core.h>
 #include <dali/devel-api/actors/actor-devel.h>
 #include <dali/devel-api/object/handle-devel.h>
+#include <dali/public-api/dali-core.h>
+#include <mesh-builder.h>
+#include <stdlib.h>
+
+#include <iostream>
+#include <typeinfo>
+
 #include "dali-test-suite-utils/dali-test-suite-utils.h"
 #include "dali-test-suite-utils/test-custom-actor.h"
 
-#include <mesh-builder.h>
-
 using namespace Dali;
 
 void handle_test_startup(void)
@@ -40,7 +41,6 @@ void handle_test_cleanup(void)
 
 namespace
 {
-
 /// Allows the creation of a BaseObject
 class BaseObjectType : public BaseObject
 {
@@ -54,7 +54,7 @@ Handle ImplicitCopyConstructor(Handle passedByValue)
 {
   // object + copy + passedByValue, ref count == 3
   DALI_TEST_CHECK(passedByValue);
-  if (passedByValue)
+  if(passedByValue)
   {
     DALI_TEST_EQUALS(3, passedByValue.GetBaseObject().ReferenceCount(), TEST_LOCATION);
   }
@@ -62,8 +62,7 @@ Handle ImplicitCopyConstructor(Handle passedByValue)
   return passedByValue;
 }
 
-} // anon namespace
-
+} // namespace
 
 int UtcDaliHandleConstructorVoid(void)
 {
@@ -90,7 +89,7 @@ int UtcDaliHandleCopyConstructor(void)
   // Copy the object, ref count == 2
   Handle copy(object);
   DALI_TEST_CHECK(copy);
-  if (copy)
+  if(copy)
   {
     DALI_TEST_EQUALS(2, copy.GetBaseObject().ReferenceCount(), TEST_LOCATION);
   }
@@ -100,7 +99,7 @@ int UtcDaliHandleCopyConstructor(void)
     Handle anotherCopy = ImplicitCopyConstructor(copy);
 
     DALI_TEST_CHECK(anotherCopy);
-    if (anotherCopy)
+    if(anotherCopy)
     {
       DALI_TEST_EQUALS(3, anotherCopy.GetBaseObject().ReferenceCount(), TEST_LOCATION);
     }
@@ -108,7 +107,7 @@ int UtcDaliHandleCopyConstructor(void)
 
   // anotherCopy out of scope, ref count == 2
   DALI_TEST_CHECK(copy);
-  if (copy)
+  if(copy)
   {
     DALI_TEST_EQUALS(2, copy.GetBaseObject().ReferenceCount(), TEST_LOCATION);
   }
@@ -142,20 +141,20 @@ int UtcDaliHandleMoveConstructor(void)
   // Initialize a handle, ref count == 1
   Handle handle = Actor::New();
 
-  DALI_TEST_EQUALS( 1, handle.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, handle.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
-  int value( 20 );
-  Property::Index index = handle.RegisterProperty( "customProperty",  value );
-  DALI_TEST_CHECK( handle.GetProperty<int>( index ) == value );
+  int             value(20);
+  Property::Index index = handle.RegisterProperty("customProperty", value);
+  DALI_TEST_CHECK(handle.GetProperty<int>(index) == value);
 
   // Move the object, ref count == 1
-  Handle move = std::move( handle );
-  DALI_TEST_CHECK( move );
+  Handle move = std::move(handle);
+  DALI_TEST_CHECK(move);
 
   // Check that object is moved (not copied, so ref count keeps the same)
-  DALI_TEST_EQUALS( 1, move.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( move.GetProperty<int>( index ) == value );
-  DALI_TEST_CHECK( !handle );
+  DALI_TEST_EQUALS(1, move.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(move.GetProperty<int>(index) == value);
+  DALI_TEST_CHECK(!handle);
 
   END_TEST;
 }
@@ -167,21 +166,21 @@ int UtcDaliHandleMoveAssignment(void)
   // Initialize a handle, ref count == 1
   Handle handle = Actor::New();
 
-  DALI_TEST_EQUALS( 1, handle.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_EQUALS(1, handle.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
-  int value( 20 );
-  Property::Index index = handle.RegisterProperty( "customProperty",  value );
-  DALI_TEST_CHECK( handle.GetProperty<int>( index ) == value );
+  int             value(20);
+  Property::Index index = handle.RegisterProperty("customProperty", value);
+  DALI_TEST_CHECK(handle.GetProperty<int>(index) == value);
 
   // Move the object, ref count == 1
   Handle move;
-  move = std::move( handle );
-  DALI_TEST_CHECK( move );
+  move = std::move(handle);
+  DALI_TEST_CHECK(move);
 
   // Check that object is moved (not copied, so ref count keeps the same)
-  DALI_TEST_EQUALS( 1, move.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( move.GetProperty<int>( index ) == value );
-  DALI_TEST_CHECK( !handle );
+  DALI_TEST_EQUALS(1, move.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(move.GetProperty<int>(index) == value);
+  DALI_TEST_CHECK(!handle);
 
   END_TEST;
 }
@@ -192,7 +191,7 @@ int UtcDaliHandleSupports(void)
   TestApplication application;
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( true == actor.Supports( Handle::DYNAMIC_PROPERTIES ) );
+  DALI_TEST_CHECK(true == actor.Supports(Handle::DYNAMIC_PROPERTIES));
   END_TEST;
 }
 
@@ -202,11 +201,11 @@ int UtcDaliHandleGetPropertyCount(void)
   TestApplication application;
 
   Actor actor = Actor::New();
-  int defaultPropertyCount( actor.GetPropertyCount() );
+  int   defaultPropertyCount(actor.GetPropertyCount());
 
   // Register a dynamic property
-  actor.RegisterProperty( "testProperty",  float(123.0f) );
-  DALI_TEST_CHECK( (defaultPropertyCount + 1u) == actor.GetPropertyCount() );
+  actor.RegisterProperty("testProperty", float(123.0f));
+  DALI_TEST_CHECK((defaultPropertyCount + 1u) == actor.GetPropertyCount());
   END_TEST;
 }
 
@@ -216,12 +215,12 @@ int UtcDaliHandleGetPropertyName(void)
   TestApplication application;
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( "parentOrigin" == actor.GetPropertyName( Actor::Property::PARENT_ORIGIN ) );
+  DALI_TEST_CHECK("parentOrigin" == actor.GetPropertyName(Actor::Property::PARENT_ORIGIN));
 
   // Register a dynamic property
-  std::string name("thisNameShouldMatch");
-  Property::Index index = actor.RegisterProperty( name, float(123.0f) );
-  DALI_TEST_CHECK( name == actor.GetPropertyName( index ) );
+  std::string     name("thisNameShouldMatch");
+  Property::Index index = actor.RegisterProperty(name, float(123.0f));
+  DALI_TEST_CHECK(name == actor.GetPropertyName(index));
 
   END_TEST;
 }
@@ -232,12 +231,12 @@ int UtcDaliHandleGetPropertyIndex01(void)
   TestApplication application;
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( Actor::Property::PARENT_ORIGIN == actor.GetPropertyIndex("parentOrigin") );
+  DALI_TEST_CHECK(Actor::Property::PARENT_ORIGIN == actor.GetPropertyIndex("parentOrigin"));
 
   // Register a dynamic property
-  std::string name("thisNameShouldMatch");
-  Property::Index index = actor.RegisterProperty( name, float(123.0f) );
-  DALI_TEST_CHECK( index == actor.GetPropertyIndex( name ) );
+  std::string     name("thisNameShouldMatch");
+  Property::Index index = actor.RegisterProperty(name, float(123.0f));
+  DALI_TEST_CHECK(index == actor.GetPropertyIndex(name));
   END_TEST;
 }
 
@@ -249,34 +248,34 @@ int UtcDaliHandleGetPropertyIndex02(void)
   Integration::Scene stage = application.GetScene();
 
   Actor actor = Actor::New();
-  stage.Add( actor );
+  stage.Add(actor);
 
   const unsigned int defaultPropertyCount = actor.GetPropertyCount();
 
   application.SendNotification();
   application.Render();
 
-  Property::Index key1 = CORE_PROPERTY_MAX_INDEX+1;
-  Property::Index key2 = CORE_PROPERTY_MAX_INDEX+2;
+  Property::Index key1 = CORE_PROPERTY_MAX_INDEX + 1;
+  Property::Index key2 = CORE_PROPERTY_MAX_INDEX + 2;
 
   const Vector4 testColor(0.5f, 0.2f, 0.9f, 1.0f);
-  const float withFlake(99.f);
+  const float   withFlake(99.f);
 
-  Property::Index index1 = actor.RegisterProperty( "MyPropertyOne", Vector3::ONE );
-  Property::Index index2 = actor.RegisterProperty( key1, "sideColor", testColor);
-  Property::Index index3 = actor.RegisterProperty( "MyPropertyTwo", Vector3::ONE );
-  Property::Index index4 = actor.RegisterProperty( key2, "iceCream", withFlake );
-  Property::Index index5 = actor.RegisterProperty( "MyPropertyThree", Vector3::ONE );
+  Property::Index index1 = actor.RegisterProperty("MyPropertyOne", Vector3::ONE);
+  Property::Index index2 = actor.RegisterProperty(key1, "sideColor", testColor);
+  Property::Index index3 = actor.RegisterProperty("MyPropertyTwo", Vector3::ONE);
+  Property::Index index4 = actor.RegisterProperty(key2, "iceCream", withFlake);
+  Property::Index index5 = actor.RegisterProperty("MyPropertyThree", Vector3::ONE);
 
   application.SendNotification();
   application.Render();
 
   // Test that we can get the property index from the integer key
-  Property::Index testIndex1 = actor.GetPropertyIndex( key1 );
-  Property::Index testIndex2 = actor.GetPropertyIndex( key2 );
+  Property::Index testIndex1 = actor.GetPropertyIndex(key1);
+  Property::Index testIndex2 = actor.GetPropertyIndex(key2);
 
-  DALI_TEST_EQUALS( index2, testIndex1, TEST_LOCATION );
-  DALI_TEST_EQUALS( index4, testIndex2, TEST_LOCATION );
+  DALI_TEST_EQUALS(index2, testIndex1, TEST_LOCATION);
+  DALI_TEST_EQUALS(index4, testIndex2, TEST_LOCATION);
 
   // Test that we keep the same indices on the named properties
   Property::Index testIndex = actor.GetPropertyIndex("MyPropertyOne");
@@ -290,7 +289,7 @@ int UtcDaliHandleGetPropertyIndex02(void)
   testIndex = actor.GetPropertyIndex("iceCream");
   DALI_TEST_EQUALS(testIndex, index4, TEST_LOCATION);
 
-  DALI_TEST_EQUALS(defaultPropertyCount+5, actor.GetPropertyCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(defaultPropertyCount + 5, actor.GetPropertyCount(), TEST_LOCATION);
   END_TEST;
 }
 
@@ -300,22 +299,21 @@ int UtcDaliHandleGetPropertyIndex03(void)
 
   Actor actor = Actor::New();
 
-  std::string myName("croydon");
-  Property::Index intKey = CORE_PROPERTY_MAX_INDEX+1;
-  Property::Value value( Color::GREEN );
-  Property::Index myIndex = actor.RegisterProperty( intKey, myName, value );
+  std::string     myName("croydon");
+  Property::Index intKey = CORE_PROPERTY_MAX_INDEX + 1;
+  Property::Value value(Color::GREEN);
+  Property::Index myIndex = actor.RegisterProperty(intKey, myName, value);
 
-  DALI_TEST_EQUALS( myIndex, actor.GetPropertyIndex( intKey ), TEST_LOCATION );
+  DALI_TEST_EQUALS(myIndex, actor.GetPropertyIndex(intKey), TEST_LOCATION);
 
   Property::Key key1(myName);
   Property::Key key2(intKey);
 
-  DALI_TEST_EQUALS( myIndex, actor.GetPropertyIndex( key1 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( myIndex, actor.GetPropertyIndex( key2 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(myIndex, actor.GetPropertyIndex(key1), TEST_LOCATION);
+  DALI_TEST_EQUALS(myIndex, actor.GetPropertyIndex(key2), TEST_LOCATION);
   END_TEST;
 }
 
-
 int UtcDaliHandleIsPropertyWritable(void)
 {
   tet_infoline("Positive Test Dali::Handle::IsPropertyWritable()");
@@ -324,43 +322,43 @@ int UtcDaliHandleIsPropertyWritable(void)
   Actor actor = Actor::New();
 
   // Actor properties which are writable:
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::PARENT_ORIGIN ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::PARENT_ORIGIN_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::PARENT_ORIGIN_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::PARENT_ORIGIN_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::ANCHOR_POINT ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::ANCHOR_POINT_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::ANCHOR_POINT_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::ANCHOR_POINT_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::SIZE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::SIZE_WIDTH  ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::SIZE_HEIGHT ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::SIZE_DEPTH  ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::POSITION ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::POSITION_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::POSITION_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::POSITION_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::ORIENTATION ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::SCALE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::SCALE_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::SCALE_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::SCALE_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::VISIBLE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::COLOR ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::COLOR_RED ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::COLOR_GREEN ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::COLOR_BLUE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::COLOR_ALPHA ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyWritable( Actor::Property::OPACITY ) );
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::PARENT_ORIGIN));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::PARENT_ORIGIN_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::PARENT_ORIGIN_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::PARENT_ORIGIN_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::ANCHOR_POINT));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::ANCHOR_POINT_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::ANCHOR_POINT_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::ANCHOR_POINT_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::SIZE));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::SIZE_WIDTH));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::SIZE_HEIGHT));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::SIZE_DEPTH));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::POSITION));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::POSITION_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::POSITION_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::POSITION_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::ORIENTATION));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::SCALE));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::SCALE_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::SCALE_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::SCALE_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::VISIBLE));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::COLOR));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::COLOR_RED));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::COLOR_GREEN));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::COLOR_BLUE));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::COLOR_ALPHA));
+  DALI_TEST_CHECK(true == actor.IsPropertyWritable(Actor::Property::OPACITY));
 
   // World-properties are not writable:
-  DALI_TEST_CHECK( false == actor.IsPropertyWritable( Actor::Property::WORLD_POSITION ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyWritable( Actor::Property::WORLD_ORIENTATION ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyWritable( Actor::Property::WORLD_SCALE ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyWritable( Actor::Property::WORLD_COLOR ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyWritable( Actor::Property::WORLD_POSITION_X ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyWritable( Actor::Property::WORLD_POSITION_Y ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyWritable( Actor::Property::WORLD_POSITION_Z ) );
+  DALI_TEST_CHECK(false == actor.IsPropertyWritable(Actor::Property::WORLD_POSITION));
+  DALI_TEST_CHECK(false == actor.IsPropertyWritable(Actor::Property::WORLD_ORIENTATION));
+  DALI_TEST_CHECK(false == actor.IsPropertyWritable(Actor::Property::WORLD_SCALE));
+  DALI_TEST_CHECK(false == actor.IsPropertyWritable(Actor::Property::WORLD_COLOR));
+  DALI_TEST_CHECK(false == actor.IsPropertyWritable(Actor::Property::WORLD_POSITION_X));
+  DALI_TEST_CHECK(false == actor.IsPropertyWritable(Actor::Property::WORLD_POSITION_Y));
+  DALI_TEST_CHECK(false == actor.IsPropertyWritable(Actor::Property::WORLD_POSITION_Z));
 
   END_TEST;
 }
@@ -373,43 +371,43 @@ int UtcDaliHandleIsPropertyAnimatable(void)
   Actor actor = Actor::New();
 
   // Actor properties which are animatable:
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::PARENT_ORIGIN ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::PARENT_ORIGIN_X ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::PARENT_ORIGIN_Y ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::PARENT_ORIGIN_Z ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::ANCHOR_POINT ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::ANCHOR_POINT_X ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::ANCHOR_POINT_Y ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::ANCHOR_POINT_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::SIZE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::SIZE_WIDTH  ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::SIZE_HEIGHT ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::SIZE_DEPTH  ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::POSITION ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::POSITION_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::POSITION_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::POSITION_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::ORIENTATION ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::SCALE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::SCALE_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::SCALE_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::SCALE_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::VISIBLE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::COLOR ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::COLOR_RED ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::COLOR_GREEN ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::COLOR_BLUE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::COLOR_ALPHA ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAnimatable( Actor::Property::OPACITY ) );
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::PARENT_ORIGIN));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::PARENT_ORIGIN_X));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::PARENT_ORIGIN_Y));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::PARENT_ORIGIN_Z));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::ANCHOR_POINT));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::ANCHOR_POINT_X));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::ANCHOR_POINT_Y));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::ANCHOR_POINT_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::SIZE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::SIZE_WIDTH));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::SIZE_HEIGHT));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::SIZE_DEPTH));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::POSITION));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::POSITION_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::POSITION_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::POSITION_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::ORIENTATION));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::SCALE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::SCALE_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::SCALE_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::SCALE_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::VISIBLE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::COLOR));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::COLOR_RED));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::COLOR_GREEN));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::COLOR_BLUE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::COLOR_ALPHA));
+  DALI_TEST_CHECK(true == actor.IsPropertyAnimatable(Actor::Property::OPACITY));
 
   // World-properties can not be animated
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::WORLD_POSITION ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::WORLD_ORIENTATION ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::WORLD_SCALE ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::WORLD_COLOR ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::WORLD_POSITION_X ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::WORLD_POSITION_Y ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAnimatable( Actor::Property::WORLD_POSITION_Z ) );
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::WORLD_POSITION));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::WORLD_ORIENTATION));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::WORLD_SCALE));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::WORLD_COLOR));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::WORLD_POSITION_X));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::WORLD_POSITION_Y));
+  DALI_TEST_CHECK(false == actor.IsPropertyAnimatable(Actor::Property::WORLD_POSITION_Z));
 
   END_TEST;
 }
@@ -421,128 +419,127 @@ int UtcDaliHandleIsPropertyAConstraintInput(void)
   Actor actor = Actor::New();
 
   // Actor properties which can be used as a constraint input:
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::PARENT_ORIGIN ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::PARENT_ORIGIN_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::PARENT_ORIGIN_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::PARENT_ORIGIN_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::ANCHOR_POINT ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::ANCHOR_POINT_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::ANCHOR_POINT_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::ANCHOR_POINT_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::SIZE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::SIZE_WIDTH  ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::SIZE_HEIGHT ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::SIZE_DEPTH  ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::POSITION ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::POSITION_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::POSITION_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::POSITION_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::ORIENTATION ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::SCALE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::SCALE_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::SCALE_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::SCALE_Z ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::VISIBLE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::COLOR ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::COLOR_RED ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::COLOR_GREEN ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::COLOR_BLUE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::COLOR_ALPHA ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::OPACITY ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::WORLD_POSITION ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::WORLD_ORIENTATION ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::WORLD_SCALE ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::WORLD_COLOR ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::WORLD_POSITION_X ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::WORLD_POSITION_Y ) );
-  DALI_TEST_CHECK( true == actor.IsPropertyAConstraintInput( Actor::Property::WORLD_POSITION_Z ) );
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::PARENT_ORIGIN));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::PARENT_ORIGIN_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::PARENT_ORIGIN_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::PARENT_ORIGIN_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::ANCHOR_POINT));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::ANCHOR_POINT_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::ANCHOR_POINT_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::ANCHOR_POINT_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::SIZE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::SIZE_WIDTH));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::SIZE_HEIGHT));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::SIZE_DEPTH));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::POSITION));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::POSITION_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::POSITION_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::POSITION_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::ORIENTATION));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::SCALE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::SCALE_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::SCALE_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::SCALE_Z));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::VISIBLE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::COLOR));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::COLOR_RED));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::COLOR_GREEN));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::COLOR_BLUE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::COLOR_ALPHA));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::OPACITY));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::WORLD_POSITION));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::WORLD_ORIENTATION));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::WORLD_SCALE));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::WORLD_COLOR));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::WORLD_POSITION_X));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::WORLD_POSITION_Y));
+  DALI_TEST_CHECK(true == actor.IsPropertyAConstraintInput(Actor::Property::WORLD_POSITION_Z));
 
   // Actor properties that cannot be used as a constraint input
-  DALI_TEST_CHECK( false == actor.IsPropertyAConstraintInput( Actor::Property::NAME ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAConstraintInput( Actor::Property::SENSITIVE ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAConstraintInput( Actor::Property::LEAVE_REQUIRED ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAConstraintInput( Actor::Property::INHERIT_ORIENTATION ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAConstraintInput( Actor::Property::INHERIT_SCALE ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAConstraintInput( Actor::Property::COLOR_MODE ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAConstraintInput( Actor::Property::DRAW_MODE ) );
-  DALI_TEST_CHECK( false == actor.IsPropertyAConstraintInput( Actor::Property::SIZE_MODE_FACTOR ) );
+  DALI_TEST_CHECK(false == actor.IsPropertyAConstraintInput(Actor::Property::NAME));
+  DALI_TEST_CHECK(false == actor.IsPropertyAConstraintInput(Actor::Property::SENSITIVE));
+  DALI_TEST_CHECK(false == actor.IsPropertyAConstraintInput(Actor::Property::LEAVE_REQUIRED));
+  DALI_TEST_CHECK(false == actor.IsPropertyAConstraintInput(Actor::Property::INHERIT_ORIENTATION));
+  DALI_TEST_CHECK(false == actor.IsPropertyAConstraintInput(Actor::Property::INHERIT_SCALE));
+  DALI_TEST_CHECK(false == actor.IsPropertyAConstraintInput(Actor::Property::COLOR_MODE));
+  DALI_TEST_CHECK(false == actor.IsPropertyAConstraintInput(Actor::Property::DRAW_MODE));
+  DALI_TEST_CHECK(false == actor.IsPropertyAConstraintInput(Actor::Property::SIZE_MODE_FACTOR));
 
   END_TEST;
 }
 
-
 int UtcDaliHandleGetPropertyType(void)
 {
   tet_infoline("Positive Test Dali::Handle::GetPropertyType()");
   TestApplication application;
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( Actor::Property::PARENT_ORIGIN ) );
-  DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( Actor::Property::ANCHOR_POINT ) );
-  DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( Actor::Property::SIZE ) );
-  DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( Actor::Property::POSITION ) );
-  DALI_TEST_CHECK( Property::ROTATION == actor.GetPropertyType( Actor::Property::ORIENTATION ) );
-  DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( Actor::Property::SCALE ) );
-  DALI_TEST_CHECK( Property::BOOLEAN  == actor.GetPropertyType( Actor::Property::VISIBLE ) );
-  DALI_TEST_CHECK( Property::VECTOR4  == actor.GetPropertyType( Actor::Property::COLOR ) );
+  DALI_TEST_CHECK(Property::VECTOR3 == actor.GetPropertyType(Actor::Property::PARENT_ORIGIN));
+  DALI_TEST_CHECK(Property::VECTOR3 == actor.GetPropertyType(Actor::Property::ANCHOR_POINT));
+  DALI_TEST_CHECK(Property::VECTOR3 == actor.GetPropertyType(Actor::Property::SIZE));
+  DALI_TEST_CHECK(Property::VECTOR3 == actor.GetPropertyType(Actor::Property::POSITION));
+  DALI_TEST_CHECK(Property::ROTATION == actor.GetPropertyType(Actor::Property::ORIENTATION));
+  DALI_TEST_CHECK(Property::VECTOR3 == actor.GetPropertyType(Actor::Property::SCALE));
+  DALI_TEST_CHECK(Property::BOOLEAN == actor.GetPropertyType(Actor::Property::VISIBLE));
+  DALI_TEST_CHECK(Property::VECTOR4 == actor.GetPropertyType(Actor::Property::COLOR));
 
   // Register some dynamic properties
-  Property::Index boolIndex     = actor.RegisterProperty( "boolProperty",      bool(true) );
-  Property::Index floatIndex    = actor.RegisterProperty( "floatProperty",     float(123.0f) );
-  Property::Index intIndex      = actor.RegisterProperty( "intProperty",       123 );
-  Property::Index vector2Index  = actor.RegisterProperty( "vector2Property",   Vector2(1.0f, 2.0f) );
-  Property::Index vector3Index  = actor.RegisterProperty( "vector3Property",   Vector3(1.0f, 2.0f, 3.0f) );
-  Property::Index vector4Index  = actor.RegisterProperty( "vector4Property",   Vector4(1.0f, 2.0f, 3.0f, 4.0f) );
-  Property::Index rotationIndex = actor.RegisterProperty( "rotationProperty",  AngleAxis(Degree(180.0f), Vector3::YAXIS) );
-
-  DALI_TEST_CHECK( Property::BOOLEAN  == actor.GetPropertyType( boolIndex ) );
-  DALI_TEST_CHECK( Property::FLOAT    == actor.GetPropertyType( floatIndex ) );
-  DALI_TEST_CHECK( Property::INTEGER  == actor.GetPropertyType( intIndex ) );
-  DALI_TEST_CHECK( Property::VECTOR2  == actor.GetPropertyType( vector2Index ) );
-  DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( vector3Index ) );
-  DALI_TEST_CHECK( Property::VECTOR4  == actor.GetPropertyType( vector4Index ) );
-  DALI_TEST_CHECK( Property::ROTATION == actor.GetPropertyType( rotationIndex ) );
+  Property::Index boolIndex     = actor.RegisterProperty("boolProperty", bool(true));
+  Property::Index floatIndex    = actor.RegisterProperty("floatProperty", float(123.0f));
+  Property::Index intIndex      = actor.RegisterProperty("intProperty", 123);
+  Property::Index vector2Index  = actor.RegisterProperty("vector2Property", Vector2(1.0f, 2.0f));
+  Property::Index vector3Index  = actor.RegisterProperty("vector3Property", Vector3(1.0f, 2.0f, 3.0f));
+  Property::Index vector4Index  = actor.RegisterProperty("vector4Property", Vector4(1.0f, 2.0f, 3.0f, 4.0f));
+  Property::Index rotationIndex = actor.RegisterProperty("rotationProperty", AngleAxis(Degree(180.0f), Vector3::YAXIS));
+
+  DALI_TEST_CHECK(Property::BOOLEAN == actor.GetPropertyType(boolIndex));
+  DALI_TEST_CHECK(Property::FLOAT == actor.GetPropertyType(floatIndex));
+  DALI_TEST_CHECK(Property::INTEGER == actor.GetPropertyType(intIndex));
+  DALI_TEST_CHECK(Property::VECTOR2 == actor.GetPropertyType(vector2Index));
+  DALI_TEST_CHECK(Property::VECTOR3 == actor.GetPropertyType(vector3Index));
+  DALI_TEST_CHECK(Property::VECTOR4 == actor.GetPropertyType(vector4Index));
+  DALI_TEST_CHECK(Property::ROTATION == actor.GetPropertyType(rotationIndex));
 
   // Non animatable properties
-  Property::Index nonAnimStringIndex = actor.RegisterProperty( "manFromDelmonte",   std::string("yes"), Property::READ_WRITE);
-  Property::Index nonAnimV2Index = actor.RegisterProperty( "v2", Vector2(1.f, 2.f), Property::READ_WRITE);
-  Property::Index nonAnimV3Index = actor.RegisterProperty( "v3", Vector3(1.f, 2.f, 3.f), Property::READ_WRITE);
-  Property::Index nonAnimV4Index = actor.RegisterProperty( "v4", Vector4(1.f, 2.f, 3.f, 4.f), Property::READ_WRITE);
-  Property::Index nonAnimBooleanIndex = actor.RegisterProperty( "bool", true, Property::READ_WRITE);
-  Property::Index nonAnimFloatIndex = actor.RegisterProperty( "float", 0.f, Property::READ_WRITE);
-  Property::Index nonAnimIntegerIndex = actor.RegisterProperty( "int", 0, Property::READ_WRITE);
-
-  DALI_TEST_CHECK( nonAnimStringIndex  != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( nonAnimV2Index      != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( nonAnimV3Index      != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( nonAnimV4Index      != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( nonAnimBooleanIndex != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( nonAnimFloatIndex   != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( nonAnimIntegerIndex != Property::INVALID_INDEX );
-
-  DALI_TEST_CHECK( Property::STRING   == actor.GetPropertyType( nonAnimStringIndex ) );
-  DALI_TEST_CHECK( Property::VECTOR2  == actor.GetPropertyType( nonAnimV2Index ) );
-  DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( nonAnimV3Index ) );
-  DALI_TEST_CHECK( Property::VECTOR4  == actor.GetPropertyType( nonAnimV4Index ) );
-  DALI_TEST_CHECK( Property::BOOLEAN  == actor.GetPropertyType( nonAnimBooleanIndex ) );
-  DALI_TEST_CHECK( Property::FLOAT    == actor.GetPropertyType( nonAnimFloatIndex ) );
-  DALI_TEST_CHECK( Property::INTEGER  == actor.GetPropertyType( nonAnimIntegerIndex ) );
-
-  DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimStringIndex ) );
-  DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimV2Index ) );
-  DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimV3Index ) );
-  DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimV4Index ) );
-  DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimBooleanIndex ) );
-  DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimFloatIndex ) );
-  DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimIntegerIndex ) );
-
-  DALI_TEST_EQUALS( "yes" , actor.GetProperty( nonAnimStringIndex ).Get<std::string>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(1.f, 2.f) , actor.GetProperty( nonAnimV2Index ).Get<Vector2>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector3(1.f, 2.f, 3.f) , actor.GetProperty( nonAnimV3Index ).Get<Vector3>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector4(1.f, 2.f, 3.f, 4.f) , actor.GetProperty( nonAnimV4Index ).Get<Vector4>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, actor.GetProperty( nonAnimBooleanIndex ).Get<bool>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0.f, actor.GetProperty( nonAnimFloatIndex ).Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0, actor.GetProperty( nonAnimIntegerIndex ).Get<int>(), TEST_LOCATION );
+  Property::Index nonAnimStringIndex  = actor.RegisterProperty("manFromDelmonte", std::string("yes"), Property::READ_WRITE);
+  Property::Index nonAnimV2Index      = actor.RegisterProperty("v2", Vector2(1.f, 2.f), Property::READ_WRITE);
+  Property::Index nonAnimV3Index      = actor.RegisterProperty("v3", Vector3(1.f, 2.f, 3.f), Property::READ_WRITE);
+  Property::Index nonAnimV4Index      = actor.RegisterProperty("v4", Vector4(1.f, 2.f, 3.f, 4.f), Property::READ_WRITE);
+  Property::Index nonAnimBooleanIndex = actor.RegisterProperty("bool", true, Property::READ_WRITE);
+  Property::Index nonAnimFloatIndex   = actor.RegisterProperty("float", 0.f, Property::READ_WRITE);
+  Property::Index nonAnimIntegerIndex = actor.RegisterProperty("int", 0, Property::READ_WRITE);
+
+  DALI_TEST_CHECK(nonAnimStringIndex != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(nonAnimV2Index != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(nonAnimV3Index != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(nonAnimV4Index != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(nonAnimBooleanIndex != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(nonAnimFloatIndex != Property::INVALID_INDEX);
+  DALI_TEST_CHECK(nonAnimIntegerIndex != Property::INVALID_INDEX);
+
+  DALI_TEST_CHECK(Property::STRING == actor.GetPropertyType(nonAnimStringIndex));
+  DALI_TEST_CHECK(Property::VECTOR2 == actor.GetPropertyType(nonAnimV2Index));
+  DALI_TEST_CHECK(Property::VECTOR3 == actor.GetPropertyType(nonAnimV3Index));
+  DALI_TEST_CHECK(Property::VECTOR4 == actor.GetPropertyType(nonAnimV4Index));
+  DALI_TEST_CHECK(Property::BOOLEAN == actor.GetPropertyType(nonAnimBooleanIndex));
+  DALI_TEST_CHECK(Property::FLOAT == actor.GetPropertyType(nonAnimFloatIndex));
+  DALI_TEST_CHECK(Property::INTEGER == actor.GetPropertyType(nonAnimIntegerIndex));
+
+  DALI_TEST_CHECK(!actor.IsPropertyAnimatable(nonAnimStringIndex));
+  DALI_TEST_CHECK(!actor.IsPropertyAnimatable(nonAnimV2Index));
+  DALI_TEST_CHECK(!actor.IsPropertyAnimatable(nonAnimV3Index));
+  DALI_TEST_CHECK(!actor.IsPropertyAnimatable(nonAnimV4Index));
+  DALI_TEST_CHECK(!actor.IsPropertyAnimatable(nonAnimBooleanIndex));
+  DALI_TEST_CHECK(!actor.IsPropertyAnimatable(nonAnimFloatIndex));
+  DALI_TEST_CHECK(!actor.IsPropertyAnimatable(nonAnimIntegerIndex));
+
+  DALI_TEST_EQUALS("yes", actor.GetProperty(nonAnimStringIndex).Get<std::string>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector2(1.f, 2.f), actor.GetProperty(nonAnimV2Index).Get<Vector2>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3(1.f, 2.f, 3.f), actor.GetProperty(nonAnimV3Index).Get<Vector3>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector4(1.f, 2.f, 3.f, 4.f), actor.GetProperty(nonAnimV4Index).Get<Vector4>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, actor.GetProperty(nonAnimBooleanIndex).Get<bool>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0.f, actor.GetProperty(nonAnimFloatIndex).Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0, actor.GetProperty(nonAnimIntegerIndex).Get<int>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -554,46 +551,46 @@ int UtcDaliHandleNonAnimatableProperties(void)
 
   Actor actor = Actor::New();
 
-  Property::Index nonAnimStringIndex = actor.RegisterProperty( "manFromDelmonte", std::string("no"), Property::READ_WRITE);
+  Property::Index nonAnimStringIndex = actor.RegisterProperty("manFromDelmonte", std::string("no"), Property::READ_WRITE);
 
   //// modify writable?
-  actor.SetProperty( nonAnimStringIndex, Property::Value("yes") );
+  actor.SetProperty(nonAnimStringIndex, Property::Value("yes"));
 
-  DALI_TEST_CHECK( "yes"  == actor.GetProperty( nonAnimStringIndex ).Get<std::string>() );
+  DALI_TEST_CHECK("yes" == actor.GetProperty(nonAnimStringIndex).Get<std::string>());
 
   //// cannot modify read only?
-  Property::Index readonly = actor.RegisterProperty( "float", 0.f, Property::READ_ONLY);
+  Property::Index readonly = actor.RegisterProperty("float", 0.f, Property::READ_ONLY);
 
   DALI_TEST_CHECK(!actor.IsPropertyAnimatable(readonly));
   DALI_TEST_CHECK(!actor.IsPropertyWritable(readonly));
 
-  actor.SetProperty( readonly, Property::Value(1.f) );
+  actor.SetProperty(readonly, Property::Value(1.f));
   // trying to set a read-only property is a no-op
 
-  DALI_TEST_EQUALS( 0.f, actor.GetProperty( readonly ).Get<float>(), TEST_LOCATION );
+  DALI_TEST_EQUALS(0.f, actor.GetProperty(readonly).Get<float>(), TEST_LOCATION);
 
   /// animatable can be set
-  Property::Index write_anim = actor.RegisterProperty( "write_float", 0.f, Property::ANIMATABLE);
+  Property::Index write_anim = actor.RegisterProperty("write_float", 0.f, Property::ANIMATABLE);
 
   DALI_TEST_CHECK(actor.IsPropertyAnimatable(write_anim));
   DALI_TEST_CHECK(actor.IsPropertyWritable(write_anim));
 
-  actor.SetProperty( write_anim, Property::Value(1.f) );
+  actor.SetProperty(write_anim, Property::Value(1.f));
 
   //// animate a non animatable property throws
-  float durationSeconds(2.0f);
+  float     durationSeconds(2.0f);
   Animation animation = Animation::New(durationSeconds);
-  bool relativeValue(true);
+  bool      relativeValue(true);
   try
   {
     animation.AnimateBy(Property(actor, nonAnimStringIndex), relativeValue, AlphaFunction::EASE_IN);
   }
-  catch ( Dali::DaliException& e )
+  catch(Dali::DaliException& e)
   {
-    DALI_TEST_ASSERT( e, "Property type is not animatable", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "Property type is not animatable", TEST_LOCATION);
   }
 
-  DALI_TEST_EQUALS( "yes", actor.GetProperty( nonAnimStringIndex ).Get<std::string>(), TEST_LOCATION );
+  DALI_TEST_EQUALS("yes", actor.GetProperty(nonAnimStringIndex).Get<std::string>(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -605,58 +602,58 @@ int UtcDaliHandleNonAnimtableCompositeProperties(void)
 
   Actor actor = Actor::New();
 
-  Property::Value value(Property::ARRAY);
+  Property::Value  value(Property::ARRAY);
   Property::Array* array = value.GetArray();
-  DALI_TEST_CHECK( array );
+  DALI_TEST_CHECK(array);
 
-  array->PushBack( Property::Value( 0.1f ) );
-  array->PushBack( "a string" );
-  array->PushBack( Property::Value( Vector3(1,2,3) ) );
+  array->PushBack(Property::Value(0.1f));
+  array->PushBack("a string");
+  array->PushBack(Property::Value(Vector3(1, 2, 3)));
 
-  DALI_TEST_EQUALS( 3u, array->Count(), TEST_LOCATION );
+  DALI_TEST_EQUALS(3u, array->Count(), TEST_LOCATION);
 
-  Property::Index propertyIndex = actor.RegisterProperty( "composite", value, Property::READ_WRITE );
+  Property::Index propertyIndex = actor.RegisterProperty("composite", value, Property::READ_WRITE);
 
-  Property::Value out = actor.GetProperty( propertyIndex );
+  Property::Value  out      = actor.GetProperty(propertyIndex);
   Property::Array* outArray = out.GetArray();
-  DALI_TEST_CHECK( outArray != NULL );
+  DALI_TEST_CHECK(outArray != NULL);
 
-  DALI_TEST_CHECK( Property::FLOAT     == outArray->GetElementAt(0).GetType());
-  DALI_TEST_CHECK( Property::STRING    == outArray->GetElementAt(1).GetType());
-  DALI_TEST_CHECK( Property::VECTOR3   == outArray->GetElementAt(2).GetType());
+  DALI_TEST_CHECK(Property::FLOAT == outArray->GetElementAt(0).GetType());
+  DALI_TEST_CHECK(Property::STRING == outArray->GetElementAt(1).GetType());
+  DALI_TEST_CHECK(Property::VECTOR3 == outArray->GetElementAt(2).GetType());
 
-  DALI_TEST_EQUALS( 0.1f,            outArray->GetElementAt(0).Get<float>(),       TEST_LOCATION);
-  DALI_TEST_EQUALS( "a string",     outArray->GetElementAt(1).Get<std::string>(),  TEST_LOCATION);
-  DALI_TEST_EQUALS( Vector3(1,2,3), outArray->GetElementAt(2).Get<Vector3>(),      TEST_LOCATION);
+  DALI_TEST_EQUALS(0.1f, outArray->GetElementAt(0).Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS("a string", outArray->GetElementAt(1).Get<std::string>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3(1, 2, 3), outArray->GetElementAt(2).Get<Vector3>(), TEST_LOCATION);
 
   // composite types not animatable
   bool exception = false;
   try
   {
-    actor.RegisterProperty( "compositemap", value, Property::ANIMATABLE);
+    actor.RegisterProperty("compositemap", value, Property::ANIMATABLE);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     exception = true;
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
   }
 
   DALI_TEST_EQUALS(exception, true, TEST_LOCATION);
 
   // Map of maps
   Property::Value mapOfMaps(Property::MAP);
-  Property::Map* map = mapOfMaps.GetMap();
+  Property::Map*  map = mapOfMaps.GetMap();
 
-  map->Insert( "key", Property::Value(Property::MAP) );
-  map->Insert( "2key", "a string" );
+  map->Insert("key", Property::Value(Property::MAP));
+  map->Insert("2key", "a string");
 
-  DALI_TEST_EQUALS( "a string",  (*map)["2key"].Get<std::string>(),  TEST_LOCATION);
+  DALI_TEST_EQUALS("a string", (*map)["2key"].Get<std::string>(), TEST_LOCATION);
 
   Property::Map* innerMap = map->Find("key")->GetMap();
-  innerMap->Insert( "subkey", 5.f );
+  innerMap->Insert("subkey", 5.f);
 
-  DALI_TEST_CHECK( NULL != map->Find("key")->GetMap()->Find("subkey") );
-  DALI_TEST_EQUALS( 5.f, map->Find("key")->GetMap()->Find("subkey")->Get<float>(), TEST_LOCATION);
+  DALI_TEST_CHECK(NULL != map->Find("key")->GetMap()->Find("subkey"));
+  DALI_TEST_EQUALS(5.f, map->Find("key")->GetMap()->Find("subkey")->Get<float>(), TEST_LOCATION);
   END_TEST;
 }
 
@@ -666,13 +663,13 @@ int UtcDaliHandleSetProperty01(void)
   TestApplication application;
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( ParentOrigin::TOP_LEFT == actor.GetProperty( Actor::Property::PARENT_ORIGIN ).Get<Vector3>() );
+  DALI_TEST_CHECK(ParentOrigin::TOP_LEFT == actor.GetProperty(Actor::Property::PARENT_ORIGIN).Get<Vector3>());
 
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   // flush the queue and render once
   application.SendNotification();
   application.Render();
-  DALI_TEST_CHECK( ParentOrigin::CENTER == actor.GetProperty( Actor::Property::PARENT_ORIGIN ).Get<Vector3>() );
+  DALI_TEST_CHECK(ParentOrigin::CENTER == actor.GetProperty(Actor::Property::PARENT_ORIGIN).Get<Vector3>());
   END_TEST;
 }
 
@@ -683,10 +680,10 @@ int UtcDaliHandleSetProperty02(void)
 
   Actor actor = Actor::New();
 
-  DALI_TEST_CHECK( !actor.IsPropertyWritable( Actor::Property::WORLD_POSITION ) );
+  DALI_TEST_CHECK(!actor.IsPropertyWritable(Actor::Property::WORLD_POSITION));
 
   // World position is not writable so this is a no-op and should not crash
-  actor.SetProperty( Actor::Property::WORLD_POSITION, Vector3(1,2,3) );
+  actor.SetProperty(Actor::Property::WORLD_POSITION, Vector3(1, 2, 3));
 
   END_TEST;
 }
@@ -699,31 +696,30 @@ int UtcDaliHandleRegisterProperty01(void)
   Integration::Scene stage = application.GetScene();
 
   Actor actor = Actor::New();
-  stage.Add( actor );
+  stage.Add(actor);
 
   const unsigned int defaultPropertyCount = actor.GetPropertyCount();
 
   application.SendNotification();
   application.Render();
 
-  Property::Index index1 = actor.RegisterProperty( "MyProperty", Vector3::ONE );
+  Property::Index index1 = actor.RegisterProperty("MyProperty", Vector3::ONE);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetPropertyCount(), defaultPropertyCount + 1, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetProperty< Vector3 >( index1 ), Vector3::ONE, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetPropertyCount(), defaultPropertyCount + 1, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetProperty<Vector3>(index1), Vector3::ONE, TEST_LOCATION);
 
   // No new property should be registered when we call the below function
-  Property::Index index2 = actor.RegisterProperty( "MyProperty", Vector3::ZAXIS );
+  Property::Index index2 = actor.RegisterProperty("MyProperty", Vector3::ZAXIS);
 
   application.SendNotification();
   application.Render();
 
-
-  DALI_TEST_EQUALS( index1, index2, TEST_LOCATION ); // We should have the same index as per the first registration
-  DALI_TEST_EQUALS( actor.GetPropertyCount(), defaultPropertyCount + 1, TEST_LOCATION ); // Property count should be the same
-  DALI_TEST_EQUALS( actor.GetProperty< Vector3 >( index2 ), Vector3::ZAXIS, TEST_LOCATION ); // Value should be what we sent on second RegisterProperty call
+  DALI_TEST_EQUALS(index1, index2, TEST_LOCATION);                                     // We should have the same index as per the first registration
+  DALI_TEST_EQUALS(actor.GetPropertyCount(), defaultPropertyCount + 1, TEST_LOCATION); // Property count should be the same
+  DALI_TEST_EQUALS(actor.GetProperty<Vector3>(index2), Vector3::ZAXIS, TEST_LOCATION); // Value should be what we sent on second RegisterProperty call
 
   END_TEST;
 }
@@ -736,48 +732,46 @@ int UtcDaliHandleRegisterProperty02(void)
   Integration::Scene stage = application.GetScene();
 
   Actor actor = Actor::New();
-  stage.Add( actor );
+  stage.Add(actor);
 
   const unsigned int defaultPropertyCount = actor.GetPropertyCount();
 
   application.SendNotification();
   application.Render();
 
-  Property::Index key1 = CORE_PROPERTY_MAX_INDEX+1;
-  Property::Index key2 = CORE_PROPERTY_MAX_INDEX+2;
+  Property::Index key1 = CORE_PROPERTY_MAX_INDEX + 1;
+  Property::Index key2 = CORE_PROPERTY_MAX_INDEX + 2;
 
   const Vector4 testColor(0.5f, 0.2f, 0.9f, 1.0f);
-  const float withFlake(99.f);
+  const float   withFlake(99.f);
 
-  Property::Index index1 = actor.RegisterProperty( "MyPropertyOne", Vector3::ONE );
-  Property::Index index2 = actor.RegisterProperty( key1, "sideColor", testColor);
-  Property::Index index3 = actor.RegisterProperty( key2, "iceCream", withFlake );
+  Property::Index index1 = actor.RegisterProperty("MyPropertyOne", Vector3::ONE);
+  Property::Index index2 = actor.RegisterProperty(key1, "sideColor", testColor);
+  Property::Index index3 = actor.RegisterProperty(key2, "iceCream", withFlake);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( actor.GetPropertyCount(), defaultPropertyCount + 3, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetProperty< Vector3 >( index1 ), Vector3::ONE, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetProperty< Vector4 >( index2 ), testColor, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetProperty< float >( index3 ), withFlake, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetPropertyCount(), defaultPropertyCount + 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetProperty<Vector3>(index1), Vector3::ONE, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetProperty<Vector4>(index2), testColor, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetProperty<float>(index3), withFlake, TEST_LOCATION);
 
   // No new property should be registered when we call the below functions
-  Property::Index testIndex2 = actor.RegisterProperty( "iceCream", 2200.f );
-  Property::Index testIndex1 = actor.RegisterProperty( "sideColor", Color::BLACK );
+  Property::Index testIndex2 = actor.RegisterProperty("iceCream", 2200.f);
+  Property::Index testIndex1 = actor.RegisterProperty("sideColor", Color::BLACK);
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( index2, testIndex1, TEST_LOCATION ); // We should have the same index as per the first registration
-  DALI_TEST_EQUALS( index3, testIndex2, TEST_LOCATION ); // We should have the same index as per the first registration
-  DALI_TEST_EQUALS( actor.GetPropertyCount(), defaultPropertyCount + 3, TEST_LOCATION ); // Property count should be the same
-  DALI_TEST_EQUALS( actor.GetProperty< Vector4 >( index2 ), Color::BLACK, TEST_LOCATION ); // Value should be what we sent on second RegisterProperty call
-  DALI_TEST_EQUALS( actor.GetProperty< float >( index3 ), 2200.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(index2, testIndex1, TEST_LOCATION);                                 // We should have the same index as per the first registration
+  DALI_TEST_EQUALS(index3, testIndex2, TEST_LOCATION);                                 // We should have the same index as per the first registration
+  DALI_TEST_EQUALS(actor.GetPropertyCount(), defaultPropertyCount + 3, TEST_LOCATION); // Property count should be the same
+  DALI_TEST_EQUALS(actor.GetProperty<Vector4>(index2), Color::BLACK, TEST_LOCATION);   // Value should be what we sent on second RegisterProperty call
+  DALI_TEST_EQUALS(actor.GetProperty<float>(index3), 2200.f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-
 int UtcDaliHandleGetProperty(void)
 {
   tet_infoline("Positive Test Dali::Handle::GetProperty()");
@@ -785,13 +779,13 @@ int UtcDaliHandleGetProperty(void)
 
   Actor actor = Actor::New();
 
-  DALI_TEST_CHECK( ParentOrigin::TOP_LEFT == actor.GetProperty( Actor::Property::PARENT_ORIGIN   ).Get<Vector3>() );
-  DALI_TEST_CHECK( AnchorPoint::CENTER    == actor.GetProperty( Actor::Property::ANCHOR_POINT    ).Get<Vector3>() );
-  DALI_TEST_CHECK( Vector3::ZERO          == actor.GetProperty( Actor::Property::SIZE            ).Get<Vector3>() );
-  DALI_TEST_CHECK( Vector3::ZERO          == actor.GetProperty( Actor::Property::POSITION        ).Get<Vector3>() );
-  DALI_TEST_CHECK( Vector3::ONE           == actor.GetProperty( Actor::Property::SCALE           ).Get<Vector3>() );
-  DALI_TEST_CHECK( true                   == actor.GetProperty( Actor::Property::VISIBLE         ).Get<bool>() );
-  DALI_TEST_CHECK( Color::WHITE           == actor.GetProperty( Actor::Property::COLOR           ).Get<Vector4>() );
+  DALI_TEST_CHECK(ParentOrigin::TOP_LEFT == actor.GetProperty(Actor::Property::PARENT_ORIGIN).Get<Vector3>());
+  DALI_TEST_CHECK(AnchorPoint::CENTER == actor.GetProperty(Actor::Property::ANCHOR_POINT).Get<Vector3>());
+  DALI_TEST_CHECK(Vector3::ZERO == actor.GetProperty(Actor::Property::SIZE).Get<Vector3>());
+  DALI_TEST_CHECK(Vector3::ZERO == actor.GetProperty(Actor::Property::POSITION).Get<Vector3>());
+  DALI_TEST_CHECK(Vector3::ONE == actor.GetProperty(Actor::Property::SCALE).Get<Vector3>());
+  DALI_TEST_CHECK(true == actor.GetProperty(Actor::Property::VISIBLE).Get<bool>());
+  DALI_TEST_CHECK(Color::WHITE == actor.GetProperty(Actor::Property::COLOR).Get<Vector4>());
   END_TEST;
 }
 
@@ -806,13 +800,13 @@ int UtcDaliHandleDownCast(void)
 
   Handle handle = Handle::DownCast(baseHandle);
 
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
   baseHandle = BaseHandle();
 
   handle = Handle::DownCast(baseHandle);
 
-  DALI_TEST_CHECK( !handle );
+  DALI_TEST_CHECK(!handle);
 
   END_TEST;
 }
@@ -822,45 +816,45 @@ int UtcDaliHandleDownCastNegative(void)
   TestApplication application;
 
   // BaseObject is NOT an Object, so this DownCast should fail
-  BaseHandle handle( new BaseObjectType );
-  Handle customHandle1 = Handle::DownCast( handle );
-  DALI_TEST_CHECK( ! customHandle1 );
+  BaseHandle handle(new BaseObjectType);
+  Handle     customHandle1 = Handle::DownCast(handle);
+  DALI_TEST_CHECK(!customHandle1);
 
   // A DownCast on an empty handle will also fail
   Handle empty;
-  Handle customHandle2 = Handle::DownCast( empty );
-  DALI_TEST_CHECK( ! customHandle2 );
+  Handle customHandle2 = Handle::DownCast(empty);
+  DALI_TEST_CHECK(!customHandle2);
   END_TEST;
 }
 
 int UtcDaliHandleGetPropertyIndices(void)
 {
-  TestApplication application;
+  TestApplication          application;
   Property::IndexContainer indices;
 
   // Actor
   Actor actor = Actor::New();
-  actor.GetPropertyIndices( indices );
+  actor.GetPropertyIndices(indices);
   int numDefaultProperties = indices.Size();
-  DALI_TEST_CHECK( numDefaultProperties > 0 );
-  DALI_TEST_EQUALS( numDefaultProperties, actor.GetPropertyCount(), TEST_LOCATION );
+  DALI_TEST_CHECK(numDefaultProperties > 0);
+  DALI_TEST_EQUALS(numDefaultProperties, actor.GetPropertyCount(), TEST_LOCATION);
 
   const Vector4 testColor(0.5f, 0.2f, 0.9f, 1.0f);
-  const float withFlake(99.f);
+  const float   withFlake(99.f);
 
-  Property::Index key1 = CORE_PROPERTY_MAX_INDEX+1;
-  Property::Index key2 = CORE_PROPERTY_MAX_INDEX+2;
+  Property::Index key1 = CORE_PROPERTY_MAX_INDEX + 1;
+  Property::Index key2 = CORE_PROPERTY_MAX_INDEX + 2;
 
-  actor.RegisterProperty( "MyPropertyOne", Vector3::ONE );
-  actor.RegisterProperty( key1, "sideColor", testColor);
-  actor.RegisterProperty( "MyPropertyTwo", 1234 );
-  Property::Index index4 = actor.RegisterProperty( key2, "iceCream", withFlake );
-  actor.RegisterProperty( "MyPropertyThree", Vector2(.2f,.7f) );
+  actor.RegisterProperty("MyPropertyOne", Vector3::ONE);
+  actor.RegisterProperty(key1, "sideColor", testColor);
+  actor.RegisterProperty("MyPropertyTwo", 1234);
+  Property::Index index4 = actor.RegisterProperty(key2, "iceCream", withFlake);
+  actor.RegisterProperty("MyPropertyThree", Vector2(.2f, .7f));
 
-  actor.GetPropertyIndices( indices );
+  actor.GetPropertyIndices(indices);
 
-  DALI_TEST_EQUALS( indices.Size(), numDefaultProperties + 5, TEST_LOCATION );
-  DALI_TEST_EQUALS( indices[indices.Size()-2], index4, TEST_LOCATION );
+  DALI_TEST_EQUALS(indices.Size(), numDefaultProperties + 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(indices[indices.Size() - 2], index4, TEST_LOCATION);
 
   END_TEST;
 }
@@ -871,49 +865,49 @@ int UtcDaliHandleRegisterPropertyTypes(void)
 
   struct PropertyTypeAnimatable
   {
-    const char * name;
+    const char*     name;
     Property::Value value;
-    bool animatable;
+    bool            animatable;
   };
 
   Property::Array array;
-  Property::Map map;
+  Property::Map   map;
 
   PropertyTypeAnimatable properties[] =
+    {
+      {"Property::BOOLEAN", true, true},
+      {"Property::FLOAT", 1.0f, true},
+      {"Property::INTEGER", 1, true},
+      {"Property::VECTOR2", Vector2::ONE, true},
+      {"Property::VECTOR3", Vector3::ONE, true},
+      {"Property::VECTOR4", Vector4::ONE, true},
+      {"Property::MATRIX3", Matrix3::IDENTITY, true},
+      {"Property::MATRIX", Matrix::IDENTITY, true},
+      {"Property::RECTANGLE", Rect<int>(), false},
+      {"Property::ROTATION", AngleAxis(), true},
+      {"Property::STRING", std::string("Me"), false},
+      {"Property::ARRAY", array, false},
+      {"Property::MAP", map, false},
+    };
+
+  unsigned int numOfProperties(sizeof(properties) / sizeof(properties[0]));
+
+  for(unsigned int i = 0; i < numOfProperties; ++i)
   {
-    { "Property::BOOLEAN",          true,              true  },
-    { "Property::FLOAT",            1.0f,              true  },
-    { "Property::INTEGER",          1,                 true  },
-    { "Property::VECTOR2",          Vector2::ONE,      true  },
-    { "Property::VECTOR3",          Vector3::ONE,      true  },
-    { "Property::VECTOR4",          Vector4::ONE,      true  },
-    { "Property::MATRIX3",          Matrix3::IDENTITY, true  },
-    { "Property::MATRIX",           Matrix::IDENTITY,  true  },
-    { "Property::RECTANGLE",        Rect<int>(),       false },
-    { "Property::ROTATION",         AngleAxis(),       true  },
-    { "Property::STRING",           std::string("Me"), false },
-    { "Property::ARRAY",            array,             false },
-    { "Property::MAP",              map,               false },
-  };
-
-  unsigned int numOfProperties( sizeof( properties ) / sizeof( properties[0] ) );
-
-  for ( unsigned int i = 0; i < numOfProperties; ++i )
-  {
-    tet_printf( "Testing: %s\n", properties[i].name );
+    tet_printf("Testing: %s\n", properties[i].name);
 
     bool exception = false;
     try
     {
       Actor actor = Actor::New();
-      actor.RegisterProperty( "manFromDelmonte",   properties[i].value );
+      actor.RegisterProperty("manFromDelmonte", properties[i].value);
     }
-    catch (Dali::DaliException& e)
+    catch(Dali::DaliException& e)
     {
       exception = true;
     }
 
-    DALI_TEST_CHECK( properties[i].animatable != exception );
+    DALI_TEST_CHECK(properties[i].animatable != exception);
   }
   END_TEST;
 }
@@ -924,23 +918,23 @@ int UtcDaliHandleCustomProperty(void)
 
   Handle handle = Handle::New();
 
-  float startValue(1.0f);
-  Property::Index index = handle.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == startValue );
+  float           startValue(1.0f);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue);
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == startValue);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == startValue);
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == startValue);
 
-  handle.SetProperty( index, 5.0f );
+  handle.SetProperty(index, 5.0f);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == 5.0f );
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == 5.0f);
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == 5.0f );
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == 5.0f);
   END_TEST;
 }
 
@@ -950,13 +944,13 @@ int UtcDaliHandleCustomPropertyNone(void)
 
   Handle handle = Handle::New();
 
-  Property::Value value( Property::NONE );
-  Property::Index index = handle.RegisterProperty( "testProperty", value, Property::READ_WRITE);
+  Property::Value value(Property::NONE);
+  Property::Index index = handle.RegisterProperty("testProperty", value, Property::READ_WRITE);
 
   // Negative test i.e. setting a property of type NONE is meaningless
-  handle.SetProperty( index, 5.0f );
+  handle.SetProperty(index, 5.0f);
 
-  DALI_TEST_CHECK( true ); // got here without crashing
+  DALI_TEST_CHECK(true); // got here without crashing
 
   END_TEST;
 }
@@ -967,19 +961,19 @@ int UtcDaliHandleCustomPropertyIntToFloat(void)
 
   Handle handle = Handle::New();
 
-  float startValue(5.0f);
-  Property::Index index = handle.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == startValue );
+  float           startValue(5.0f);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue);
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == startValue);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == startValue);
 
-  handle.SetProperty( index, int(1) );
+  handle.SetProperty(index, int(1));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == 1.0f );
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == 1.0f);
   END_TEST;
 }
 
@@ -989,19 +983,19 @@ int UtcDaliHandleCustomPropertyFloatToInt(void)
 
   Handle handle = Handle::New();
 
-  int startValue(5);
-  Property::Index index = handle.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_CHECK( handle.GetProperty<int>(index) == startValue );
+  int             startValue(5);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue);
+  DALI_TEST_CHECK(handle.GetProperty<int>(index) == startValue);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<int>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<int>(index) == startValue);
 
-  handle.SetProperty( index, float(1.5) );
+  handle.SetProperty(index, float(1.5));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<int>(index) == 1 );
+  DALI_TEST_CHECK(handle.GetProperty<int>(index) == 1);
   END_TEST;
 }
 
@@ -1011,29 +1005,29 @@ int UtcDaliHandleCustomPropertyInvalidToRect(void)
 
   Handle handle = Handle::New();
 
-  Rect<int> startValue(1,2,3,4);
-  Property::Index index = handle.RegisterProperty( "testProperty", startValue, Property::READ_WRITE);
-  DALI_TEST_EQUALS( handle.GetProperty< Rect<int> >( index ), startValue, TEST_LOCATION );
+  Rect<int>       startValue(1, 2, 3, 4);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue, Property::READ_WRITE);
+  DALI_TEST_EQUALS(handle.GetProperty<Rect<int> >(index), startValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< Rect<int> >( index ), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<Rect<int> >(index), startValue, TEST_LOCATION);
 
   // Negative test i.e. there is no conversion from float to Rect
-  handle.SetProperty( index, float(1.5) );
+  handle.SetProperty(index, float(1.5));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< Rect<int> >( index ), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<Rect<int> >(index), startValue, TEST_LOCATION);
 
   // Positive test (sanity check)
-  Rect<int> endValue(5,6,7,8);
-  handle.SetProperty( index, endValue );
-  DALI_TEST_EQUALS( handle.GetProperty< Rect<int> >( index ), endValue, TEST_LOCATION );
+  Rect<int> endValue(5, 6, 7, 8);
+  handle.SetProperty(index, endValue);
+  DALI_TEST_EQUALS(handle.GetProperty<Rect<int> >(index), endValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< Rect<int> >( index ), endValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<Rect<int> >(index), endValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1044,29 +1038,29 @@ int UtcDaliHandleCustomPropertyInvalidToString(void)
 
   Handle handle = Handle::New();
 
-  std::string startValue( "Libraries gave us power" );
-  Property::Index index = handle.RegisterProperty( "testProperty", startValue, Property::READ_WRITE);
-  DALI_TEST_EQUALS( handle.GetProperty< std::string >( index ), startValue, TEST_LOCATION );
+  std::string     startValue("Libraries gave us power");
+  Property::Index index = handle.RegisterProperty("testProperty", startValue, Property::READ_WRITE);
+  DALI_TEST_EQUALS(handle.GetProperty<std::string>(index), startValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< std::string >( index ), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<std::string>(index), startValue, TEST_LOCATION);
 
   // No conversion from Vector3 to std::string, therefore this should be a NOOP
-  handle.SetProperty( index, Vector3(1,2,3) );
+  handle.SetProperty(index, Vector3(1, 2, 3));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< std::string >( index ), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<std::string>(index), startValue, TEST_LOCATION);
 
   // Positive test (sanity check)
-  std::string endValue( "Then work came and made us free" );
-  handle.SetProperty( index, endValue );
-  DALI_TEST_EQUALS( handle.GetProperty< std::string >( index ), endValue, TEST_LOCATION );
+  std::string endValue("Then work came and made us free");
+  handle.SetProperty(index, endValue);
+  DALI_TEST_EQUALS(handle.GetProperty<std::string>(index), endValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< std::string >( index ), endValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<std::string>(index), endValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1077,40 +1071,40 @@ int UtcDaliHandleCustomPropertyInvalidToArray(void)
 
   Handle handle = Handle::New();
 
-  Property::Value value( Property::ARRAY );
-  std::string startValue( "The future teaches you to be alone" );
-  value.GetArray()->PushBack( startValue );
+  Property::Value value(Property::ARRAY);
+  std::string     startValue("The future teaches you to be alone");
+  value.GetArray()->PushBack(startValue);
 
-  Property::Index index = handle.RegisterProperty( "testProperty", value, Property::READ_WRITE);
-  Property::Array check1 = handle.GetProperty< Property::Array >( index );
-  DALI_TEST_EQUALS( check1.GetElementAt(0).Get<std::string>(), startValue, TEST_LOCATION );
+  Property::Index index  = handle.RegisterProperty("testProperty", value, Property::READ_WRITE);
+  Property::Array check1 = handle.GetProperty<Property::Array>(index);
+  DALI_TEST_EQUALS(check1.GetElementAt(0).Get<std::string>(), startValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  Property::Array check2 = handle.GetProperty< Property::Array >( index );
-  DALI_TEST_EQUALS( check2.GetElementAt(0).Get<std::string>(), startValue, TEST_LOCATION );
+  Property::Array check2 = handle.GetProperty<Property::Array>(index);
+  DALI_TEST_EQUALS(check2.GetElementAt(0).Get<std::string>(), startValue, TEST_LOCATION);
 
   // No conversion from int to ARRAY, therefore this should be a NOOP
-  handle.SetProperty( index, int(2) );
+  handle.SetProperty(index, int(2));
 
   application.SendNotification();
   application.Render(0);
-  Property::Array check3 = handle.GetProperty< Property::Array >( index );
-  DALI_TEST_EQUALS( check3.GetElementAt(0).Get<std::string>(), startValue, TEST_LOCATION );
+  Property::Array check3 = handle.GetProperty<Property::Array>(index);
+  DALI_TEST_EQUALS(check3.GetElementAt(0).Get<std::string>(), startValue, TEST_LOCATION);
 
   // Positive test (sanity check)
   Property::Value value2(Property::ARRAY);
-  std::string endValue( "The present to be afraid and cold" );
-  value2.GetArray()->PushBack( endValue );
-  handle.SetProperty( index, value2 );
+  std::string     endValue("The present to be afraid and cold");
+  value2.GetArray()->PushBack(endValue);
+  handle.SetProperty(index, value2);
 
-  Property::Array check4 = handle.GetProperty< Property::Array >( index );
-  DALI_TEST_EQUALS( check4.GetElementAt(0).Get<std::string>(), endValue, TEST_LOCATION );
+  Property::Array check4 = handle.GetProperty<Property::Array>(index);
+  DALI_TEST_EQUALS(check4.GetElementAt(0).Get<std::string>(), endValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  Property::Array check5 = handle.GetProperty< Property::Array >( index );
-  DALI_TEST_EQUALS( check5.GetElementAt(0).Get<std::string>(), endValue, TEST_LOCATION );
+  Property::Array check5 = handle.GetProperty<Property::Array>(index);
+  DALI_TEST_EQUALS(check5.GetElementAt(0).Get<std::string>(), endValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1121,22 +1115,22 @@ int UtcDaliHandleCustomPropertyInvalidToMap(void)
 
   Handle handle = Handle::New();
 
-  Property::Value value( Property::MAP );
-  std::string startValue( "Culture sucks down words" );
-  value.GetMap()->Insert( "1", startValue );
+  Property::Value value(Property::MAP);
+  std::string     startValue("Culture sucks down words");
+  value.GetMap()->Insert("1", startValue);
 
-  Property::Index index = handle.RegisterProperty( "testProperty", value, Property::READ_WRITE );
-  Property::Value* check1 = handle.GetProperty< Property::Map >( index ).Find("1");
-  DALI_TEST_CHECK( NULL != check1 );
+  Property::Index  index  = handle.RegisterProperty("testProperty", value, Property::READ_WRITE);
+  Property::Value* check1 = handle.GetProperty<Property::Map>(index).Find("1");
+  DALI_TEST_CHECK(NULL != check1);
 
   // No conversion from float to MAP, therefore this should be a NOOP
-  handle.SetProperty( index, float(3.0) );
+  handle.SetProperty(index, float(3.0));
 
   // Positive test (sanity check)
-  Property::Value value2( Property::MAP );
-  std::string endValue( "Itemise loathing and feed yourself smiles" );
-  value.GetMap()->Insert( "1", endValue );
-  handle.SetProperty( index, value2 );
+  Property::Value value2(Property::MAP);
+  std::string     endValue("Itemise loathing and feed yourself smiles");
+  value.GetMap()->Insert("1", endValue);
+  handle.SetProperty(index, value2);
 
   END_TEST;
 }
@@ -1147,29 +1141,29 @@ int UtcDaliHandleCustomPropertyInvalidToExtents(void)
 
   Handle handle = Handle::New();
 
-  Extents startValue(1,2,3,4);
-  Property::Index index = handle.RegisterProperty( "testProperty", startValue, Property::READ_WRITE);
-  DALI_TEST_EQUALS( handle.GetProperty< Extents >( index ), startValue, TEST_LOCATION );
+  Extents         startValue(1, 2, 3, 4);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue, Property::READ_WRITE);
+  DALI_TEST_EQUALS(handle.GetProperty<Extents>(index), startValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< Extents >( index ), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<Extents>(index), startValue, TEST_LOCATION);
 
   // Negative test i.e. there is no conversion from float to Extents
-  handle.SetProperty( index, float(1.5) );
+  handle.SetProperty(index, float(1.5));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< Extents >( index ), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<Extents>(index), startValue, TEST_LOCATION);
 
   // Positive test (sanity check)
-  Extents endValue(5,6,7,8);
-  handle.SetProperty( index, endValue );
-  DALI_TEST_EQUALS( handle.GetProperty< Extents >( index ), endValue, TEST_LOCATION );
+  Extents endValue(5, 6, 7, 8);
+  handle.SetProperty(index, endValue);
+  DALI_TEST_EQUALS(handle.GetProperty<Extents>(index), endValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< Extents >( index ), endValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<Extents>(index), endValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1180,29 +1174,29 @@ int UtcDaliHandleCustomPropertyInvalidToBool(void)
 
   Handle handle = Handle::New();
 
-  bool startValue(true);
-  Property::Index index = handle.RegisterProperty( "testProperty", startValue, Property::READ_WRITE);
-  DALI_TEST_EQUALS( handle.GetProperty< bool >( index ), startValue, TEST_LOCATION );
+  bool            startValue(true);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue, Property::READ_WRITE);
+  DALI_TEST_EQUALS(handle.GetProperty<bool>(index), startValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< bool >( index ), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<bool>(index), startValue, TEST_LOCATION);
 
   // Negative test i.e. there is no conversion from float to bool
-  handle.SetProperty( index, float(0.0) );
+  handle.SetProperty(index, float(0.0));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< bool >( index ), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<bool>(index), startValue, TEST_LOCATION);
 
   // Positive test (sanity check)
   bool endValue(false);
-  handle.SetProperty( index, endValue );
-  DALI_TEST_EQUALS( handle.GetProperty< bool >( index ), endValue, TEST_LOCATION );
+  handle.SetProperty(index, endValue);
+  DALI_TEST_EQUALS(handle.GetProperty<bool>(index), endValue, TEST_LOCATION);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_EQUALS( handle.GetProperty< bool >( index ), endValue, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty<bool>(index), endValue, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1213,20 +1207,20 @@ int UtcDaliHandleCustomPropertyInvalidToInt(void)
 
   Handle handle = Handle::New();
 
-  int startValue(5);
-  Property::Index index = handle.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_CHECK( handle.GetProperty<int>(index) == startValue );
+  int             startValue(5);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue);
+  DALI_TEST_CHECK(handle.GetProperty<int>(index) == startValue);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<int>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<int>(index) == startValue);
 
   // Negative test i.e. there is no conversion from Vector3 to int
-  handle.SetProperty( index, Vector3(1,2,3) );
+  handle.SetProperty(index, Vector3(1, 2, 3));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<int>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<int>(index) == startValue);
   END_TEST;
 }
 
@@ -1236,20 +1230,20 @@ int UtcDaliHandleCustomPropertyInvalidToFloat(void)
 
   Handle handle = Handle::New();
 
-  float startValue(5.0);
-  Property::Index index = handle.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == startValue );
+  float           startValue(5.0);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue);
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == startValue);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == startValue);
 
   // Negative test i.e. there is no conversion from Vector3 to float
-  handle.SetProperty( index, Vector3(1,2,3) );
+  handle.SetProperty(index, Vector3(1, 2, 3));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<float>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<float>(index) == startValue);
   END_TEST;
 }
 
@@ -1259,25 +1253,25 @@ int UtcDaliHandleCustomPropertyInvalidToRotation(void)
 
   Handle handle = Handle::New();
 
-  Quaternion startValue( Radian(0.785f), Vector3(1.0f, 1.0f, 0.0f));
-  Property::Index index = handle.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_CHECK( handle.GetProperty<Quaternion>(index) == startValue );
+  Quaternion      startValue(Radian(0.785f), Vector3(1.0f, 1.0f, 0.0f));
+  Property::Index index = handle.RegisterProperty("testProperty", startValue);
+  DALI_TEST_CHECK(handle.GetProperty<Quaternion>(index) == startValue);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<Quaternion>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<Quaternion>(index) == startValue);
 
   // Negative test i.e. there is no conversion from float to Quaternion
-  handle.SetProperty( index, float(7.0) );
+  handle.SetProperty(index, float(7.0));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<Quaternion>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<Quaternion>(index) == startValue);
 
   // Positive test (sanity check)
-  Quaternion endValue( Radian(0.785f), Vector3(1.0f, 1.0f, 0.0f));
-  handle.SetProperty( index, endValue );
-  DALI_TEST_CHECK( handle.GetProperty<Quaternion>(index) == endValue );
+  Quaternion endValue(Radian(0.785f), Vector3(1.0f, 1.0f, 0.0f));
+  handle.SetProperty(index, endValue);
+  DALI_TEST_CHECK(handle.GetProperty<Quaternion>(index) == endValue);
 
   END_TEST;
 }
@@ -1288,27 +1282,27 @@ int UtcDaliHandleCustomPropertyInvalidToMatrix(void)
 
   Handle handle = Handle::New();
 
-  Quaternion rotation( Radian(0.785f), Vector3(1.0f, 1.0f, 0.0f));
-  Matrix startValue(rotation);
-  Property::Index index = handle.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_CHECK( handle.GetProperty<Matrix>(index) == startValue );
+  Quaternion      rotation(Radian(0.785f), Vector3(1.0f, 1.0f, 0.0f));
+  Matrix          startValue(rotation);
+  Property::Index index = handle.RegisterProperty("testProperty", startValue);
+  DALI_TEST_CHECK(handle.GetProperty<Matrix>(index) == startValue);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<Matrix>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<Matrix>(index) == startValue);
 
   // Negative test i.e. there is no conversion from float to Matrix
-  handle.SetProperty( index, float(7.0) );
+  handle.SetProperty(index, float(7.0));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<Matrix>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<Matrix>(index) == startValue);
 
   // Positive test (sanity check)
-  Quaternion endRotation( Radian(0.785f), Vector3(1.0f, 1.0f, 0.0f));
-  Matrix endValue(endRotation);
-  handle.SetProperty( index, endValue );
-  DALI_TEST_CHECK( handle.GetProperty<Matrix>(index) == endValue );
+  Quaternion endRotation(Radian(0.785f), Vector3(1.0f, 1.0f, 0.0f));
+  Matrix     endValue(endRotation);
+  handle.SetProperty(index, endValue);
+  DALI_TEST_CHECK(handle.GetProperty<Matrix>(index) == endValue);
 
   END_TEST;
 }
@@ -1319,30 +1313,26 @@ int UtcDaliHandleCustomPropertyInvalidToMatrix3(void)
 
   Handle handle = Handle::New();
 
-  Matrix3 startValue(11,12,13,
-                     21,22,23,
-                     31,32,33);
+  Matrix3 startValue(11, 12, 13, 21, 22, 23, 31, 32, 33);
 
-  Property::Index index = handle.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_CHECK( handle.GetProperty<Matrix3>(index) == startValue );
+  Property::Index index = handle.RegisterProperty("testProperty", startValue);
+  DALI_TEST_CHECK(handle.GetProperty<Matrix3>(index) == startValue);
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<Matrix3>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<Matrix3>(index) == startValue);
 
   // Negative test i.e. there is no conversion from float to Matrix3
-  handle.SetProperty( index, float(7.0) );
+  handle.SetProperty(index, float(7.0));
 
   application.SendNotification();
   application.Render(0);
-  DALI_TEST_CHECK( handle.GetProperty<Matrix3>(index) == startValue );
+  DALI_TEST_CHECK(handle.GetProperty<Matrix3>(index) == startValue);
 
   // Positive test (sanity check)
-  Matrix3 endValue(31,32,33,
-                   21,22,23,
-                   11,12,13);
-  handle.SetProperty( index, endValue );
-  DALI_TEST_CHECK( handle.GetProperty<Matrix3>(index) == endValue );
+  Matrix3 endValue(31, 32, 33, 21, 22, 23, 11, 12, 13);
+  handle.SetProperty(index, endValue);
+  DALI_TEST_CHECK(handle.GetProperty<Matrix3>(index) == endValue);
 
   END_TEST;
 }
@@ -1352,7 +1342,7 @@ int UtcDaliHandleWeightNew(void)
   TestApplication application;
 
   Handle handle = WeightObject::New();
-  DALI_TEST_CHECK( handle.GetProperty<float>(WeightObject::WEIGHT) == 0.0f );
+  DALI_TEST_CHECK(handle.GetProperty<float>(WeightObject::WEIGHT) == 0.0f);
 
   // process the message so scene object is added to update manager
   application.SendNotification();
@@ -1370,7 +1360,7 @@ int UtcDaliHandleWeightNew2(void)
   // scope for the weight object
   {
     Handle handle = WeightObject::New();
-    DALI_TEST_CHECK( handle.GetProperty<float>(WeightObject::WEIGHT) == 0.0f );
+    DALI_TEST_CHECK(handle.GetProperty<float>(WeightObject::WEIGHT) == 0.0f);
 
     // process the message so scene object is added to update manager
     application.SendNotification();
@@ -1387,19 +1377,19 @@ int UtcDaliHandleWeightNew2(void)
 int UtcDaliHandleSetTypeInfo(void)
 {
   TestApplication application;
-  TypeRegistry typeRegistry = TypeRegistry::Get();
+  TypeRegistry    typeRegistry = TypeRegistry::Get();
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Actor" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("Actor");
+  DALI_TEST_CHECK(typeInfo);
 
   Actor actor = Actor::DownCast(typeInfo.CreateInstance());
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
   DevelHandle::SetTypeInfo(actor, typeInfo);
 
   TypeInfo newTypeInfo;
-  bool success = actor.GetTypeInfo( newTypeInfo );
-  DALI_TEST_CHECK( success );
+  bool     success = actor.GetTypeInfo(newTypeInfo);
+  DALI_TEST_CHECK(success);
 
   DALI_TEST_CHECK(typeInfo.GetName() == newTypeInfo.GetName());
   DALI_TEST_CHECK(typeInfo.GetBaseName() == newTypeInfo.GetBaseName());
@@ -1411,27 +1401,27 @@ int UtcDaliHandleCustomPropertySynchronousGetSet(void)
 {
   TestApplication application;
 
-  tet_infoline( "Create a custom property and set the value ensuring it can be retrieved synchronously" );
+  tet_infoline("Create a custom property and set the value ensuring it can be retrieved synchronously");
 
   Actor actor = Actor::New();
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
-  tet_infoline( "Create the custom property with an initial value" );
-  float startValue(1.0f);
-  Property::Index index = actor.RegisterProperty( "testProperty",  startValue );
-  DALI_TEST_EQUALS( actor.GetProperty< float >( index ), startValue, TEST_LOCATION );
+  tet_infoline("Create the custom property with an initial value");
+  float           startValue(1.0f);
+  Property::Index index = actor.RegisterProperty("testProperty", startValue);
+  DALI_TEST_EQUALS(actor.GetProperty<float>(index), startValue, TEST_LOCATION);
 
-  tet_infoline( "Set the value, retrieve it and ensure both the synchronous and the async version work" );
-  actor.SetProperty( index, 5.0f );
-  DALI_TEST_EQUALS( actor.GetProperty< float >( index ), 5.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< float >( index ), startValue, TEST_LOCATION );
+  tet_infoline("Set the value, retrieve it and ensure both the synchronous and the async version work");
+  actor.SetProperty(index, 5.0f);
+  DALI_TEST_EQUALS(actor.GetProperty<float>(index), 5.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<float>(index), startValue, TEST_LOCATION);
 
-  tet_infoline( "Render and retrieve values again" );
+  tet_infoline("Render and retrieve values again");
   application.SendNotification();
   application.Render(0);
 
-  DALI_TEST_EQUALS( actor.GetProperty< float >( index ), 5.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< float >( index ), 5.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetProperty<float>(index), 5.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<float>(index), 5.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1440,11 +1430,11 @@ int UtcDaliHandleCustomPropertyGetType(void)
 {
   TestApplication application;
 
-  tet_infoline( "Create a custom property and retrieve its type" );
+  tet_infoline("Create a custom property and retrieve its type");
 
-  Handle handle = Handle::New();
-  Property::Index index = handle.RegisterProperty( "testProperty",  1.0f );
-  DALI_TEST_EQUALS( handle.GetPropertyType( index ), Property::FLOAT, TEST_LOCATION );
+  Handle          handle = Handle::New();
+  Property::Index index  = handle.RegisterProperty("testProperty", 1.0f);
+  DALI_TEST_EQUALS(handle.GetPropertyType(index), Property::FLOAT, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1453,20 +1443,20 @@ int UtcDaliHandleCustomPropertyAccessMode(void)
 {
   TestApplication application;
 
-  tet_infoline( "Create a custom property and retrieve whether it's animatable etc." );
+  tet_infoline("Create a custom property and retrieve whether it's animatable etc.");
 
-  Handle handle = Handle::New();
-  Property::Index index = handle.RegisterProperty( "testProperty",  1.0f );
-  DALI_TEST_EQUALS( handle.IsPropertyAnimatable( index ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( handle.IsPropertyWritable( index ), true, TEST_LOCATION );
+  Handle          handle = Handle::New();
+  Property::Index index  = handle.RegisterProperty("testProperty", 1.0f);
+  DALI_TEST_EQUALS(handle.IsPropertyAnimatable(index), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(handle.IsPropertyWritable(index), true, TEST_LOCATION);
 
-  index = handle.RegisterProperty( "testProperty2", 1.0f, Property::READ_ONLY );
-  DALI_TEST_EQUALS( handle.IsPropertyAnimatable( index ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( handle.IsPropertyWritable( index ), false, TEST_LOCATION );
+  index = handle.RegisterProperty("testProperty2", 1.0f, Property::READ_ONLY);
+  DALI_TEST_EQUALS(handle.IsPropertyAnimatable(index), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(handle.IsPropertyWritable(index), false, TEST_LOCATION);
 
-  index = handle.RegisterProperty( "testProperty3", 1.0f, Property::READ_WRITE );
-  DALI_TEST_EQUALS( handle.IsPropertyAnimatable( index ), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( handle.IsPropertyWritable( index ), true, TEST_LOCATION );
+  index = handle.RegisterProperty("testProperty3", 1.0f, Property::READ_WRITE);
+  DALI_TEST_EQUALS(handle.IsPropertyAnimatable(index), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(handle.IsPropertyWritable(index), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1475,19 +1465,19 @@ int UtcDaliHandleGetCurrentProperty(void)
 {
   TestApplication application;
 
-  tet_infoline( "Get a default and non-animatable custom property using the GetCurrentProperty API" );
+  tet_infoline("Get a default and non-animatable custom property using the GetCurrentProperty API");
 
   Actor actor = Actor::New();
-  application.GetScene().Add( actor );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ), true, TEST_LOCATION );
+  application.GetScene().Add(actor);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE), true, TEST_LOCATION);
 
-  Property::Index index = actor.RegisterProperty( "testProperty3", 1.0f, Property::READ_WRITE );
-  DALI_TEST_EQUALS( actor.GetProperty< float >( index ), 1.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< float >( index ), 1.0f, TEST_LOCATION );
+  Property::Index index = actor.RegisterProperty("testProperty3", 1.0f, Property::READ_WRITE);
+  DALI_TEST_EQUALS(actor.GetProperty<float>(index), 1.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<float>(index), 1.0f, TEST_LOCATION);
 
-  actor.SetProperty( index, 2.0f );
-  DALI_TEST_EQUALS( actor.GetProperty< float >( index ), 2.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< float >( index ), 2.0f, TEST_LOCATION );
+  actor.SetProperty(index, 2.0f);
+  DALI_TEST_EQUALS(actor.GetProperty<float>(index), 2.0f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<float>(index), 2.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1496,12 +1486,12 @@ int UtcDaliHandleDoesCustomPropertyExistP1(void)
 {
   TestApplication application; // Needs type registry
 
-  tet_infoline( "Test if a registered custom property exists on object" );
+  tet_infoline("Test if a registered custom property exists on object");
 
-  Actor actor = Actor::New();
-  auto propertyIndex = actor.RegisterProperty("customProperty1", 1.0f);
+  Actor actor         = Actor::New();
+  auto  propertyIndex = actor.RegisterProperty("customProperty1", 1.0f);
 
-  DALI_TEST_EQUALS( actor.DoesCustomPropertyExist( propertyIndex ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.DoesCustomPropertyExist(propertyIndex), true, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1509,12 +1499,12 @@ int UtcDaliHandleDoesCustomPropertyExistN1(void)
 {
   TestApplication application; // Needs type registry
 
-  tet_infoline( "Test if a registered custom property does not exist on object" );
+  tet_infoline("Test if a registered custom property does not exist on object");
 
-  Actor actor = Actor::New();
-  auto propertyIndex = actor.RegisterProperty("customProperty1", 1.0f);
+  Actor actor         = Actor::New();
+  auto  propertyIndex = actor.RegisterProperty("customProperty1", 1.0f);
 
-  DALI_TEST_EQUALS( actor.DoesCustomPropertyExist( propertyIndex+1 ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.DoesCustomPropertyExist(propertyIndex + 1), false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1522,10 +1512,10 @@ int UtcDaliHandleDoesCustomPropertyExistN2(void)
 {
   TestApplication application; // Needs type registry
 
-  tet_infoline( "Test that a default property does not show as a custom property on object" );
+  tet_infoline("Test that a default property does not show as a custom property on object");
 
   Actor actor = Actor::New();
-  DALI_TEST_EQUALS( actor.DoesCustomPropertyExist( Actor::Property::POSITION ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.DoesCustomPropertyExist(Actor::Property::POSITION), false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1533,22 +1523,22 @@ int UtcDaliHandleDoesCustomPropertyExistN3(void)
 {
   TestApplication application; // Needs type registry
 
-  tet_infoline( "Test that a child property does not exist on actor after parenting to container" );
+  tet_infoline("Test that a child property does not exist on actor after parenting to container");
   TypeRegistry typeRegistry = TypeRegistry::Get();
 
-  auto customActorTypeInfo = typeRegistry.GetTypeInfo( typeid(Test::TestCustomActor) );
+  auto customActorTypeInfo = typeRegistry.GetTypeInfo(typeid(Test::TestCustomActor));
 
-  const Property::Index CHILD_PROPERTY( CHILD_PROPERTY_REGISTRATION_START_INDEX );
-  const char* CHILD_PROPERTY_NAME( "childProperty" );
+  const Property::Index CHILD_PROPERTY(CHILD_PROPERTY_REGISTRATION_START_INDEX);
+  const char*           CHILD_PROPERTY_NAME("childProperty");
 
-  ChildPropertyRegistration( customActorTypeInfo.GetName(), CHILD_PROPERTY_NAME, CHILD_PROPERTY, Property::INTEGER );
+  ChildPropertyRegistration(customActorTypeInfo.GetName(), CHILD_PROPERTY_NAME, CHILD_PROPERTY, Property::INTEGER);
 
   auto container = Test::TestCustomActor::New();
-  application.GetScene().Add( container );
+  application.GetScene().Add(container);
   auto child = Actor::New();
-  container.Add( child ); // Resolve child properties (if any)
+  container.Add(child); // Resolve child properties (if any)
 
-  DALI_TEST_EQUALS( child.DoesCustomPropertyExist( CHILD_PROPERTY ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(child.DoesCustomPropertyExist(CHILD_PROPERTY), false, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1556,24 +1546,24 @@ int UtcDaliHandleDoesCustomPropertyExistP2(void)
 {
   TestApplication application; // Needs type registry
 
-  tet_infoline( "Test that a child property exists after being set" );
+  tet_infoline("Test that a child property exists after being set");
   TypeRegistry typeRegistry = TypeRegistry::Get();
 
-  auto customActorTypeInfo = typeRegistry.GetTypeInfo( typeid(Test::TestCustomActor) );
+  auto customActorTypeInfo = typeRegistry.GetTypeInfo(typeid(Test::TestCustomActor));
 
-  const Property::Index CHILD_PROPERTY( CHILD_PROPERTY_REGISTRATION_START_INDEX );
-  const char* CHILD_PROPERTY_NAME( "childProperty" );
+  const Property::Index CHILD_PROPERTY(CHILD_PROPERTY_REGISTRATION_START_INDEX);
+  const char*           CHILD_PROPERTY_NAME("childProperty");
 
-  ChildPropertyRegistration( customActorTypeInfo.GetName(), CHILD_PROPERTY_NAME, CHILD_PROPERTY, Property::INTEGER );
+  ChildPropertyRegistration(customActorTypeInfo.GetName(), CHILD_PROPERTY_NAME, CHILD_PROPERTY, Property::INTEGER);
 
   auto container = Test::TestCustomActor::New();
-  application.GetScene().Add( container );
+  application.GetScene().Add(container);
   auto child = Actor::New();
-  container.Add( child ); // Resolve child properties (if any)
-  child.SetProperty( CHILD_PROPERTY, 2 );
+  container.Add(child); // Resolve child properties (if any)
+  child.SetProperty(CHILD_PROPERTY, 2);
 
-  DALI_TEST_EQUALS( child.DoesCustomPropertyExist( CHILD_PROPERTY ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( child.GetProperty<int>( CHILD_PROPERTY ), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(child.DoesCustomPropertyExist(CHILD_PROPERTY), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(child.GetProperty<int>(CHILD_PROPERTY), 2, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1581,30 +1571,29 @@ int UtcDaliHandleDoesCustomPropertyExistP3(void)
 {
   TestApplication application; // Needs type registry
 
-  tet_infoline( "Test that a child property is re-indexed after registration, and that it exists" );
+  tet_infoline("Test that a child property is re-indexed after registration, and that it exists");
   TypeRegistry typeRegistry = TypeRegistry::Get();
 
-  auto customActorTypeInfo = typeRegistry.GetTypeInfo( typeid(Test::TestCustomActor) );
+  auto customActorTypeInfo = typeRegistry.GetTypeInfo(typeid(Test::TestCustomActor));
 
-  const Property::Index CHILD_PROPERTY( CHILD_PROPERTY_REGISTRATION_START_INDEX );
-  const char* CHILD_PROPERTY_NAME( "childProperty" );
+  const Property::Index CHILD_PROPERTY(CHILD_PROPERTY_REGISTRATION_START_INDEX);
+  const char*           CHILD_PROPERTY_NAME("childProperty");
 
-  ChildPropertyRegistration( customActorTypeInfo.GetName(), CHILD_PROPERTY_NAME, CHILD_PROPERTY, Property::INTEGER );
+  ChildPropertyRegistration(customActorTypeInfo.GetName(), CHILD_PROPERTY_NAME, CHILD_PROPERTY, Property::INTEGER);
 
   auto container = Test::TestCustomActor::New();
-  application.GetScene().Add( container );
+  application.GetScene().Add(container);
   auto child = Actor::New();
-  child.RegisterProperty( CHILD_PROPERTY_NAME, Property::Value(3) );
-  container.Add( child ); // Resolve child properties (if any)
+  child.RegisterProperty(CHILD_PROPERTY_NAME, Property::Value(3));
+  container.Add(child); // Resolve child properties (if any)
 
-  DALI_TEST_EQUALS( child.DoesCustomPropertyExist( CHILD_PROPERTY ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( child.GetProperty<int>( CHILD_PROPERTY ), 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(child.DoesCustomPropertyExist(CHILD_PROPERTY), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(child.GetProperty<int>(CHILD_PROPERTY), 3, TEST_LOCATION);
   END_TEST;
 }
 
 namespace
 {
-
 struct PropertySetSignalCheck
 {
   PropertySetSignalCheck(bool& signalReceived, Property::Value& value)
@@ -1616,7 +1605,7 @@ struct PropertySetSignalCheck
   void operator()(Handle& handle, Property::Index index, Property::Value value)
   {
     mSignalReceived = true;
-    mValue = value;
+    mValue          = value;
   }
 
   void Reset()
@@ -1626,7 +1615,7 @@ struct PropertySetSignalCheck
 
   void CheckSignalReceived()
   {
-    if (!mSignalReceived)
+    if(!mSignalReceived)
     {
       tet_printf("Expected Property Set signal was not received\n");
       tet_result(TET_FAIL);
@@ -1637,49 +1626,48 @@ struct PropertySetSignalCheck
     }
   }
 
-  bool& mSignalReceived; // owned by individual tests
+  bool&            mSignalReceived; // owned by individual tests
   Property::Value& mValue;
 };
 
-} // anon namespace
+} // namespace
 
 int UtcDaliHandlePropertySetSignal01(void)
 {
   TestApplication application;
 
-  bool signalReceived(false);
-  Property::Value value;
+  bool                   signalReceived(false);
+  Property::Value        value;
   PropertySetSignalCheck propertySetCheck(signalReceived, value);
 
-  tet_infoline( "Test that setting a default property triggers a signal" );
+  tet_infoline("Test that setting a default property triggers a signal");
 
   auto actor = Actor::New();
   actor.PropertySetSignal().Connect(&application, propertySetCheck);
 
-  actor.SetProperty( Actor::Property::POSITION, Vector3::XAXIS );
+  actor.SetProperty(Actor::Property::POSITION, Vector3::XAXIS);
   propertySetCheck.CheckSignalReceived();
 
   END_TEST;
 }
 
-
 int UtcDaliHandlePropertySetSignal02(void)
 {
   TestApplication application;
 
-  bool signalReceived(false);
-  Property::Value value;
+  bool                   signalReceived(false);
+  Property::Value        value;
   PropertySetSignalCheck propertySetCheck(signalReceived, value);
 
-  tet_infoline( "Test that setting a custom property triggers a signal" );
+  tet_infoline("Test that setting a custom property triggers a signal");
 
   auto actor = Actor::New();
   actor.PropertySetSignal().Connect(&application, propertySetCheck);
 
   auto propertyIndex = actor.RegisterProperty("propName", 3.0f);
-  actor.SetProperty( propertyIndex, 5.0f );
+  actor.SetProperty(propertyIndex, 5.0f);
   propertySetCheck.CheckSignalReceived();
-  DALI_TEST_EQUALS( propertySetCheck.mValue, Property::Value( 5.0f ), 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(propertySetCheck.mValue, Property::Value(5.0f), 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1687,94 +1675,89 @@ int UtcDaliHandlePropertySetSignal02(void)
 int UtcDaliHandlePropertySetSignal03(void)
 {
   TestApplication application;
-  TypeRegistry typeRegistry = TypeRegistry::Get();
+  TypeRegistry    typeRegistry = TypeRegistry::Get();
 
-  bool signalReceived(false);
-  Property::Value value;
+  bool                   signalReceived(false);
+  Property::Value        value;
   PropertySetSignalCheck propertySetCheck(signalReceived, value);
 
-  tet_infoline( "Test that setting a child property triggers a signal" );
+  tet_infoline("Test that setting a child property triggers a signal");
 
-  auto customActorTypeInfo = typeRegistry.GetTypeInfo( typeid(Test::TestCustomActor) );
+  auto customActorTypeInfo = typeRegistry.GetTypeInfo(typeid(Test::TestCustomActor));
 
-  const Property::Index CHILD_PROPERTY( CHILD_PROPERTY_REGISTRATION_START_INDEX );
-  const char* CHILD_PROPERTY_NAME( "childProperty" );
+  const Property::Index CHILD_PROPERTY(CHILD_PROPERTY_REGISTRATION_START_INDEX);
+  const char*           CHILD_PROPERTY_NAME("childProperty");
 
-  ChildPropertyRegistration( customActorTypeInfo.GetName(), CHILD_PROPERTY_NAME, CHILD_PROPERTY, Property::INTEGER );
+  ChildPropertyRegistration(customActorTypeInfo.GetName(), CHILD_PROPERTY_NAME, CHILD_PROPERTY, Property::INTEGER);
 
   auto container = Test::TestCustomActor::New();
-  application.GetScene().Add( container );
+  application.GetScene().Add(container);
   auto child = Actor::New();
-  child.RegisterProperty( CHILD_PROPERTY_NAME, Property::Value(3) );
+  child.RegisterProperty(CHILD_PROPERTY_NAME, Property::Value(3));
   child.PropertySetSignal().Connect(&application, propertySetCheck);
-  container.Add( child ); // Resolve child properties (if any)
+  container.Add(child); // Resolve child properties (if any)
 
-  DALI_TEST_EQUALS( child.DoesCustomPropertyExist( CHILD_PROPERTY ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( child.GetProperty<int>( CHILD_PROPERTY ), 3, TEST_LOCATION );
+  DALI_TEST_EQUALS(child.DoesCustomPropertyExist(CHILD_PROPERTY), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(child.GetProperty<int>(CHILD_PROPERTY), 3, TEST_LOCATION);
 
-  child.SetProperty( CHILD_PROPERTY, 29 );
+  child.SetProperty(CHILD_PROPERTY, 29);
   propertySetCheck.CheckSignalReceived();
-  DALI_TEST_EQUALS( propertySetCheck.mValue, Property::Value( 29 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(propertySetCheck.mValue, Property::Value(29), TEST_LOCATION);
   END_TEST;
 }
 
-
-
 int UtcDaliHandlePropertySetSignal04(void)
 {
   TestApplication application;
-  TypeRegistry typeRegistry = TypeRegistry::Get();
+  TypeRegistry    typeRegistry = TypeRegistry::Get();
 
-  bool signalReceived(false);
-  Property::Value value;
+  bool                   signalReceived(false);
+  Property::Value        value;
   PropertySetSignalCheck propertySetCheck(signalReceived, value);
 
-  tet_infoline( "Test that setting a property on a vanilla Object triggers a signal" );
+  tet_infoline("Test that setting a property on a vanilla Object triggers a signal");
 
   constexpr Property::Index TEST_PROPERTY_KEY_INDEX = 1;
-  const std::string TEST_PROPERTY_KEY_NAME = "testProperty";
+  const std::string         TEST_PROPERTY_KEY_NAME  = "testProperty";
 
   Handle vanillaObject = Handle::New();
-  auto propertyIndex = vanillaObject.RegisterProperty(
+  auto   propertyIndex = vanillaObject.RegisterProperty(
     TEST_PROPERTY_KEY_INDEX,
     TEST_PROPERTY_KEY_NAME,
-    Color::WHITE );
+    Color::WHITE);
 
   vanillaObject.PropertySetSignal().Connect(&application, propertySetCheck);
 
-  DALI_TEST_EQUALS( vanillaObject.DoesCustomPropertyExist( propertyIndex ), true, TEST_LOCATION );
-  DALI_TEST_EQUALS( vanillaObject.GetProperty<Vector4>( propertyIndex ), Color::WHITE, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(vanillaObject.DoesCustomPropertyExist(propertyIndex), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(vanillaObject.GetProperty<Vector4>(propertyIndex), Color::WHITE, 0.001f, TEST_LOCATION);
 
   vanillaObject[TEST_PROPERTY_KEY_NAME] = Color::RED;
 
   propertySetCheck.CheckSignalReceived();
-  DALI_TEST_EQUALS( propertySetCheck.mValue, Property::Value( Color::RED ), 0.001f, TEST_LOCATION );
-  DALI_TEST_VALUE_EQUALS( vanillaObject[propertyIndex], Property::Value( Color::RED), 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(propertySetCheck.mValue, Property::Value(Color::RED), 0.001f, TEST_LOCATION);
+  DALI_TEST_VALUE_EQUALS(vanillaObject[propertyIndex], Property::Value(Color::RED), 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliHandlePropertySetProperties(void)
 {
   TestApplication application;
-  const Vector3 actorSize( 10.0f, 20.0f, 30.0f );
-  const Vector3 anchorPoint( 1.0f, 0.5f, 0.0f );
-  const Vector4 color( 0.1f, 0.2, 0.3f, 0.4f );
+  const Vector3   actorSize(10.0f, 20.0f, 30.0f);
+  const Vector3   anchorPoint(1.0f, 0.5f, 0.0f);
+  const Vector4   color(0.1f, 0.2, 0.3f, 0.4f);
 
   Handle handle = Actor::New();
   handle.SetProperties(
-    Property::Map
-    {
-      { Actor::Property::SIZE, actorSize },
-      { Actor::Property::ANCHOR_POINT, anchorPoint },
-      { "color", color },
-      { "invalid", Vector2::ZERO } // It should quietly ignore invalid data
-    }
-  );
-  DALI_TEST_EQUALS( handle.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(), actorSize, TEST_LOCATION );
-  DALI_TEST_EQUALS( handle.GetProperty( Actor::Property::ANCHOR_POINT ).Get< Vector3 >(), anchorPoint, TEST_LOCATION );
-  DALI_TEST_EQUALS( handle.GetProperty( Actor::Property::COLOR ).Get< Vector4 >(), color, TEST_LOCATION );
+    Property::Map{
+      {Actor::Property::SIZE, actorSize},
+      {Actor::Property::ANCHOR_POINT, anchorPoint},
+      {"color", color},
+      {"invalid", Vector2::ZERO} // It should quietly ignore invalid data
+    });
+  DALI_TEST_EQUALS(handle.GetProperty(Actor::Property::SIZE).Get<Vector3>(), actorSize, TEST_LOCATION);
+  DALI_TEST_EQUALS(handle.GetProperty(Actor::Property::ANCHOR_POINT).Get<Vector3>(), anchorPoint, TEST_LOCATION);
+  DALI_TEST_EQUALS(handle.GetProperty(Actor::Property::COLOR).Get<Vector4>(), color, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1782,23 +1765,21 @@ int UtcDaliHandlePropertySetProperties(void)
 int UtcDaliHandleTemplateNew01(void)
 {
   TestApplication application;
-  const Vector3 actorSize( 10.0f, 20.0f, 30.0f );
-  const Vector3 anchorPoint( 1.0f, 0.5f, 0.0f );
-  const Vector4 color( 0.1f, 0.2, 0.3f, 0.4f );
+  const Vector3   actorSize(10.0f, 20.0f, 30.0f);
+  const Vector3   anchorPoint(1.0f, 0.5f, 0.0f);
+  const Vector4   color(0.1f, 0.2, 0.3f, 0.4f);
 
-  Handle handle = Handle::New< Actor >(
-    Property::Map
-    {
-      { Actor::Property::SIZE, actorSize },
-      { Actor::Property::ANCHOR_POINT, anchorPoint },
-      { "color", color },
-      { "invalid", Vector2::ZERO } // It should quietly ignore invalid data
-    }
-  );
+  Handle handle = Handle::New<Actor>(
+    Property::Map{
+      {Actor::Property::SIZE, actorSize},
+      {Actor::Property::ANCHOR_POINT, anchorPoint},
+      {"color", color},
+      {"invalid", Vector2::ZERO} // It should quietly ignore invalid data
+    });
 
-  DALI_TEST_EQUALS( handle.GetProperty( Actor::Property::SIZE ).Get< Vector3 >(), actorSize, TEST_LOCATION );
-  DALI_TEST_EQUALS( handle.GetProperty( Actor::Property::ANCHOR_POINT ).Get< Vector3 >(), anchorPoint, TEST_LOCATION );
-  DALI_TEST_EQUALS( handle.GetProperty( Actor::Property::COLOR ).Get< Vector4 >(), color, TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetProperty(Actor::Property::SIZE).Get<Vector3>(), actorSize, TEST_LOCATION);
+  DALI_TEST_EQUALS(handle.GetProperty(Actor::Property::ANCHOR_POINT).Get<Vector3>(), anchorPoint, TEST_LOCATION);
+  DALI_TEST_EQUALS(handle.GetProperty(Actor::Property::COLOR).Get<Vector4>(), color, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1809,70 +1790,96 @@ int UtcDaliHandleGetProperties(void)
 
   Handle handle = Actor::New();
   handle.SetProperties(
-    Property::Map
-    {
-      { Actor::Property::SIZE, Vector3( 400.0f, 200.0f, 100.0f ) },
-      { Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER },
-      { Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER },
-      { Actor::Property::NAME, "Actor" },
-      { Actor::Property::LEAVE_REQUIRED, true },
-      { "color", Color::RED },
-    }
-  );
+    Property::Map{
+      {Actor::Property::SIZE, Vector3(400.0f, 200.0f, 100.0f)},
+      {Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER},
+      {Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER},
+      {Actor::Property::NAME, "Actor"},
+      {Actor::Property::LEAVE_REQUIRED, true},
+      {"color", Color::RED},
+    });
 
   Property::Map map;
-  handle.GetProperties( map );
+  handle.GetProperties(map);
 
   // Get all the properties and ensure they match
 
-  DALI_TEST_EQUALS( handle.GetPropertyCount(), map.Count(), TEST_LOCATION );
+  DALI_TEST_EQUALS(handle.GetPropertyCount(), map.Count(), TEST_LOCATION);
 
-  for( auto position = 0u; position < map.Count(); ++position )
+  for(auto position = 0u; position < map.Count(); ++position)
   {
-    auto keyValuePair = map.GetKeyValue( position );
-    const auto& index = keyValuePair.first.indexKey;
-    const auto& value = keyValuePair.second;
-    auto handleValue = handle.GetProperty( index );
+    auto        keyValuePair = map.GetKeyValue(position);
+    const auto& index        = keyValuePair.first.indexKey;
+    const auto& value        = keyValuePair.second;
+    auto        handleValue  = handle.GetProperty(index);
 
-    switch( value.GetType() )
+    switch(value.GetType())
     {
-      case Property::NONE:       break;
-      case Property::BOOLEAN:    DALI_TEST_EQUALS( value.Get< bool >(), handleValue.Get< bool >(), TEST_LOCATION ); break;
-      case Property::FLOAT:      DALI_TEST_EQUALS( value.Get< float >(), handleValue.Get< float >(), TEST_LOCATION ); break;
-      case Property::INTEGER:    DALI_TEST_EQUALS( value.Get< int >(), handleValue.Get< int >(), TEST_LOCATION ); break;
-      case Property::VECTOR2:    DALI_TEST_EQUALS( value.Get< Vector2 >(), handleValue.Get< Vector2 >(), TEST_LOCATION ); break;
-      case Property::VECTOR3:    DALI_TEST_EQUALS( value.Get< Vector3 >(), handleValue.Get< Vector3 >(), TEST_LOCATION ); break;
-      case Property::VECTOR4:    DALI_TEST_EQUALS( value.Get< Vector4 >(), handleValue.Get< Vector4 >(), TEST_LOCATION ); break;
-      case Property::MATRIX3:    DALI_TEST_EQUALS( value.Get< Matrix3 >(), handleValue.Get< Matrix3 >(), TEST_LOCATION ); break;
-      case Property::MATRIX:     DALI_TEST_EQUALS( value.Get< Matrix >(), handleValue.Get< Matrix >(), TEST_LOCATION ); break;
-      case Property::RECTANGLE:  DALI_TEST_EQUALS( value.Get< Rect< int > >(), handleValue.Get< Rect< int > >(), TEST_LOCATION ); break;
-      case Property::ROTATION:   DALI_TEST_EQUALS( value.Get< Quaternion >(), handleValue.Get< Quaternion >(), TEST_LOCATION ); break;
-      case Property::STRING:     DALI_TEST_EQUALS( value.Get< std::string >(), handleValue.Get< std::string >(), TEST_LOCATION ); break;
-      case Property::ARRAY:      DALI_TEST_EQUALS( value.GetArray()->Count(), handleValue.GetArray()->Count(), TEST_LOCATION ); break;
-      case Property::MAP:        DALI_TEST_EQUALS( value.GetMap()->Count(), handleValue.GetMap()->Count(), TEST_LOCATION ); break;
-      case Property::EXTENTS:    DALI_TEST_EQUALS( value.Get< Extents >(), handleValue.Get< Extents >(), TEST_LOCATION ); break;
+      case Property::NONE:
+        break;
+      case Property::BOOLEAN:
+        DALI_TEST_EQUALS(value.Get<bool>(), handleValue.Get<bool>(), TEST_LOCATION);
+        break;
+      case Property::FLOAT:
+        DALI_TEST_EQUALS(value.Get<float>(), handleValue.Get<float>(), TEST_LOCATION);
+        break;
+      case Property::INTEGER:
+        DALI_TEST_EQUALS(value.Get<int>(), handleValue.Get<int>(), TEST_LOCATION);
+        break;
+      case Property::VECTOR2:
+        DALI_TEST_EQUALS(value.Get<Vector2>(), handleValue.Get<Vector2>(), TEST_LOCATION);
+        break;
+      case Property::VECTOR3:
+        DALI_TEST_EQUALS(value.Get<Vector3>(), handleValue.Get<Vector3>(), TEST_LOCATION);
+        break;
+      case Property::VECTOR4:
+        DALI_TEST_EQUALS(value.Get<Vector4>(), handleValue.Get<Vector4>(), TEST_LOCATION);
+        break;
+      case Property::MATRIX3:
+        DALI_TEST_EQUALS(value.Get<Matrix3>(), handleValue.Get<Matrix3>(), TEST_LOCATION);
+        break;
+      case Property::MATRIX:
+        DALI_TEST_EQUALS(value.Get<Matrix>(), handleValue.Get<Matrix>(), TEST_LOCATION);
+        break;
+      case Property::RECTANGLE:
+        DALI_TEST_EQUALS(value.Get<Rect<int> >(), handleValue.Get<Rect<int> >(), TEST_LOCATION);
+        break;
+      case Property::ROTATION:
+        DALI_TEST_EQUALS(value.Get<Quaternion>(), handleValue.Get<Quaternion>(), TEST_LOCATION);
+        break;
+      case Property::STRING:
+        DALI_TEST_EQUALS(value.Get<std::string>(), handleValue.Get<std::string>(), TEST_LOCATION);
+        break;
+      case Property::ARRAY:
+        DALI_TEST_EQUALS(value.GetArray()->Count(), handleValue.GetArray()->Count(), TEST_LOCATION);
+        break;
+      case Property::MAP:
+        DALI_TEST_EQUALS(value.GetMap()->Count(), handleValue.GetMap()->Count(), TEST_LOCATION);
+        break;
+      case Property::EXTENTS:
+        DALI_TEST_EQUALS(value.Get<Extents>(), handleValue.Get<Extents>(), TEST_LOCATION);
+        break;
     }
   }
 
   // Add a custom property and ensure the count goes up by one.
   const auto countBefore = map.Count();
-  handle.RegisterProperty( "tempProperty", Color::GREEN );
-  handle.GetProperties( map );
-  DALI_TEST_EQUALS( countBefore + 1, map.Count(), TEST_LOCATION );
+  handle.RegisterProperty("tempProperty", Color::GREEN);
+  handle.GetProperties(map);
+  DALI_TEST_EQUALS(countBefore + 1, map.Count(), TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliHandleSetPropertyNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
-    int arg1(0);
+    int                   arg1(0);
     Dali::Property::Value arg2;
-    instance.SetProperty(arg1,arg2);
+    instance.SetProperty(arg1, arg2);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -1885,12 +1892,12 @@ int UtcDaliHandleSetPropertyNegative(void)
 int UtcDaliHandleRegisterPropertyNegative01(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
-    std::string arg1;
+    std::string           arg1;
     Dali::Property::Value arg2;
-    instance.RegisterProperty(arg1,arg2);
+    instance.RegisterProperty(arg1, arg2);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -1903,13 +1910,13 @@ int UtcDaliHandleRegisterPropertyNegative01(void)
 int UtcDaliHandleRegisterPropertyNegative02(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
-    std::string arg1;
-    Dali::Property::Value arg2;
+    std::string                arg1;
+    Dali::Property::Value      arg2;
     Dali::Property::AccessMode arg3(Property::READ_ONLY);
-    instance.RegisterProperty(arg1,arg2,arg3);
+    instance.RegisterProperty(arg1, arg2, arg3);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -1922,7 +1929,7 @@ int UtcDaliHandleRegisterPropertyNegative02(void)
 int UtcDaliHandleRemoveConstraintsNegative01(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     unsigned int arg1(0u);
@@ -1939,7 +1946,7 @@ int UtcDaliHandleRemoveConstraintsNegative01(void)
 int UtcDaliHandleRemoveConstraintsNegative02(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     instance.RemoveConstraints();
@@ -1955,13 +1962,13 @@ int UtcDaliHandleRemoveConstraintsNegative02(void)
 int UtcDaliHandleAddPropertyNotificationNegative01(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
-    int arg1(0);
-    int arg2(0);
+    int                     arg1(0);
+    int                     arg2(0);
     Dali::PropertyCondition arg3;
-    instance.AddPropertyNotification(arg1,arg2,arg3);
+    instance.AddPropertyNotification(arg1, arg2, arg3);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -1974,12 +1981,12 @@ int UtcDaliHandleAddPropertyNotificationNegative01(void)
 int UtcDaliHandleAddPropertyNotificationNegative02(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
-    int arg1(0);
+    int                     arg1(0);
     Dali::PropertyCondition arg2;
-    instance.AddPropertyNotification(arg1,arg2);
+    instance.AddPropertyNotification(arg1, arg2);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -1992,7 +1999,7 @@ int UtcDaliHandleAddPropertyNotificationNegative02(void)
 int UtcDaliHandleRemovePropertyNotificationNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     Dali::PropertyNotification arg1;
@@ -2009,7 +2016,7 @@ int UtcDaliHandleRemovePropertyNotificationNegative(void)
 int UtcDaliHandleRemovePropertyNotificationsNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     instance.RemovePropertyNotifications();
@@ -2025,7 +2032,7 @@ int UtcDaliHandleRemovePropertyNotificationsNegative(void)
 int UtcDaliHandleGetPropertyNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     int arg1(0);
@@ -2042,7 +2049,7 @@ int UtcDaliHandleGetPropertyNegative(void)
 int UtcDaliHandleGetPropertyNameNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     int arg1(0);
@@ -2059,7 +2066,7 @@ int UtcDaliHandleGetPropertyNameNegative(void)
 int UtcDaliHandleGetPropertyTypeNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     int arg1(0);
@@ -2076,7 +2083,7 @@ int UtcDaliHandleGetPropertyTypeNegative(void)
 int UtcDaliHandleGetPropertyCountNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     instance.GetPropertyCount();
@@ -2092,7 +2099,7 @@ int UtcDaliHandleGetPropertyCountNegative(void)
 int UtcDaliHandleGetPropertyIndexNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     std::string arg1;
@@ -2109,7 +2116,7 @@ int UtcDaliHandleGetPropertyIndexNegative(void)
 int UtcDaliHandleGetCurrentPropertyNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     int arg1(0);
@@ -2126,7 +2133,7 @@ int UtcDaliHandleGetCurrentPropertyNegative(void)
 int UtcDaliHandleGetPropertyIndicesNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     Dali::Vector<int> arg1;
@@ -2143,7 +2150,7 @@ int UtcDaliHandleGetPropertyIndicesNegative(void)
 int UtcDaliHandleIsPropertyWritableNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     int arg1(0);
@@ -2160,7 +2167,7 @@ int UtcDaliHandleIsPropertyWritableNegative(void)
 int UtcDaliHandleIsPropertyAnimatableNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     int arg1(0);
@@ -2177,7 +2184,7 @@ int UtcDaliHandleIsPropertyAnimatableNegative(void)
 int UtcDaliHandleIsPropertyAConstraintInputNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     int arg1(0);
@@ -2194,7 +2201,7 @@ int UtcDaliHandleIsPropertyAConstraintInputNegative(void)
 int UtcDaliHandleSupportsNegative(void)
 {
   TestApplication application;
-  Dali::Handle instance;
+  Dali::Handle    instance;
   try
   {
     Dali::Handle::Capability arg1(Handle::DYNAMIC_PROPERTIES);
@@ -2208,21 +2215,19 @@ int UtcDaliHandleSupportsNegative(void)
   END_TEST;
 }
 
-
 int UtcDaliHandleIndexOperatorByIndexP01(void)
 {
   TestApplication application;
-  Actor actor = Actor::New();
+  Actor           actor = Actor::New();
 
-  actor[Actor::Property::SIZE] = Vector3( 100.0f, 200.0f, 1.0f );
+  actor[Actor::Property::SIZE] = Vector3(100.0f, 200.0f, 1.0f);
 
-  DALI_TEST_EQUALS( actor.GetProperty<Vector3>(Actor::Property::SIZE), Vector3( 100.0f, 200.0f, 1.0f ), 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetProperty<Vector3>(Actor::Property::SIZE), Vector3(100.0f, 200.0f, 1.0f), 0.001f, TEST_LOCATION);
 
+  actor.SetProperty(Actor::Property::POSITION, Vector3(10.0f, 20.0f, 0.0f));
 
-  actor.SetProperty( Actor::Property::POSITION, Vector3( 10.0f, 20.0f, 0.0f ) );
-
-  Vector3 position = actor[ Actor::Property::POSITION ];
-  DALI_TEST_EQUALS( position, Vector3( 10.0f, 20.0f, 0.0f ), TEST_LOCATION );
+  Vector3 position = actor[Actor::Property::POSITION];
+  DALI_TEST_EQUALS(position, Vector3(10.0f, 20.0f, 0.0f), TEST_LOCATION);
 
   END_TEST;
 }
@@ -2230,18 +2235,18 @@ int UtcDaliHandleIndexOperatorByIndexP01(void)
 int UtcDaliHandleIndexOperatorByIndexP02(void)
 {
   TestApplication application;
-  Actor actor = Actor::New();
+  Actor           actor = Actor::New();
 
   const Vector4 defaultActorColor(1.0f, 1.0f, 1.0f, 1.0f);
   actor.SetProperty(Actor::Property::COLOR, defaultActorColor);
   actor[Actor::Property::COLOR_RED] = 0.5f;
 
-  DALI_TEST_EQUALS( actor.GetProperty<float>(Actor::Property::COLOR_RED), 0.5f, 0.001f, TEST_LOCATION);
-  DALI_TEST_EQUALS( actor.GetProperty<Vector4>(Actor::Property::COLOR), Vector4(0.5f, 1.0f, 1.0f, 1.0f), 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetProperty<float>(Actor::Property::COLOR_RED), 0.5f, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetProperty<Vector4>(Actor::Property::COLOR), Vector4(0.5f, 1.0f, 1.0f, 1.0f), 0.001f, TEST_LOCATION);
 
-  actor.SetProperty( Actor::Property::POSITION, Vector3( 10.0f, 20.0f, 0.0f ) );
+  actor.SetProperty(Actor::Property::POSITION, Vector3(10.0f, 20.0f, 0.0f));
 
-  DALI_TEST_EQUALS( (float)actor[ Actor::Property::POSITION_Z ], 0.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS((float)actor[Actor::Property::POSITION_Z], 0.0f, 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2249,17 +2254,17 @@ int UtcDaliHandleIndexOperatorByIndexP02(void)
 int UtcDaliHandleIndexOperatorByIndexP03(void)
 {
   TestApplication application;
-  Actor actor = Actor::New();
+  Actor           actor = Actor::New();
 
   const Vector4 defaultActorColor(1.0f, 1.0f, 1.0f, 1.0f);
   actor.SetProperty(Actor::Property::COLOR, defaultActorColor);
 
   // Value under test is second to allow compiler to deduce type
-  DALI_TEST_VALUE_EQUALS( actor[Actor::Property::COLOR_RED], 1.0f, 0.001f, TEST_LOCATION);
+  DALI_TEST_VALUE_EQUALS(actor[Actor::Property::COLOR_RED], 1.0f, 0.001f, TEST_LOCATION);
 
-  actor.SetProperty( Actor::Property::POSITION, Vector3( 10.0f, 20.0f, 0.0f ) );
+  actor.SetProperty(Actor::Property::POSITION, Vector3(10.0f, 20.0f, 0.0f));
 
-  DALI_TEST_EQUALS( (float)actor[ Actor::Property::POSITION_Z ], 0.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS((float)actor[Actor::Property::POSITION_Z], 0.0f, 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -2267,45 +2272,43 @@ int UtcDaliHandleIndexOperatorByIndexP03(void)
 int UtcDaliHandleIndexOperatorByNameP01(void)
 {
   TestApplication application;
-  Actor actor = Actor::New();
+  Actor           actor = Actor::New();
 
-  actor["size"] = Vector3( 100.0f, 200.0f, 1.0f );
+  actor["size"] = Vector3(100.0f, 200.0f, 1.0f);
 
-  DALI_TEST_VALUE_EQUALS( actor.GetProperty(Actor::Property::SIZE), Vector3( 100.0f, 200.0f, 1.0f ), 0.001f, TEST_LOCATION );
+  DALI_TEST_VALUE_EQUALS(actor.GetProperty(Actor::Property::SIZE), Vector3(100.0f, 200.0f, 1.0f), 0.001f, TEST_LOCATION);
 
-  actor.SetProperty( Actor::Property::POSITION, Vector3( 10.0f, 20.0f, 0.0f ) );
-  Vector3 position = actor[ "position" ];
+  actor.SetProperty(Actor::Property::POSITION, Vector3(10.0f, 20.0f, 0.0f));
+  Vector3 position = actor["position"];
 
-  DALI_TEST_EQUALS( position, Vector3( 10.0f, 20.0f, 0.0f ), 0.001f, TEST_LOCATION );
+  DALI_TEST_EQUALS(position, Vector3(10.0f, 20.0f, 0.0f), 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliHandleIndexOperatorByNameP02(void)
 {
   TestApplication application;
-  Actor actor = Actor::New();
+  Actor           actor = Actor::New();
 
   const Vector4 defaultActorColor(1.0f, 1.0f, 1.0f, 1.0f);
   actor.SetProperty(Actor::Property::COLOR, defaultActorColor);
   actor["colorRed"] = 0.5f;
 
-  DALI_TEST_VALUE_EQUALS( actor.GetProperty(Actor::Property::COLOR_RED), 0.5f, 0.001f, TEST_LOCATION);
-  DALI_TEST_VALUE_EQUALS( actor.GetProperty(Actor::Property::COLOR), Vector4(0.5f, 1.0f, 1.0f, 1.0f), 0.001f, TEST_LOCATION);
+  DALI_TEST_VALUE_EQUALS(actor.GetProperty(Actor::Property::COLOR_RED), 0.5f, 0.001f, TEST_LOCATION);
+  DALI_TEST_VALUE_EQUALS(actor.GetProperty(Actor::Property::COLOR), Vector4(0.5f, 1.0f, 1.0f, 1.0f), 0.001f, TEST_LOCATION);
 
-  actor.SetProperty( Actor::Property::POSITION, Vector3( 10.0f, 20.0f, 0.0f ) );
+  actor.SetProperty(Actor::Property::POSITION, Vector3(10.0f, 20.0f, 0.0f));
 
-  float positionY = actor[ "positionY" ];
-  DALI_TEST_EQUALS( positionY, 20.0f, 0.001f, TEST_LOCATION );
+  float positionY = actor["positionY"];
+  DALI_TEST_EQUALS(positionY, 20.0f, 0.001f, TEST_LOCATION);
 
   // Should automatically promote IndirectValue to Property::Value rvalue.
-  DALI_TEST_VALUE_EQUALS( actor["positionZ"], 0.0f, 0.001f, TEST_LOCATION );
+  DALI_TEST_VALUE_EQUALS(actor["positionZ"], 0.0f, 0.001f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliHandleIndexOperatorNegative02(void)
 {
   TestApplication application;
@@ -2314,7 +2317,7 @@ int UtcDaliHandleIndexOperatorNegative02(void)
   try
   {
     Vector3 position = actor[Actor::Property::POSITION];
-    if( position == position )
+    if(position == position)
     {
       DALI_TEST_CHECK(false); // Should throw before reaching here.
     }