Revert "[Tizen] Appendix log for ttrace + Print keycode and timestamp"
[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-Constrainer.cpp
index 8390e6f..63c4ee8 100644 (file)
  *
  */
 
-#include <iostream>
-
-#include <stdlib.h>
-#include <dali/public-api/dali-core.h>
-#include <dali/devel-api/animation/path-constrainer.h>
 #include <dali-test-suite-utils.h>
+#include <dali/devel-api/animation/path-constrainer.h>
+#include <dali/public-api/dali-core.h>
+#include <stdlib.h>
+
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Internal;
 
 namespace
 {
-
-static void SetupPath( Dali::Path& path)
+static void SetupPath(Dali::Path& path)
 {
-  path.AddPoint(Vector3( 30.0,  80.0, 0.0));
-  path.AddPoint(Vector3( 70.0, 120.0, 0.0));
+  path.AddPoint(Vector3(30.0, 80.0, 0.0));
+  path.AddPoint(Vector3(70.0, 120.0, 0.0));
   path.AddPoint(Vector3(100.0, 100.0, 0.0));
 
   //Control points for first segment
-  path.AddControlPoint( Vector3( 39.0,  90.0, 0.0) );
-  path.AddControlPoint(Vector3( 56.0, 119.0, 0.0) );
+  path.AddControlPoint(Vector3(39.0, 90.0, 0.0));
+  path.AddControlPoint(Vector3(56.0, 119.0, 0.0));
 
   //Control points for second segment
-  path.AddControlPoint(Vector3( 78.0, 120.0, 0.0) );
-  path.AddControlPoint(Vector3( 93.0, 104.0, 0.0) );
+  path.AddControlPoint(Vector3(78.0, 120.0, 0.0));
+  path.AddControlPoint(Vector3(93.0, 104.0, 0.0));
 }
 
-static void SetupPathConstrainer( Dali::PathConstrainer& PathConstrainer)
+static void SetupPathConstrainer(Dali::PathConstrainer& PathConstrainer)
 {
-  PathConstrainer.SetProperty( Dali::PathConstrainer::Property::FORWARD, Vector3(1.0f,0.0f,0.0f) );
+  PathConstrainer.SetProperty(Dali::PathConstrainer::Property::FORWARD, Vector3(1.0f, 0.0f, 0.0f));
 
   Dali::Property::Array points;
   points.Resize(3);
-  points[0] = Vector3( 30.0,  80.0, 0.0);
-  points[1] = Vector3( 70.0, 120.0, 0.0);
+  points[0] = Vector3(30.0, 80.0, 0.0);
+  points[1] = Vector3(70.0, 120.0, 0.0);
   points[2] = Vector3(100.0, 100.0, 0.0);
-  PathConstrainer.SetProperty( Dali::PathConstrainer::Property::POINTS, points );
+  PathConstrainer.SetProperty(Dali::PathConstrainer::Property::POINTS, points);
 
   points.Resize(4);
-  points[0] = Vector3( 39.0,  90.0, 0.0);
-  points[1] = Vector3( 56.0, 119.0, 0.0);
-  points[2] = Vector3( 78.0, 120.0, 0.0);
-  points[3] = Vector3( 93.0, 104.0, 0.0);
-  PathConstrainer.SetProperty( Dali::PathConstrainer::Property::CONTROL_POINTS, points );
+  points[0] = Vector3(39.0, 90.0, 0.0);
+  points[1] = Vector3(56.0, 119.0, 0.0);
+  points[2] = Vector3(78.0, 120.0, 0.0);
+  points[3] = Vector3(93.0, 104.0, 0.0);
+  PathConstrainer.SetProperty(Dali::PathConstrainer::Property::CONTROL_POINTS, points);
 }
 
-static void SetupLinearConstrainerUniformProgress( Dali::LinearConstrainer& linearConstrainer)
+static void SetupLinearConstrainerUniformProgress(Dali::LinearConstrainer& linearConstrainer)
 {
   Dali::Property::Array points;
   points.Resize(3);
   points[0] = 0.0f;
   points[1] = 1.0f;
   points[2] = 0.0f;
-  linearConstrainer.SetProperty( Dali::LinearConstrainer::Property::VALUE, points );
+  linearConstrainer.SetProperty(Dali::LinearConstrainer::Property::VALUE, points);
 }
 
-static void VerifyLinearConstrainerUniformProgress( Dali::LinearConstrainer& linearConstrainer )
+static void VerifyLinearConstrainerUniformProgress(Dali::LinearConstrainer& linearConstrainer)
 {
   Dali::Property::Array points;
   points.Resize(3);
@@ -80,30 +79,30 @@ static void VerifyLinearConstrainerUniformProgress( Dali::LinearConstrainer& lin
   points[1] = 1.0f;
   points[2] = 0.0f;
 
-  Property::Value value = linearConstrainer.GetProperty( Dali::LinearConstrainer::Property::VALUE );
+  Property::Value  value = linearConstrainer.GetProperty(Dali::LinearConstrainer::Property::VALUE);
   Property::Array* array = value.GetArray();
-  DALI_TEST_CHECK( array );
+  DALI_TEST_CHECK(array);
 
   const unsigned int noOfPoints = points.Size();
-  for( unsigned int i = 0; i < noOfPoints; ++i )
+  for(unsigned int i = 0; i < noOfPoints; ++i)
   {
-    DALI_TEST_EQUALS( ( *array )[i].Get< float >(), points[i].Get< float >(), TEST_LOCATION );
+    DALI_TEST_EQUALS((*array)[i].Get<float>(), points[i].Get<float>(), TEST_LOCATION);
   }
 }
 
-static void SetupLinearConstrainerNonUniformProgress( Dali::LinearConstrainer& linearConstrainer)
+static void SetupLinearConstrainerNonUniformProgress(Dali::LinearConstrainer& linearConstrainer)
 {
   Dali::Property::Array points;
   points.Resize(3);
   points[0] = 0.0f;
   points[1] = 1.0f;
   points[2] = 0.0f;
-  linearConstrainer.SetProperty( Dali::LinearConstrainer::Property::VALUE, points );
+  linearConstrainer.SetProperty(Dali::LinearConstrainer::Property::VALUE, points);
 
   points[0] = 0.0f;
   points[1] = 0.25f;
   points[2] = 1.0f;
-  linearConstrainer.SetProperty( Dali::LinearConstrainer::Property::PROGRESS, points );
+  linearConstrainer.SetProperty(Dali::LinearConstrainer::Property::PROGRESS, points);
 }
 
 } // anonymous namespace
@@ -116,7 +115,7 @@ int UtcPathConstrainerApply(void)
   Dali::Actor actor = Dali::Actor::New();
 
   // Register a float property
-  Property::Index index = actor.RegisterProperty( "t", 0.0f );
+  Property::Index index = actor.RegisterProperty("t", 0.0f);
 
   application.GetScene().Add(actor);
 
@@ -126,48 +125,48 @@ int UtcPathConstrainerApply(void)
 
   //Create a PathConstrainer
   Dali::PathConstrainer pathConstrainer = Dali::PathConstrainer::New();
-  SetupPathConstrainer( pathConstrainer );
+  SetupPathConstrainer(pathConstrainer);
 
   //Apply the path constraint to the actor's position. The source property for the constraint will be the custom property "t"
-  Vector2 range( 0.0f, 1.0f );
-  pathConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION), Property(actor,index), range );
+  Vector2 range(0.0f, 1.0f);
+  pathConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION), Property(actor, index), range);
 
   //Create an animation to animate the custom property
-  float durationSeconds(1.0f);
+  float           durationSeconds(1.0f);
   Dali::Animation animation = Dali::Animation::New(durationSeconds);
-  animation.AnimateTo(Dali::Property(actor,index),1.0f);
+  animation.AnimateTo(Dali::Property(actor, index), 1.0f);
   animation.Play();
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*200.0f)/* 20% progress */);
+  application.Render(static_cast<unsigned int>(durationSeconds * 200.0f) /* 20% progress */);
 
   Vector3 position, tangent;
-  path.Sample(0.2f, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  path.Sample(0.2f, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*200.0f)/* 40% progress */);
-  path.Sample(0.4f, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 200.0f) /* 40% progress */);
+  path.Sample(0.4f, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*200.0f)/* 60% progress */);
-  path.Sample(0.6f, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 200.0f) /* 60% progress */);
+  path.Sample(0.6f, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*200.0f)/* 80% progress */);
-  path.Sample(0.8f, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 200.0f) /* 80% progress */);
+  path.Sample(0.8f, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*200.0f)/* 100% progress */);
-  path.Sample(1.0f, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 200.0f) /* 100% progress */);
+  path.Sample(1.0f, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*200.0f)/* beyond the animation duration*/);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 200.0f) /* beyond the animation duration*/);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   END_TEST;
 }
@@ -179,7 +178,7 @@ int UtcPathConstrainerApplyRange(void)
   Dali::Actor actor = Dali::Actor::New();
 
   // Register a float property
-  Property::Index index = actor.RegisterProperty( "t", 0.0f );
+  Property::Index index = actor.RegisterProperty("t", 0.0f);
   application.GetScene().Add(actor);
 
   //Create a Path
@@ -188,64 +187,62 @@ int UtcPathConstrainerApplyRange(void)
 
   //Create a PathConstrainer
   Dali::PathConstrainer pathConstrainer = Dali::PathConstrainer::New();
-  SetupPathConstrainer( pathConstrainer );
+  SetupPathConstrainer(pathConstrainer);
 
   //Apply the path constraint to the actor's position. The source property for the constraint will be the custom property "t"
-  Vector2 range( 100.0f, 300.0f );
-  pathConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION), Property(actor,index), range );
-
+  Vector2 range(100.0f, 300.0f);
+  pathConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION), Property(actor, index), range);
 
   //Create an animation to animate the custom property
-  float durationSeconds(1.0f);
+  float           durationSeconds(1.0f);
   Dali::Animation animation = Dali::Animation::New(durationSeconds);
-  animation.AnimateTo(Dali::Property(actor,index),400.0f);
+  animation.AnimateTo(Dali::Property(actor, index), 400.0f);
   animation.Play();
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 25% progress */);
-
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 25% progress */);
 
   Vector3 position, tangent;
-  float tValue;
-  actor.GetCurrentProperty( index ).Get(tValue);
-  float currentCursor =  ( tValue - range.x ) / (range.y-range.x);
-  path.Sample(currentCursor, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  float   tValue;
+  actor.GetCurrentProperty(index).Get(tValue);
+  float currentCursor = (tValue - range.x) / (range.y - range.x);
+  path.Sample(currentCursor, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 50% progress */);
-  actor.GetCurrentProperty( index ).Get(tValue);
-  currentCursor =  ( tValue - range.x ) / (range.y-range.x);
-  path.Sample(currentCursor, position, tangent );
-  path.Sample(0.5, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 50% progress */);
+  actor.GetCurrentProperty(index).Get(tValue);
+  currentCursor = (tValue - range.x) / (range.y - range.x);
+  path.Sample(currentCursor, position, tangent);
+  path.Sample(0.5, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 75% progress */);
-  actor.GetCurrentProperty( index ).Get( tValue );
-  currentCursor =  ( tValue - range.x ) / (range.y-range.x);
-  path.Sample(currentCursor, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 75% progress */);
+  actor.GetCurrentProperty(index).Get(tValue);
+  currentCursor = (tValue - range.x) / (range.y - range.x);
+  path.Sample(currentCursor, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 100% progress */);
-  actor.GetCurrentProperty( index ).Get( tValue );
-  currentCursor =  ( tValue - range.x ) / (range.y-range.x);
-  path.Sample(currentCursor, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 100% progress */);
+  actor.GetCurrentProperty(index).Get(tValue);
+  currentCursor = (tValue - range.x) / (range.y - range.x);
+  path.Sample(currentCursor, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* beyond the animation duration*/);
-  actor.GetCurrentProperty( index ).Get( tValue );
-  currentCursor =  ( tValue - range.x ) / (range.y-range.x);
-  path.Sample(currentCursor, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* beyond the animation duration*/);
+  actor.GetCurrentProperty(index).Get(tValue);
+  currentCursor = (tValue - range.x) / (range.y - range.x);
+  path.Sample(currentCursor, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   // Ensure GetProperty also returns the final result
-  actor.GetProperty( index ).Get( tValue );
-  currentCursor =  ( tValue - range.x ) / (range.y-range.x);
-  path.Sample(currentCursor, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  actor.GetProperty(index).Get(tValue);
+  currentCursor = (tValue - range.x) / (range.y - range.x);
+  path.Sample(currentCursor, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   END_TEST;
 }
@@ -257,7 +254,7 @@ int UtcPathConstrainerDestroy(void)
   Dali::Actor actor = Dali::Actor::New();
 
   // Register a float property
-  Property::Index index = actor.RegisterProperty( "t", 0.0f );
+  Property::Index index = actor.RegisterProperty("t", 0.0f);
   application.GetScene().Add(actor);
 
   {
@@ -267,29 +264,28 @@ int UtcPathConstrainerDestroy(void)
 
     //Create a PathConstrainer
     Dali::PathConstrainer pathConstrainer = Dali::PathConstrainer::New();
-    SetupPathConstrainer( pathConstrainer );
+    SetupPathConstrainer(pathConstrainer);
 
     //Apply the path constraint to the actor's position. The source property for the constraint will be the custom property "t"
-    Vector2 range( 0.0f, 1.0f );
-    pathConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION), Property(actor,index), range );
+    Vector2 range(0.0f, 1.0f);
+    pathConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION), Property(actor, index), range);
 
     //Test that the constraint is correctly applied
-    actor.SetProperty(index,0.5f);
+    actor.SetProperty(index, 0.5f);
     application.SendNotification();
     application.Render(static_cast<unsigned int>(1.0f));
 
     Vector3 position, tangent;
-    path.Sample(0.5f, position, tangent );
-    DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
-
+    path.Sample(0.5f, position, tangent);
+    DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
   }
 
   //PathConstrainer has been destroyed. Constraint in the actor should have been removed
-  actor.SetProperty(index,0.75f);
+  actor.SetProperty(index, 0.75f);
   application.SendNotification();
   application.Render(static_cast<unsigned int>(1.0f));
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), Vector3::ZERO, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), Vector3::ZERO, TEST_LOCATION);
 
   END_TEST;
 }
@@ -301,7 +297,7 @@ int UtcPathConstrainerRemove(void)
   Dali::Actor actor = Dali::Actor::New();
 
   // Register a float property
-  Property::Index index = actor.RegisterProperty( "t", 0.0f );
+  Property::Index index = actor.RegisterProperty("t", 0.0f);
   application.GetScene().Add(actor);
 
   //Create a Path
@@ -310,100 +306,100 @@ int UtcPathConstrainerRemove(void)
 
   //Create a PathConstrainer
   Dali::PathConstrainer pathConstrainer = Dali::PathConstrainer::New();
-  SetupPathConstrainer( pathConstrainer );
+  SetupPathConstrainer(pathConstrainer);
 
   //Apply the path constraint to the actor's position. The source property for the constraint will be the custom property "t"
-  Vector2 range( 0.0f, 1.0f );
-  pathConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION), Property(actor,index), range );
+  Vector2 range(0.0f, 1.0f);
+  pathConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION), Property(actor, index), range);
 
   //Test that the constraint is correctly applied
-  actor.SetProperty(index,0.5f);
+  actor.SetProperty(index, 0.5f);
   application.SendNotification();
   application.Render(static_cast<unsigned int>(1.0f));
 
   Vector3 position, tangent;
-  path.Sample(0.5f, position, tangent );
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), position, TEST_LOCATION );
+  path.Sample(0.5f, position, tangent);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), position, TEST_LOCATION);
 
   //Remove constraint
-  pathConstrainer.Remove( actor );
-  actor.SetProperty(index,0.75f);
+  pathConstrainer.Remove(actor);
+  actor.SetProperty(index, 0.75f);
   application.SendNotification();
   application.Render(static_cast<unsigned int>(1.0f));
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ), Vector3::ZERO, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION), Vector3::ZERO, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcPathConstrainerProperties(void)
 {
-  TestApplication application;
+  TestApplication       application;
   Dali::PathConstrainer pathConstrainer = Dali::PathConstrainer::New();
 
-  pathConstrainer.SetProperty( Dali::PathConstrainer::Property::FORWARD, Vector3( 1.0f,0.0f,0.0f ) );
-  DALI_TEST_EQUALS( pathConstrainer.GetProperty< Vector3 >( Dali::PathConstrainer::Property::FORWARD ), Vector3( 1.0f, 0.0f, 0.0f ), TEST_LOCATION );
-  DALI_TEST_EQUALS( pathConstrainer.GetCurrentProperty< Vector3 >( Dali::PathConstrainer::Property::FORWARD ), Vector3( 1.0f, 0.0f, 0.0f ), TEST_LOCATION );
+  pathConstrainer.SetProperty(Dali::PathConstrainer::Property::FORWARD, Vector3(1.0f, 0.0f, 0.0f));
+  DALI_TEST_EQUALS(pathConstrainer.GetProperty<Vector3>(Dali::PathConstrainer::Property::FORWARD), Vector3(1.0f, 0.0f, 0.0f), TEST_LOCATION);
+  DALI_TEST_EQUALS(pathConstrainer.GetCurrentProperty<Vector3>(Dali::PathConstrainer::Property::FORWARD), Vector3(1.0f, 0.0f, 0.0f), TEST_LOCATION);
 
   Dali::Property::Array points;
   points.Resize(3);
-  points[0] = Vector3( 30.0,  80.0, 0.0);
-  points[1] = Vector3( 70.0, 120.0, 0.0);
+  points[0] = Vector3(30.0, 80.0, 0.0);
+  points[1] = Vector3(70.0, 120.0, 0.0);
   points[2] = Vector3(100.0, 100.0, 0.0);
-  pathConstrainer.SetProperty( Dali::PathConstrainer::Property::POINTS, points );
+  pathConstrainer.SetProperty(Dali::PathConstrainer::Property::POINTS, points);
 
   {
-    Property::Value value = pathConstrainer.GetProperty( Dali::PathConstrainer::Property::POINTS );
+    Property::Value  value = pathConstrainer.GetProperty(Dali::PathConstrainer::Property::POINTS);
     Property::Array* array = value.GetArray();
-    DALI_TEST_CHECK( array );
+    DALI_TEST_CHECK(array);
 
     const unsigned int noOfPoints = points.Size();
-    for( unsigned int i = 0; i < noOfPoints; ++i )
+    for(unsigned int i = 0; i < noOfPoints; ++i)
     {
-      DALI_TEST_EQUALS( ( *array )[i].Get< Vector3 >(), points[i].Get< Vector3 >(), TEST_LOCATION );
+      DALI_TEST_EQUALS((*array)[i].Get<Vector3>(), points[i].Get<Vector3>(), TEST_LOCATION);
     }
   }
 
   {
-    Property::Value value = pathConstrainer.GetCurrentProperty( Dali::PathConstrainer::Property::POINTS );
+    Property::Value  value = pathConstrainer.GetCurrentProperty(Dali::PathConstrainer::Property::POINTS);
     Property::Array* array = value.GetArray();
-    DALI_TEST_CHECK( array );
+    DALI_TEST_CHECK(array);
 
     const unsigned int noOfPoints = points.Size();
-    for( unsigned int i = 0; i < noOfPoints; ++i )
+    for(unsigned int i = 0; i < noOfPoints; ++i)
     {
-      DALI_TEST_EQUALS( ( *array )[i].Get< Vector3 >(), points[i].Get< Vector3 >(), TEST_LOCATION );
+      DALI_TEST_EQUALS((*array)[i].Get<Vector3>(), points[i].Get<Vector3>(), TEST_LOCATION);
     }
   }
 
   points.Resize(4);
-  points[0] = Vector3( 39.0,  90.0, 0.0);
-  points[1] = Vector3( 56.0, 119.0, 0.0);
-  points[2] = Vector3( 78.0, 120.0, 0.0);
-  points[3] = Vector3( 93.0, 104.0, 0.0);
-  pathConstrainer.SetProperty( Dali::PathConstrainer::Property::CONTROL_POINTS, points );
+  points[0] = Vector3(39.0, 90.0, 0.0);
+  points[1] = Vector3(56.0, 119.0, 0.0);
+  points[2] = Vector3(78.0, 120.0, 0.0);
+  points[3] = Vector3(93.0, 104.0, 0.0);
+  pathConstrainer.SetProperty(Dali::PathConstrainer::Property::CONTROL_POINTS, points);
 
   {
-    Property::Value value = pathConstrainer.GetProperty( Dali::PathConstrainer::Property::CONTROL_POINTS );
+    Property::Value  value = pathConstrainer.GetProperty(Dali::PathConstrainer::Property::CONTROL_POINTS);
     Property::Array* array = value.GetArray();
-    DALI_TEST_CHECK( array );
+    DALI_TEST_CHECK(array);
 
     const unsigned int noOfPoints = points.Size();
-    for( unsigned int i = 0; i < noOfPoints; ++i )
+    for(unsigned int i = 0; i < noOfPoints; ++i)
     {
-      DALI_TEST_EQUALS( ( *array )[i].Get< Vector3 >(), points[i].Get< Vector3 >(), TEST_LOCATION );
+      DALI_TEST_EQUALS((*array)[i].Get<Vector3>(), points[i].Get<Vector3>(), TEST_LOCATION);
     }
   }
 
   {
-    Property::Value value = pathConstrainer.GetCurrentProperty( Dali::PathConstrainer::Property::CONTROL_POINTS );
+    Property::Value  value = pathConstrainer.GetCurrentProperty(Dali::PathConstrainer::Property::CONTROL_POINTS);
     Property::Array* array = value.GetArray();
-    DALI_TEST_CHECK( array );
+    DALI_TEST_CHECK(array);
 
     const unsigned int noOfPoints = points.Size();
-    for( unsigned int i = 0; i < noOfPoints; ++i )
+    for(unsigned int i = 0; i < noOfPoints; ++i)
     {
-      DALI_TEST_EQUALS( ( *array )[i].Get< Vector3 >(), points[i].Get< Vector3 >(), TEST_LOCATION );
+      DALI_TEST_EQUALS((*array)[i].Get<Vector3>(), points[i].Get<Vector3>(), TEST_LOCATION);
     }
   }
 
@@ -413,32 +409,32 @@ int UtcPathConstrainerProperties(void)
 //LinearConstrainer test cases
 int UtcLinearConstrainerDownCast(void)
 {
-  TestApplication application;
+  TestApplication         application;
   Dali::LinearConstrainer linearConstrainer = Dali::LinearConstrainer::New();
 
-  BaseHandle handle( linearConstrainer );
-  Dali::LinearConstrainer linearConstrainer2 = Dali::LinearConstrainer::DownCast( handle );
-  DALI_TEST_EQUALS( (bool)linearConstrainer2, true, TEST_LOCATION );
+  BaseHandle              handle(linearConstrainer);
+  Dali::LinearConstrainer linearConstrainer2 = Dali::LinearConstrainer::DownCast(handle);
+  DALI_TEST_EQUALS((bool)linearConstrainer2, true, TEST_LOCATION);
 
-  BaseHandle handle2;
-  Dali:: LinearConstrainer linearConstrainer3 = Dali::LinearConstrainer::DownCast( handle2 );
-  DALI_TEST_EQUALS( (bool)linearConstrainer3, false, TEST_LOCATION );
+  BaseHandle              handle2;
+  Dali::LinearConstrainer linearConstrainer3 = Dali::LinearConstrainer::DownCast(handle2);
+  DALI_TEST_EQUALS((bool)linearConstrainer3, false, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcLinearConstrainerCopyConstructor(void)
 {
-  TestApplication application;
+  TestApplication         application;
   Dali::LinearConstrainer linearConstrainer;
-  DALI_TEST_EQUALS( (bool)linearConstrainer, false, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)linearConstrainer, false, TEST_LOCATION);
 
   linearConstrainer = Dali::LinearConstrainer::New();
-  DALI_TEST_EQUALS( (bool)linearConstrainer, true, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)linearConstrainer, true, TEST_LOCATION);
 
   // call the copy constructor
-  Dali::LinearConstrainer linearConstrainer2( linearConstrainer );
-  DALI_TEST_EQUALS( (bool)linearConstrainer2, true, TEST_LOCATION );
+  Dali::LinearConstrainer linearConstrainer2(linearConstrainer);
+  DALI_TEST_EQUALS((bool)linearConstrainer2, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -448,17 +444,17 @@ int UtcLinearConstrainerMoveConstructor(void)
   TestApplication application;
 
   Dali::LinearConstrainer linearConstrainer = Dali::LinearConstrainer::New();
-  DALI_TEST_CHECK( linearConstrainer );
-  DALI_TEST_EQUALS( 1, linearConstrainer.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_CHECK(linearConstrainer);
+  DALI_TEST_EQUALS(1, linearConstrainer.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
-  SetupLinearConstrainerUniformProgress( linearConstrainer );
-  VerifyLinearConstrainerUniformProgress( linearConstrainer );
+  SetupLinearConstrainerUniformProgress(linearConstrainer);
+  VerifyLinearConstrainerUniformProgress(linearConstrainer);
 
-  Dali::LinearConstrainer moved = std::move( linearConstrainer );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  VerifyLinearConstrainerUniformProgress( moved );
-  DALI_TEST_CHECK( !linearConstrainer );
+  Dali::LinearConstrainer moved = std::move(linearConstrainer);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  VerifyLinearConstrainerUniformProgress(moved);
+  DALI_TEST_CHECK(!linearConstrainer);
 
   END_TEST;
 }
@@ -468,18 +464,18 @@ int UtcLinearConstrainerMoveAssignment(void)
   TestApplication application;
 
   Dali::LinearConstrainer linearConstrainer = Dali::LinearConstrainer::New();
-  DALI_TEST_CHECK( linearConstrainer );
-  DALI_TEST_EQUALS( 1, linearConstrainer.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_CHECK(linearConstrainer);
+  DALI_TEST_EQUALS(1, linearConstrainer.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
-  SetupLinearConstrainerUniformProgress( linearConstrainer );
-  VerifyLinearConstrainerUniformProgress( linearConstrainer );
+  SetupLinearConstrainerUniformProgress(linearConstrainer);
+  VerifyLinearConstrainerUniformProgress(linearConstrainer);
 
   Dali::LinearConstrainer moved;
-  moved = std::move( linearConstrainer );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  VerifyLinearConstrainerUniformProgress( moved );
-  DALI_TEST_CHECK( !linearConstrainer );
+  moved = std::move(linearConstrainer);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  VerifyLinearConstrainerUniformProgress(moved);
+  DALI_TEST_CHECK(!linearConstrainer);
 
   END_TEST;
 }
@@ -491,73 +487,72 @@ int UtcLinearConstrainerApply(void)
   Dali::Actor actor = Dali::Actor::New();
 
   // Register a float property
-  Property::Index index = actor.RegisterProperty( "t", 0.0f );
+  Property::Index index = actor.RegisterProperty("t", 0.0f);
 
   application.GetScene().Add(actor);
 
-
   //Create a LinearConstrainer without specifying progress for values
   Dali::LinearConstrainer linearConstrainer = Dali::LinearConstrainer::New();
-  SetupLinearConstrainerUniformProgress( linearConstrainer );
+  SetupLinearConstrainerUniformProgress(linearConstrainer);
 
   //Apply the linear constraint to the actor's position. The source property for the constraint will be the custom property "t"
-  Vector2 range( 0.0f, 1.0f );
-  linearConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION_X), Property(actor,index), range );
+  Vector2 range(0.0f, 1.0f);
+  linearConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION_X), Property(actor, index), range);
 
   //Create an animation to animate the custom property
-  float durationSeconds(1.0f);
+  float           durationSeconds(1.0f);
   Dali::Animation animation = Dali::Animation::New(durationSeconds);
-  animation.AnimateTo(Dali::Property(actor,index),1.0f);
+  animation.AnimateTo(Dali::Property(actor, index), 1.0f);
   animation.Play();
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 25% progress */);
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 25% progress */);
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.5f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 50% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 1.0f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 50% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 1.0f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 75% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.5f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 75% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.5f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 100% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.0f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 100% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.0f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* beyond the animation duration*/);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.0f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* beyond the animation duration*/);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.0f, TEST_LOCATION);
 
   //Setup a LinearConstrainer specifying the progress for each value
   linearConstrainer.Remove(actor);
-  SetupLinearConstrainerNonUniformProgress( linearConstrainer );
-  linearConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION_X), Property(actor,index), range );
+  SetupLinearConstrainerNonUniformProgress(linearConstrainer);
+  linearConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION_X), Property(actor, index), range);
 
-  actor.SetProperty(index,0.0f);
+  actor.SetProperty(index, 0.0f);
   animation.Play();
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 25% progress */);
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 25% progress */);
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 1.0f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 50% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 2.0f/3.0f, Math::MACHINE_EPSILON_1, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 50% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 2.0f / 3.0f, Math::MACHINE_EPSILON_1, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 75% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 1.0f/3.0f, Math::MACHINE_EPSILON_1, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 75% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 1.0f / 3.0f, Math::MACHINE_EPSILON_1, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 100% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.0f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 100% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.0f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* beyond the animation duration*/);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.0f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* beyond the animation duration*/);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -569,44 +564,43 @@ int UtcLinearConstrainerApplyRange(void)
   Dali::Actor actor = Dali::Actor::New();
 
   // Register a float property
-  Property::Index index = actor.RegisterProperty( "t", 100.0f );
+  Property::Index index = actor.RegisterProperty("t", 100.0f);
   application.GetScene().Add(actor);
 
   //Create a LinearConstrainer
   Dali::LinearConstrainer linearConstrainer = Dali::LinearConstrainer::New();
-  SetupLinearConstrainerUniformProgress( linearConstrainer );
+  SetupLinearConstrainerUniformProgress(linearConstrainer);
 
   //Apply the linear constraint to the actor's position. The source property for the constraint will be the custom property "t"
-  Vector2 range( 100.0f, 300.0f );
-  linearConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION_X), Property(actor,index), range );
-
+  Vector2 range(100.0f, 300.0f);
+  linearConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION_X), Property(actor, index), range);
 
   //Create an animation to animate the custom property
-  float durationSeconds(1.0f);
+  float           durationSeconds(1.0f);
   Dali::Animation animation = Dali::Animation::New(durationSeconds);
-  animation.AnimateTo(Dali::Property(actor,index),300.0f);
+  animation.AnimateTo(Dali::Property(actor, index), 300.0f);
   animation.Play();
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 25% progress */);
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 25% progress */);
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.5f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 50% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 1.0f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 50% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 1.0f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 75% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.5f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 75% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.5f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* 100% progress */);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.0f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* 100% progress */);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.0f, TEST_LOCATION);
 
   application.SendNotification();
-  application.Render(static_cast<unsigned int>(durationSeconds*250.0f)/* beyond the animation duration*/);
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.0f, TEST_LOCATION );
+  application.Render(static_cast<unsigned int>(durationSeconds * 250.0f) /* beyond the animation duration*/);
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -618,33 +612,32 @@ int UtcLinearConstrainerDestroy(void)
   Dali::Actor actor = Dali::Actor::New();
 
   // Register a float property
-  Property::Index index = actor.RegisterProperty( "t", 0.0f );
+  Property::Index index = actor.RegisterProperty("t", 0.0f);
   application.GetScene().Add(actor);
 
   {
     //Create a LinearConstrainer
     Dali::LinearConstrainer linearConstrainer = Dali::LinearConstrainer::New();
-    SetupLinearConstrainerUniformProgress( linearConstrainer );
+    SetupLinearConstrainerUniformProgress(linearConstrainer);
 
     //Apply the linear constraint to the actor's position. The source property for the constraint will be the custom property "t"
-    Vector2 range( 0.0f, 1.0f );
-    linearConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION_X), Property(actor,index), range );
+    Vector2 range(0.0f, 1.0f);
+    linearConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION_X), Property(actor, index), range);
 
     //Test that the constraint is correctly applied
-    actor.SetProperty(index,0.5f);
+    actor.SetProperty(index, 0.5f);
     application.SendNotification();
     application.Render(static_cast<unsigned int>(1.0f));
 
-    DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 1.0f, TEST_LOCATION );
-
+    DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 1.0f, TEST_LOCATION);
   }
 
   //LinearConstrainer has been destroyed. Constraint in the actor should have been removed
-  actor.SetProperty(index,0.75f);
+  actor.SetProperty(index, 0.75f);
   application.SendNotification();
   application.Render(static_cast<unsigned int>(1.0f));
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -656,31 +649,31 @@ int UtcLinearConstrainerRemove(void)
   Dali::Actor actor = Dali::Actor::New();
 
   // Register a float property
-  Property::Index index = actor.RegisterProperty( "t", 0.0f );
+  Property::Index index = actor.RegisterProperty("t", 0.0f);
   application.GetScene().Add(actor);
 
   //Create a LinearConstrainer
   Dali::LinearConstrainer linearConstrainer = Dali::LinearConstrainer::New();
-  SetupLinearConstrainerUniformProgress( linearConstrainer );
+  SetupLinearConstrainerUniformProgress(linearConstrainer);
 
   //Apply the path constraint to the actor's position. The source property for the constraint will be the custom property "t"
-  Vector2 range( 0.0f, 1.0f );
-  linearConstrainer.Apply( Property(actor,Dali::Actor::Property::POSITION_X), Property(actor,index), range );
+  Vector2 range(0.0f, 1.0f);
+  linearConstrainer.Apply(Property(actor, Dali::Actor::Property::POSITION_X), Property(actor, index), range);
 
   //Test that the constraint is correctly applied
-  actor.SetProperty(index,0.5f);
+  actor.SetProperty(index, 0.5f);
   application.SendNotification();
   application.Render(static_cast<unsigned int>(1.0f));
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 1.0f, TEST_LOCATION);
 
   //Remove constraint
-  linearConstrainer.Remove( actor );
-  actor.SetProperty(index,0.75f);
+  linearConstrainer.Remove(actor);
+  actor.SetProperty(index, 0.75f);
   application.SendNotification();
   application.Render(static_cast<unsigned int>(1.0f));
 
-  DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Dali::Actor::Property::POSITION ).x, 0.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(actor.GetCurrentProperty<Vector3>(Dali::Actor::Property::POSITION).x, 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -696,58 +689,58 @@ int UtcLinearConstrainerProperties(void)
   points[0] = 0.0f;
   points[1] = 1.0f;
   points[2] = 0.0f;
-  linearConstrainer.SetProperty( Dali::LinearConstrainer::Property::VALUE, points );
+  linearConstrainer.SetProperty(Dali::LinearConstrainer::Property::VALUE, points);
 
   {
-    Property::Value value = linearConstrainer.GetProperty( Dali::LinearConstrainer::Property::VALUE );
+    Property::Value  value = linearConstrainer.GetProperty(Dali::LinearConstrainer::Property::VALUE);
     Property::Array* array = value.GetArray();
-    DALI_TEST_CHECK( array );
+    DALI_TEST_CHECK(array);
 
     const unsigned int noOfPoints = points.Size();
-    for( unsigned int i = 0; i < noOfPoints; ++i )
+    for(unsigned int i = 0; i < noOfPoints; ++i)
     {
-      DALI_TEST_EQUALS( ( *array )[i].Get< float >(), points[i].Get< float >(), TEST_LOCATION );
+      DALI_TEST_EQUALS((*array)[i].Get<float>(), points[i].Get<float>(), TEST_LOCATION);
     }
   }
 
   {
-    Property::Value value = linearConstrainer.GetCurrentProperty( Dali::LinearConstrainer::Property::VALUE );
+    Property::Value  value = linearConstrainer.GetCurrentProperty(Dali::LinearConstrainer::Property::VALUE);
     Property::Array* array = value.GetArray();
-    DALI_TEST_CHECK( array );
+    DALI_TEST_CHECK(array);
 
     const unsigned int noOfPoints = points.Size();
-    for( unsigned int i = 0; i < noOfPoints; ++i )
+    for(unsigned int i = 0; i < noOfPoints; ++i)
     {
-      DALI_TEST_EQUALS( ( *array )[i].Get< Vector3 >(), points[i].Get< Vector3 >(), TEST_LOCATION );
+      DALI_TEST_EQUALS((*array)[i].Get<Vector3>(), points[i].Get<Vector3>(), TEST_LOCATION);
     }
   }
 
   points[0] = 0.0f;
   points[1] = 0.25f;
   points[2] = 1.0f;
-  linearConstrainer.SetProperty( Dali::LinearConstrainer::Property::PROGRESS, points );
+  linearConstrainer.SetProperty(Dali::LinearConstrainer::Property::PROGRESS, points);
 
   {
-    Property::Value value = linearConstrainer.GetProperty( Dali::LinearConstrainer::Property::PROGRESS );
+    Property::Value  value = linearConstrainer.GetProperty(Dali::LinearConstrainer::Property::PROGRESS);
     Property::Array* array = value.GetArray();
-    DALI_TEST_CHECK( array );
+    DALI_TEST_CHECK(array);
 
     const unsigned int noOfPoints = points.Size();
-    for( unsigned int i = 0; i < noOfPoints; ++i )
+    for(unsigned int i = 0; i < noOfPoints; ++i)
     {
-      DALI_TEST_EQUALS( ( *array )[i].Get< float >(), points[i].Get< float >(), TEST_LOCATION );
+      DALI_TEST_EQUALS((*array)[i].Get<float>(), points[i].Get<float>(), TEST_LOCATION);
     }
   }
 
   {
-    Property::Value value = linearConstrainer.GetCurrentProperty( Dali::LinearConstrainer::Property::PROGRESS );
+    Property::Value  value = linearConstrainer.GetCurrentProperty(Dali::LinearConstrainer::Property::PROGRESS);
     Property::Array* array = value.GetArray();
-    DALI_TEST_CHECK( array );
+    DALI_TEST_CHECK(array);
 
     const unsigned int noOfPoints = points.Size();
-    for( unsigned int i = 0; i < noOfPoints; ++i )
+    for(unsigned int i = 0; i < noOfPoints; ++i)
     {
-      DALI_TEST_EQUALS( ( *array )[i].Get< float >(), points[i].Get< float >(), TEST_LOCATION );
+      DALI_TEST_EQUALS((*array)[i].Get<float>(), points[i].Get<float>(), TEST_LOCATION);
     }
   }
 
@@ -760,24 +753,24 @@ int UtcDaliLinearConstrainerDetectorRegisterProperty(void)
 
   Dali::LinearConstrainer constrainer = Dali::LinearConstrainer::New();
 
-  Property::Index index = constrainer.RegisterProperty( "sceneProperty", 0 );
-  DALI_TEST_EQUALS( index, (Property::Index)PROPERTY_CUSTOM_START_INDEX, TEST_LOCATION );
-  DALI_TEST_EQUALS( constrainer.GetProperty< int32_t >( index ), 0, TEST_LOCATION );
+  Property::Index index = constrainer.RegisterProperty("sceneProperty", 0);
+  DALI_TEST_EQUALS(index, (Property::Index)PROPERTY_CUSTOM_START_INDEX, TEST_LOCATION);
+  DALI_TEST_EQUALS(constrainer.GetProperty<int32_t>(index), 0, TEST_LOCATION);
 
-  constrainer.SetProperty( index, -123 );
-  DALI_TEST_EQUALS( constrainer.GetProperty< int32_t >( index ), -123, TEST_LOCATION );
+  constrainer.SetProperty(index, -123);
+  DALI_TEST_EQUALS(constrainer.GetProperty<int32_t>(index), -123, TEST_LOCATION);
 
   using Dali::Animation;
-  Animation animation = Animation::New( 1.0f );
-  animation.AnimateTo( Property( constrainer, index ), 99 );
+  Animation animation = Animation::New(1.0f);
+  animation.AnimateTo(Property(constrainer, index), 99);
 
-  DALI_TEST_EQUALS( constrainer.GetProperty< int32_t >( index ), -123, TEST_LOCATION );
+  DALI_TEST_EQUALS(constrainer.GetProperty<int32_t>(index), -123, TEST_LOCATION);
   // Start the animation
   animation.Play();
 
   application.SendNotification();
-  application.Render( 1000 /* 100% progress */);
-  DALI_TEST_EQUALS( constrainer.GetProperty< int32_t >( index ), 99, TEST_LOCATION );
+  application.Render(1000 /* 100% progress */);
+  DALI_TEST_EQUALS(constrainer.GetProperty<int32_t>(index), 99, TEST_LOCATION);
 
   END_TEST;
 }
@@ -788,40 +781,40 @@ int UtcDaliPathConstrainerDetectorRegisterProperty(void)
 
   Dali::PathConstrainer constrainer = Dali::PathConstrainer::New();
 
-  Property::Index index = constrainer.RegisterProperty( "pathProperty", Vector2() );
-  DALI_TEST_EQUALS( index, (Property::Index)PROPERTY_CUSTOM_START_INDEX, TEST_LOCATION );
-  DALI_TEST_EQUALS( constrainer.GetProperty< Vector2 >( index ), Vector2(), TEST_LOCATION );
+  Property::Index index = constrainer.RegisterProperty("pathProperty", Vector2());
+  DALI_TEST_EQUALS(index, (Property::Index)PROPERTY_CUSTOM_START_INDEX, TEST_LOCATION);
+  DALI_TEST_EQUALS(constrainer.GetProperty<Vector2>(index), Vector2(), TEST_LOCATION);
 
-  constrainer.SetProperty( index, Vector2(1,2) );
-  DALI_TEST_EQUALS( constrainer.GetProperty< Vector2 >( index ), Vector2(1,2), TEST_LOCATION );
+  constrainer.SetProperty(index, Vector2(1, 2));
+  DALI_TEST_EQUALS(constrainer.GetProperty<Vector2>(index), Vector2(1, 2), TEST_LOCATION);
 
   using Dali::Animation;
-  Animation animation = Animation::New( 1.0f );
-  animation.AnimateTo( Property( constrainer, index ), Vector2(3,4) );
+  Animation animation = Animation::New(1.0f);
+  animation.AnimateTo(Property(constrainer, index), Vector2(3, 4));
 
-  DALI_TEST_EQUALS( constrainer.GetProperty< Vector2 >( index ), Vector2(1,2), TEST_LOCATION );
+  DALI_TEST_EQUALS(constrainer.GetProperty<Vector2>(index), Vector2(1, 2), TEST_LOCATION);
   // Start the animation
   animation.Play();
 
   application.SendNotification();
-  application.Render( 1000 /* 100% progress */);
-  DALI_TEST_EQUALS( constrainer.GetProperty< Vector2 >( index ), Vector2(3,4), TEST_LOCATION );
+  application.Render(1000 /* 100% progress */);
+  DALI_TEST_EQUALS(constrainer.GetProperty<Vector2>(index), Vector2(3, 4), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliLinearConstrainerApplyNegative(void)
 {
-  TestApplication application;
+  TestApplication         application;
   Dali::LinearConstrainer instance;
-  Dali::Actor actor;
+  Dali::Actor             actor;
   try
   {
     Dali::Property arg1(actor, Dali::Actor::Property::POSITION);
     Dali::Property arg2(actor, Dali::Actor::Property::POSITION);
-    Dali::Vector2 arg3;
-    Dali::Vector2 arg4;
-    instance.Apply(arg1,arg2,arg3,arg4);
+    Dali::Vector2  arg3;
+    Dali::Vector2  arg4;
+    instance.Apply(arg1, arg2, arg3, arg4);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -833,7 +826,7 @@ int UtcDaliLinearConstrainerApplyNegative(void)
 
 int UtcDaliLinearConstrainerRemoveNegative(void)
 {
-  TestApplication application;
+  TestApplication         application;
   Dali::LinearConstrainer instance;
   try
   {