X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-PropertyValue.cpp;h=a3f829275aa238f58cc631c350df4fef3f22828a;hb=24cf3ec005ffb58f751fe8f1ff41beb52128917d;hp=99abb22094e88e9f8ee9f0d406ab2d2535b91273;hpb=f1d8fa20883c2b012f23c9a60b262fd8274567b8;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/automated-tests/src/dali/utc-Dali-PropertyValue.cpp b/automated-tests/src/dali/utc-Dali-PropertyValue.cpp
index 99abb22..a3f8292 100644
--- a/automated-tests/src/dali/utc-Dali-PropertyValue.cpp
+++ b/automated-tests/src/dali/utc-Dali-PropertyValue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,24 +15,24 @@
  *
  */
 
-#include <iostream>
-#include <iomanip>
-#include <stdlib.h>
-#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
+#include <dali/public-api/dali-core.h>
+#include <stdlib.h>
+
+#include <iomanip>
+#include <iostream>
 
 using namespace Dali;
 
 namespace
 {
-
-template <typename T>
+template<typename T>
 struct CheckCopyCtorP
 {
   CheckCopyCtorP(Property::Value value)
   {
-    Property::Value copy( value );
-    DALI_TEST_CHECK( value.Get<T>() == copy.Get<T>() );
+    Property::Value copy(value);
+    DALI_TEST_CHECK(value.Get<T>() == copy.Get<T>());
   }
 };
 
@@ -48,21 +48,20 @@ void utc_dali_property_value_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 int UtcDaliPropertyValueConstructorsNoneP(void)
 {
   Property::Value value;
 
-  DALI_TEST_CHECK( value.GetType() == Property::NONE );
+  DALI_TEST_CHECK(value.GetType() == Property::NONE);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsNoneTypeP(void)
 {
-  Property::Value value( Property::NONE );
+  Property::Value value(Property::NONE);
 
-  DALI_TEST_CHECK( value.GetType() == Property::NONE );
+  DALI_TEST_CHECK(value.GetType() == Property::NONE);
 
   END_TEST;
 }
@@ -71,8 +70,8 @@ int UtcDaliPropertyValueConstructorsBoolP(void)
 {
   Property::Value value(true);
 
-  DALI_TEST_CHECK( value.GetType() == Property::BOOLEAN );
-  DALI_TEST_CHECK( value.Get<bool>() == true );
+  DALI_TEST_CHECK(value.GetType() == Property::BOOLEAN);
+  DALI_TEST_CHECK(value.Get<bool>() == true);
 
   END_TEST;
 }
@@ -81,8 +80,8 @@ int UtcDaliPropertyValueConstructorBoolTypeP(void)
 {
   Property::Value value(Property::BOOLEAN);
 
-  DALI_TEST_CHECK( value.GetType() == Property::BOOLEAN );
-  DALI_TEST_CHECK( value.Get<bool>() == false );
+  DALI_TEST_CHECK(value.GetType() == Property::BOOLEAN);
+  DALI_TEST_CHECK(value.Get<bool>() == false);
 
   END_TEST;
 }
@@ -91,8 +90,8 @@ int UtcDaliPropertyValueConstructorsFloatP(void)
 {
   Property::Value value(2.f);
 
-  DALI_TEST_CHECK( value.GetType() == Property::FLOAT );
-  DALI_TEST_CHECK( value.Get<float>() == 2.f );
+  DALI_TEST_CHECK(value.GetType() == Property::FLOAT);
+  DALI_TEST_CHECK(value.Get<float>() == 2.f);
 
   END_TEST;
 }
@@ -101,8 +100,8 @@ int UtcDaliPropertyValueConstructorsFloatTypeP(void)
 {
   Property::Value value(Property::FLOAT);
 
-  DALI_TEST_CHECK( value.GetType() == Property::FLOAT );
-  DALI_TEST_CHECK( value.Get<float>() == 0.f );
+  DALI_TEST_CHECK(value.GetType() == Property::FLOAT);
+  DALI_TEST_CHECK(value.Get<float>() == 0.f);
 
   END_TEST;
 }
@@ -111,8 +110,8 @@ int UtcDaliPropertyValueConstructorsIntP(void)
 {
   Property::Value value(1);
 
-  DALI_TEST_CHECK( value.GetType() == Property::INTEGER );
-  DALI_TEST_CHECK( value.Get<int>() == 1 );
+  DALI_TEST_CHECK(value.GetType() == Property::INTEGER);
+  DALI_TEST_CHECK(value.Get<int>() == 1);
 
   END_TEST;
 }
@@ -121,192 +120,192 @@ int UtcDaliPropertyValueConstructorsIntTypeP(void)
 {
   Property::Value value(Property::INTEGER);
 
-  DALI_TEST_CHECK( value.GetType() == Property::INTEGER );
-  DALI_TEST_CHECK( value.Get<int>() == 0 );
+  DALI_TEST_CHECK(value.GetType() == Property::INTEGER);
+  DALI_TEST_CHECK(value.Get<int>() == 0);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsVector2P(void)
 {
-  Vector2 v(1,1);
+  Vector2         v(1, 1);
   Property::Value value(v);
 
-  DALI_TEST_CHECK( value.GetType() == Property::VECTOR2 );
-  DALI_TEST_CHECK( value.Get<Vector2>() == v );
+  DALI_TEST_CHECK(value.GetType() == Property::VECTOR2);
+  DALI_TEST_CHECK(value.Get<Vector2>() == v);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsVector2TypeP(void)
 {
-  Property::Value value( Property::VECTOR2 );
+  Property::Value value(Property::VECTOR2);
 
-  DALI_TEST_CHECK( value.GetType() == Property::VECTOR2 );
-  DALI_TEST_CHECK( value.Get<Vector2>() == Vector2::ZERO );
+  DALI_TEST_CHECK(value.GetType() == Property::VECTOR2);
+  DALI_TEST_CHECK(value.Get<Vector2>() == Vector2::ZERO);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsVector3P(void)
 {
-  Vector3 v(1.f,2.f,3.f);
+  Vector3         v(1.f, 2.f, 3.f);
   Property::Value value(v);
 
-  DALI_TEST_CHECK( value.GetType() == Property::VECTOR3 );
-  DALI_TEST_CHECK( value.Get<Vector3>() == v );
+  DALI_TEST_CHECK(value.GetType() == Property::VECTOR3);
+  DALI_TEST_CHECK(value.Get<Vector3>() == v);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsVector3TypeP(void)
 {
-  Property::Value value( Property::VECTOR3 );
+  Property::Value value(Property::VECTOR3);
 
-  DALI_TEST_CHECK( value.GetType() == Property::VECTOR3 );
-  DALI_TEST_CHECK( value.Get<Vector3>() == Vector3() );
+  DALI_TEST_CHECK(value.GetType() == Property::VECTOR3);
+  DALI_TEST_CHECK(value.Get<Vector3>() == Vector3());
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsVector4P(void)
 {
-  Vector4 v(1.f,1.f,1.f,0.9f);
+  Vector4         v(1.f, 1.f, 1.f, 0.9f);
   Property::Value value(v);
 
-  DALI_TEST_CHECK( value.GetType() == Property::VECTOR4 );
-  DALI_TEST_CHECK( value.Get<Vector4>() == v );
+  DALI_TEST_CHECK(value.GetType() == Property::VECTOR4);
+  DALI_TEST_CHECK(value.Get<Vector4>() == v);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsVector4TypeP(void)
 {
-  Property::Value value( Property::VECTOR4 );
+  Property::Value value(Property::VECTOR4);
 
-  DALI_TEST_CHECK( value.GetType() == Property::VECTOR4 );
-  DALI_TEST_CHECK( value.Get<Vector4>() == Vector4() );
+  DALI_TEST_CHECK(value.GetType() == Property::VECTOR4);
+  DALI_TEST_CHECK(value.Get<Vector4>() == Vector4());
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsMatrix3P(void)
 {
-  Matrix3 v(1.0,1.0,1.0, 1.0,1.0,1.0, 1.0,1.0,1.0);
+  Matrix3         v(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0);
   Property::Value value(v);
 
-  DALI_TEST_CHECK( value.GetType() == Property::MATRIX3 );
-  DALI_TEST_CHECK( value.Get<Matrix3>() == v );
+  DALI_TEST_CHECK(value.GetType() == Property::MATRIX3);
+  DALI_TEST_CHECK(value.Get<Matrix3>() == v);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsMatrix3TypeP(void)
 {
-  Property::Value value( Property::MATRIX3 );
+  Property::Value value(Property::MATRIX3);
 
-  DALI_TEST_CHECK( value.GetType() == Property::MATRIX3 );
-  DALI_TEST_CHECK( value.Get<Matrix3>() == Matrix3() );
+  DALI_TEST_CHECK(value.GetType() == Property::MATRIX3);
+  DALI_TEST_CHECK(value.Get<Matrix3>() == Matrix3());
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsMatrixP(void)
 {
-  float a[] = {1.0,1.0,1.0,1.0, 1.0,1.0,1.0,1.0, 1.0,1.0,1.0,1.0, 1.0,1.0,1.0,1.0};
-  Matrix v(a);
+  float           a[] = {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0};
+  Matrix          v(a);
   Property::Value value(v);
 
-  DALI_TEST_CHECK( value.GetType() == Property::MATRIX );
-  DALI_TEST_CHECK( value.Get<Matrix>() == v );
+  DALI_TEST_CHECK(value.GetType() == Property::MATRIX);
+  DALI_TEST_CHECK(value.Get<Matrix>() == v);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsMatrixTypeP(void)
 {
-  Property::Value value( Property::MATRIX );
+  Property::Value value(Property::MATRIX);
 
-  DALI_TEST_CHECK( value.GetType() == Property::MATRIX );
-  DALI_TEST_CHECK( value.Get<Matrix>() == Matrix() );
+  DALI_TEST_CHECK(value.GetType() == Property::MATRIX);
+  DALI_TEST_CHECK(value.Get<Matrix>() == Matrix());
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsRectP(void)
 {
-  Rect<int> v(1.0,1.0,1.0,1.0);
+  Rect<int>       v(1.0, 1.0, 1.0, 1.0);
   Property::Value value(v);
 
-  DALI_TEST_EQUALS( value.GetType(), Property::RECTANGLE, TEST_LOCATION );
-  DALI_TEST_CHECK( value.Get<Rect<int> >() == v );
+  DALI_TEST_EQUALS(value.GetType(), Property::RECTANGLE, TEST_LOCATION);
+  DALI_TEST_CHECK(value.Get<Rect<int> >() == v);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsRectTypeP(void)
 {
-  Property::Value value( Property::RECTANGLE );
+  Property::Value value(Property::RECTANGLE);
 
-  DALI_TEST_CHECK( value.GetType() == Property::RECTANGLE );
-  DALI_TEST_CHECK( value.Get<Rect<int> >() == Rect<int>(0,0,0,0) );
+  DALI_TEST_CHECK(value.GetType() == Property::RECTANGLE);
+  DALI_TEST_CHECK(value.Get<Rect<int> >() == Rect<int>(0, 0, 0, 0));
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsAngleAxisP(void)
 {
-  AngleAxis input( Dali::ANGLE_90, Vector3::XAXIS );
-  Property::Value value( input );
+  AngleAxis       input(Dali::ANGLE_90, Vector3::XAXIS);
+  Property::Value value(input);
 
-  DALI_TEST_CHECK( value.GetType() == Property::ROTATION );
+  DALI_TEST_CHECK(value.GetType() == Property::ROTATION);
   AngleAxis result = value.Get<AngleAxis>();
-  DALI_TEST_EQUALS( result.angle, input.angle, TEST_LOCATION );
-  DALI_TEST_EQUALS( result.axis, input.axis, TEST_LOCATION );
+  DALI_TEST_EQUALS(result.angle, input.angle, TEST_LOCATION);
+  DALI_TEST_EQUALS(result.axis, input.axis, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsQuaternionP(void)
 {
-  Quaternion v( Radian( Math::PI ), Vector3::ZAXIS );
+  Quaternion      v(Radian(Math::PI), Vector3::ZAXIS);
   Property::Value value(v);
 
-  DALI_TEST_CHECK( value.GetType() == Property::ROTATION );
-  DALI_TEST_EQUALS( v, value.Get<Quaternion>(), 0.001, TEST_LOCATION);
+  DALI_TEST_CHECK(value.GetType() == Property::ROTATION);
+  DALI_TEST_EQUALS(v, value.Get<Quaternion>(), 0.001, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsRotationTypeP(void)
 {
-  Property::Value value( Property::ROTATION );
+  Property::Value value(Property::ROTATION);
 
-  DALI_TEST_CHECK( value.GetType() == Property::ROTATION );
+  DALI_TEST_CHECK(value.GetType() == Property::ROTATION);
   AngleAxis result = value.Get<AngleAxis>();
-  DALI_TEST_EQUALS( result.angle, Radian(0.f), TEST_LOCATION );
-  DALI_TEST_EQUALS( result.axis, Vector3::ZERO, TEST_LOCATION ); // identity quaternion returns a zero angle-axis
+  DALI_TEST_EQUALS(result.angle, Radian(0.f), TEST_LOCATION);
+  DALI_TEST_EQUALS(result.axis, Vector3::ZERO, TEST_LOCATION); // identity quaternion returns a zero angle-axis
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsStringP(void)
 {
-  std::string v("1");
+  std::string     v("1");
   Property::Value value(v);
 
-  DALI_TEST_CHECK( value.GetType() == Property::STRING );
-  DALI_TEST_CHECK( value.Get<std::string>() == v );
+  DALI_TEST_CHECK(value.GetType() == Property::STRING);
+  DALI_TEST_CHECK(value.Get<std::string>() == v);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsStringTypeP(void)
 {
-  Property::Value value( Property::STRING );
+  Property::Value value(Property::STRING);
 
-  DALI_TEST_CHECK( value.GetType() == Property::STRING );
-  DALI_TEST_CHECK( value.Get<std::string>() == std::string() );
+  DALI_TEST_CHECK(value.GetType() == Property::STRING);
+  DALI_TEST_CHECK(value.Get<std::string>() == std::string());
 
   END_TEST;
 }
@@ -314,10 +313,10 @@ int UtcDaliPropertyValueConstructorsStringTypeP(void)
 int UtcDaliPropertyValueConstructorsArrayP(void)
 {
   Property::Array foo;
-  Property::Value value( foo );
+  Property::Value value(foo);
 
-  DALI_TEST_CHECK( value.GetType() == Property::ARRAY );
-  DALI_TEST_CHECK( value.Get<Property::Array>().Count() == 0 );
+  DALI_TEST_CHECK(value.GetType() == Property::ARRAY);
+  DALI_TEST_CHECK(value.Get<Property::Array>().Count() == 0);
 
   END_TEST;
 }
@@ -325,11 +324,11 @@ int UtcDaliPropertyValueConstructorsArrayP(void)
 int UtcDaliPropertyValueConstructorsArray2P(void)
 {
   Property::Array foo;
-  foo.PushBack( Property::Value() );
-  Property::Value value( foo );
+  foo.PushBack(Property::Value());
+  Property::Value value(foo);
 
-  DALI_TEST_CHECK( value.GetType() == Property::ARRAY );
-  DALI_TEST_CHECK( value.Get<Property::Array>().Count() == 1 );
+  DALI_TEST_CHECK(value.GetType() == Property::ARRAY);
+  DALI_TEST_CHECK(value.Get<Property::Array>().Count() == 1);
 
   END_TEST;
 }
@@ -338,19 +337,19 @@ int UtcDaliPropertyValueConstructorsArrayTypeP(void)
 {
   Property::Value value(Property::ARRAY);
 
-  DALI_TEST_CHECK( value.GetType() == Property::ARRAY );
-  DALI_TEST_CHECK( value.Get<Property::Array>().Count() == 0 );
+  DALI_TEST_CHECK(value.GetType() == Property::ARRAY);
+  DALI_TEST_CHECK(value.Get<Property::Array>().Count() == 0);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueConstructorsMapP(void)
 {
-  Property::Map map;
-  Property::Value value( map );
+  Property::Map   map;
+  Property::Value value(map);
 
-  DALI_TEST_CHECK( value.GetType() == Property::MAP );
-  DALI_TEST_CHECK( value.Get<Property::Map>().Count() == 0 );
+  DALI_TEST_CHECK(value.GetType() == Property::MAP);
+  DALI_TEST_CHECK(value.Get<Property::Map>().Count() == 0);
 
   END_TEST;
 }
@@ -358,11 +357,11 @@ int UtcDaliPropertyValueConstructorsMapP(void)
 int UtcDaliPropertyValueConstructorsMap2P(void)
 {
   Property::Map map;
-  map.Insert( "", "" );
-  Property::Value value( map );
+  map.Insert("", "");
+  Property::Value value(map);
 
-  DALI_TEST_CHECK( value.GetType() == Property::MAP );
-  DALI_TEST_CHECK( value.Get<Property::Map>().Count() == 1 );
+  DALI_TEST_CHECK(value.GetType() == Property::MAP);
+  DALI_TEST_CHECK(value.Get<Property::Map>().Count() == 1);
 
   END_TEST;
 }
@@ -371,8 +370,28 @@ int UtcDaliPropertyValueConstructorsMapTypeP(void)
 {
   Property::Value value(Property::MAP);
 
-  DALI_TEST_CHECK( value.GetType() == Property::MAP );
-  DALI_TEST_CHECK( value.Get<Property::Map>().Count() == 0 );
+  DALI_TEST_CHECK(value.GetType() == Property::MAP);
+  DALI_TEST_CHECK(value.Get<Property::Map>().Count() == 0);
+
+  END_TEST;
+}
+
+int UtcDaliPropertyValueConstructorsExtentsTypeP(void)
+{
+  Property::Value value(Property::EXTENTS);
+
+  DALI_TEST_CHECK(value.GetType() == Property::EXTENTS);
+  DALI_TEST_CHECK(value.Get<Extents>() == Extents(0u, 0u, 0u, 0u));
+
+  END_TEST;
+}
+
+int UtcDaliPropertyValueConstructorsExtentsType2P(void)
+{
+  Property::Value value(Property::VECTOR4);
+
+  DALI_TEST_CHECK(value.GetType() == Property::VECTOR4);
+  DALI_TEST_CHECK(value.Get<Extents>() == Extents(0u, 0u, 0u, 0u));
 
   END_TEST;
 }
@@ -380,10 +399,10 @@ int UtcDaliPropertyValueConstructorsMapTypeP(void)
 int UtcDaliPropertyValueCopyConstructorP(void)
 {
   Property::Value value;
-  Property::Value value2( value );
-  DALI_TEST_EQUALS( value.GetType(), value2.GetType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( value.GetMap(), value2.GetMap(), TEST_LOCATION );
-  DALI_TEST_EQUALS( value.GetArray(), value2.GetArray(), TEST_LOCATION );
+  Property::Value value2(value);
+  DALI_TEST_EQUALS(value.GetType(), value2.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(value.GetMap(), value2.GetMap(), TEST_LOCATION);
+  DALI_TEST_EQUALS(value.GetArray(), value2.GetArray(), TEST_LOCATION);
   END_TEST;
 }
 
@@ -407,25 +426,25 @@ int UtcDaliPropertyValueCopyConstructorIntP(void)
 
 int UtcDaliPropertyValueCopyConstructoVector2P(void)
 {
-  CheckCopyCtorP<Vector2> check( Vector2(2,1) );
+  CheckCopyCtorP<Vector2> check(Vector2(2, 1));
   END_TEST;
 }
 
 int UtcDaliPropertyValueCopyConstructorVector3P(void)
 {
-  CheckCopyCtorP<Vector3> check( Vector3(3.f,2.f,1.f) );
+  CheckCopyCtorP<Vector3> check(Vector3(3.f, 2.f, 1.f));
   END_TEST;
 }
 
 int UtcDaliPropertyValueCopyConstructorVector4P(void)
 {
-  CheckCopyCtorP<Vector3> check( Vector4(4.f,3.f,2.f,1.f) );
+  CheckCopyCtorP<Vector3> check(Vector4(4.f, 3.f, 2.f, 1.f));
   END_TEST;
 }
 
 int UtcDaliPropertyValueCopyConstructorMatrix3P(void)
 {
-  CheckCopyCtorP<Matrix3> check( Matrix3::IDENTITY );
+  CheckCopyCtorP<Matrix3> check(Matrix3::IDENTITY);
   END_TEST;
 }
 
@@ -437,37 +456,60 @@ int UtcDaliPropertyValueCopyConstructorMatrixP(void)
 
 int UtcDaliPropertyValueCopyConstructorRectP(void)
 {
-  CheckCopyCtorP<Rect<int> > check( Rect<int>(1.0,1.0,1.0,1.0) );
+  CheckCopyCtorP<Rect<int> > check(Rect<int>(1.0, 1.0, 1.0, 1.0));
   END_TEST;
 }
 
 int UtcDaliPropertyValueCopyConstructorAngleAxisP(void)
 {
-  CheckCopyCtorP<AngleAxis> check( AngleAxis(Degree(1.0), Vector3(1.0,1.0,1.0)) );
+  CheckCopyCtorP<AngleAxis> check(AngleAxis(Degree(1.0), Vector3(1.0, 1.0, 1.0)));
   END_TEST;
 }
 
 int UtcDaliPropertyValueCopyConstructorQuaternionP(void)
 {
-  CheckCopyCtorP<Quaternion> check( Quaternion( Vector4(1.0, 1.0, 1.0, 1.0) ) );
+  CheckCopyCtorP<Quaternion> check(Quaternion(Vector4(1.0, 1.0, 1.0, 1.0)));
   END_TEST;
 }
 
 int UtcDaliPropertyValueCopyConstructorStringP(void)
 {
-  CheckCopyCtorP<std::string> check( std::string("1") );
+  CheckCopyCtorP<std::string> check(std::string("1"));
+  END_TEST;
+}
+
+int UtcDaliPropertyValueCopyAssignStringDifferentTypeP(void)
+{
+  Property::Value value1{Vector4(3.f, 2.f, 1.f, 2.0f)};
+  Property::Value value2{"very very long string ..................."};
+  value2 = value1;
+
+  Vector4 vec1, vec2;
+  value1.Get(vec1);
+  value2.Get(vec2);
+  DALI_TEST_EQUALS(value1.GetType(), value2.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1, vec2, TEST_LOCATION);
+
+  Property::Value value3{Vector4(3.f, 2.f, 1.f, 2.0f)};
+  Property::Value value4{"very very long string ..................."};
+
+  value3 = value4;
+
+  DALI_TEST_EQUALS(value3.GetType(), value4.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(value3.Get<std::string>(), "very very long string ...................", TEST_LOCATION);
+  DALI_TEST_EQUALS(value3.Get<std::string>(), value4.Get<std::string>(), TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueCopyConstructorArrayP(void)
 {
-  Property::Value value1(Property::ARRAY);
-  Property::Array* array= value1.GetArray();
+  Property::Value  value1(Property::ARRAY);
+  Property::Array* array = value1.GetArray();
   array->PushBack(Property::Value(1));
 
-  Property::Value value2( value1 );
-  DALI_TEST_EQUALS( value1.GetType(), value2.GetType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( value1.GetArray()->Count(), value2.GetArray()->Count(), TEST_LOCATION );
+  Property::Value value2(value1);
+  DALI_TEST_EQUALS(value1.GetType(), value2.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(value1.GetArray()->Count(), value2.GetArray()->Count(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -475,25 +517,80 @@ int UtcDaliPropertyValueCopyConstructorArrayP(void)
 int UtcDaliPropertyValueCopyConstructorMapP(void)
 {
   Property::Value value1(Property::MAP);
-  Property::Map* map = value1.GetMap();
-  (*map)["1"] = Property::Value(1);
+  Property::Map*  map = value1.GetMap();
+  (*map)["1"]         = Property::Value(1);
+
+  Property::Value value2(value1);
+  DALI_TEST_EQUALS(value1.GetType(), value2.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(value1.GetMap()->Count(), value2.GetMap()->Count(), TEST_LOCATION);
+  DALI_TEST_EQUALS(value1.GetMap()->GetKey(0), value2.GetMap()->GetKey(0), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPropertyValueMoveConstructor(void)
+{
+  Property::Value value1(Vector4::ONE);
+  DALI_TEST_EQUALS(Property::VECTOR4, value1.GetType(), TEST_LOCATION);
+
+  Vector4 valueVector;
+  DALI_TEST_EQUALS(true, value1.Get(valueVector), TEST_LOCATION); // Able to convert
+  DALI_TEST_EQUALS(valueVector, Vector4::ONE, TEST_LOCATION);
+
+  Property::Value value2(std::move(value1));
+  DALI_TEST_EQUALS(Property::NONE, value1.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value1.Get(valueVector), TEST_LOCATION); // Unable to convert, but no crash either
+  DALI_TEST_EQUALS(Property::VECTOR4, value2.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value2.Get(valueVector), TEST_LOCATION); // Able to convert
+  DALI_TEST_EQUALS(valueVector, Vector4::ONE, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliPropertyValueMoveConstructorArray(void)
+{
+  Property::Array array;
+  array.PushBack(1);
+  array.PushBack(2);
+  array.PushBack(3);
+  DALI_TEST_EQUALS(3u, array.Size(), TEST_LOCATION);
+
+  Property::Value value(std::move(array));
+  DALI_TEST_ASSERTION(array.Size(), "Cannot use an object previously used as an r-value"); // Our local variable should become invalid
+
+  Property::Array* arrayPtr = value.GetArray();
+  DALI_TEST_CHECK(arrayPtr);
+  DALI_TEST_EQUALS(3u, arrayPtr->Size(), TEST_LOCATION);
+
+  END_TEST;
+}
 
-  Property::Value value2( value1 );
-  DALI_TEST_EQUALS( value1.GetType(), value2.GetType(), TEST_LOCATION );
-  DALI_TEST_EQUALS( value1.GetMap()->Count(), value2.GetMap()->Count(), TEST_LOCATION );
-  DALI_TEST_EQUALS( value1.GetMap()->GetKey( 0 ), value2.GetMap()->GetKey( 0 ), TEST_LOCATION );
+int UtcDaliPropertyValueMoveConstructorMap(void)
+{
+  Property::Map map;
+  map[1] = 1;
+  map[2] = 2;
+  map[3] = 3;
+  DALI_TEST_EQUALS(3u, map.Count(), TEST_LOCATION);
+
+  Property::Value value(std::move(map));
+  DALI_TEST_ASSERTION(map.Count(), "Cannot use an object previously used as an r-value"); // Our local variable should become invalid
+
+  Property::Map* mapPtr = value.GetMap();
+  DALI_TEST_CHECK(mapPtr);
+  DALI_TEST_EQUALS(3u, mapPtr->Count(), TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliPropertyValueAssignmentSelfP(void)
 {
-  Property::Value value;
+  Property::Value  value;
   Property::Value* self = &value;
-  value = *self;
-  DALI_TEST_EQUALS( value.GetType(), Property::NONE, TEST_LOCATION );
-  DALI_TEST_CHECK( value.GetMap() == NULL );
-  DALI_TEST_CHECK( value.GetArray() == NULL );
+  value                 = *self;
+  DALI_TEST_EQUALS(value.GetType(), Property::NONE, TEST_LOCATION);
+  DALI_TEST_CHECK(value.GetMap() == NULL);
+  DALI_TEST_CHECK(value.GetArray() == NULL);
   END_TEST;
 }
 
@@ -501,10 +598,10 @@ int UtcDaliPropertyValueAssignmentOperatorNoneP(void)
 {
   Property::Value value;
   value = Property::Value(); // type match
-  DALI_TEST_EQUALS( value.GetType(), Property::NONE, TEST_LOCATION );
-  Property::Value copy( false );
+  DALI_TEST_EQUALS(value.GetType(), Property::NONE, TEST_LOCATION);
+  Property::Value copy(false);
   copy = value; // type mismatch
-  DALI_TEST_EQUALS( value.GetType(), Property::NONE, TEST_LOCATION );
+  DALI_TEST_EQUALS(value.GetType(), Property::NONE, TEST_LOCATION);
   END_TEST;
 }
 
@@ -512,10 +609,10 @@ int UtcDaliPropertyValueAssignmentOperatorBoolP(void)
 {
   Property::Value value;
   value = Property::Value(true); // type mismatch
-  DALI_TEST_CHECK( true == value.Get<bool>() );
-  Property::Value copy( false );
+  DALI_TEST_CHECK(true == value.Get<bool>());
+  Property::Value copy(false);
   copy = value; // type match
-  DALI_TEST_CHECK( true == copy.Get<bool>() );
+  DALI_TEST_CHECK(true == copy.Get<bool>());
   END_TEST;
 }
 
@@ -523,10 +620,10 @@ int UtcDaliPropertyValueAssignmentOperatorIntP(void)
 {
   Property::Value value;
   value = Property::Value(10); // type mismatch
-  DALI_TEST_CHECK( 10 == value.Get<int>() );
-  Property::Value copy( 99 );
+  DALI_TEST_CHECK(10 == value.Get<int>());
+  Property::Value copy(99);
   copy = value; // type match
-  DALI_TEST_CHECK( 10 == copy.Get<int>() );
+  DALI_TEST_CHECK(10 == copy.Get<int>());
   END_TEST;
 }
 
@@ -534,108 +631,107 @@ int UtcDaliPropertyValueAssignmentOperatorFloatP(void)
 {
   Property::Value value;
   value = Property::Value(10.f); // mismatch
-  DALI_TEST_CHECK( Dali::Equals(10.f, value.Get<float>() ) );
+  DALI_TEST_CHECK(Dali::Equals(10.f, value.Get<float>()));
   Property::Value copy(321.f);
   copy = value; // match
-  DALI_TEST_CHECK( Dali::Equals(10.f, copy.Get<float>() ) );
+  DALI_TEST_CHECK(Dali::Equals(10.f, copy.Get<float>()));
   END_TEST;
 }
 
 int UtcDaliPropertyValueAssignmentOperatorVector2P(void)
 {
   Property::Value value;
-  value = Property::Value( Vector2(1,2) ); // mismatch
-  DALI_TEST_CHECK( Vector2(1,2) == value.Get<Vector2>() );
-  Property::Value copy( Property::VECTOR2 );
+  value = Property::Value(Vector2(1, 2)); // mismatch
+  DALI_TEST_CHECK(Vector2(1, 2) == value.Get<Vector2>());
+  Property::Value copy(Property::VECTOR2);
   copy = value; // match
-  DALI_TEST_CHECK( Vector2(1,2) == copy.Get<Vector2>() );
+  DALI_TEST_CHECK(Vector2(1, 2) == copy.Get<Vector2>());
   END_TEST;
 }
 
 int UtcDaliPropertyValueAssignmentOperatorVector3P(void)
 {
   Property::Value value;
-  value = Property::Value( Vector3(1.f,2.f,3.f) ); // mismatch
-  DALI_TEST_CHECK( Vector3(1.f,2.f,3.f) == value.Get<Vector3>() );
-  Property::Value copy( Property::VECTOR3 );
+  value = Property::Value(Vector3(1.f, 2.f, 3.f)); // mismatch
+  DALI_TEST_CHECK(Vector3(1.f, 2.f, 3.f) == value.Get<Vector3>());
+  Property::Value copy(Property::VECTOR3);
   copy = value; // match
-  DALI_TEST_CHECK( Vector3(1.f,2.f,3.f) == copy.Get<Vector3>() );
+  DALI_TEST_CHECK(Vector3(1.f, 2.f, 3.f) == copy.Get<Vector3>());
   END_TEST;
 }
 
 int UtcDaliPropertyValueAssignmentOperatorVector4P(void)
 {
   Property::Value value;
-  value = Property::Value( Vector4(1,2,3,4) ); // mismatch
-  DALI_TEST_CHECK( Vector4(1,2,3,4) == value.Get<Vector4>() );
-  Property::Value copy( Vector4(0,1,2,3) );
+  value = Property::Value(Vector4(1, 2, 3, 4)); // mismatch
+  DALI_TEST_CHECK(Vector4(1, 2, 3, 4) == value.Get<Vector4>());
+  Property::Value copy(Vector4(0, 1, 2, 3));
   copy = value; // match
-  DALI_TEST_CHECK( Vector4(1,2,3,4) == copy.Get<Vector4>() );
+  DALI_TEST_CHECK(Vector4(1, 2, 3, 4) == copy.Get<Vector4>());
   END_TEST;
 }
 
 int UtcDaliPropertyValueAssignmentOperatorMatrix3P(void)
 {
   Property::Value value;
-  value = Property::Value( Matrix3::IDENTITY ); // mismatch
-  DALI_TEST_CHECK( Matrix3::IDENTITY == value.Get<Matrix3>() );
-  Property::Value copy( Property::MATRIX3 );
+  value = Property::Value(Matrix3::IDENTITY); // mismatch
+  DALI_TEST_CHECK(Matrix3::IDENTITY == value.Get<Matrix3>());
+  Property::Value copy(Property::MATRIX3);
   copy = value; // match
-  DALI_TEST_CHECK( Matrix3::IDENTITY == copy.Get<Matrix3>() );
+  DALI_TEST_CHECK(Matrix3::IDENTITY == copy.Get<Matrix3>());
   END_TEST;
 }
 
 int UtcDaliPropertyValueAssignmentOperatorMatrixP(void)
 {
   Property::Value value;
-  value = Property::Value( Matrix::IDENTITY ); // mismatch
-  DALI_TEST_CHECK( Matrix::IDENTITY == value.Get<Matrix>()  );
-  Matrix foo;
-  Property::Value copy( foo );
+  value = Property::Value(Matrix::IDENTITY); // mismatch
+  DALI_TEST_CHECK(Matrix::IDENTITY == value.Get<Matrix>());
+  Matrix          foo;
+  Property::Value copy(foo);
   copy = value; // match
-  DALI_TEST_CHECK( Matrix::IDENTITY == copy.Get<Matrix>()  );
+  DALI_TEST_CHECK(Matrix::IDENTITY == copy.Get<Matrix>());
   END_TEST;
 }
 
 int UtcDaliPropertyValueAssignmentOperatorRectP(void)
 {
-  Property::Value value;
+  Property::Value         value;
   typedef Dali::Rect<int> Rectangle;
-  value = Property::Value( Rectangle(4,3,2,1) ); // mismatch
-  DALI_TEST_CHECK( Rectangle(4,3,2,1) == value.Get<Rectangle>() );
-  Property::Value copy( Property::RECTANGLE );
+  value = Property::Value(Rectangle(4, 3, 2, 1)); // mismatch
+  DALI_TEST_CHECK(Rectangle(4, 3, 2, 1) == value.Get<Rectangle>());
+  Property::Value copy(Property::RECTANGLE);
   copy = value; // match
   Rectangle copyRect;
   copy.Get(copyRect);
-  DALI_TEST_CHECK( Rectangle(4,3,2,1) == copyRect );
+  DALI_TEST_CHECK(Rectangle(4, 3, 2, 1) == copyRect);
   END_TEST;
 }
 
 int UtcDaliPropertyValueAssignmentOperatorQuaternionP(void)
 {
   Property::Value value;
-  Quaternion result( Radian( Math::PI_2 ), Vector3::YAXIS );
-  value = Property::Value( result );
+  Quaternion      result(Radian(Math::PI_2), Vector3::YAXIS);
+  value = Property::Value(result);
 
-  DALI_TEST_EQUALS( value.Get<Quaternion>(), result, 0.001, TEST_LOCATION );
+  DALI_TEST_EQUALS(value.Get<Quaternion>(), result, 0.001, TEST_LOCATION);
 
-  Property::Value copy( Property::ROTATION );
+  Property::Value copy(Property::ROTATION);
   copy = value; // match
-  DALI_TEST_EQUALS( copy.Get<Quaternion>(), result, 0.001, TEST_LOCATION );
+  DALI_TEST_EQUALS(copy.Get<Quaternion>(), result, 0.001, TEST_LOCATION);
   END_TEST;
 }
 
-
 int UtcDaliPropertyValueAssignmentOperatorAngleAxisP(void)
 {
   Property::Value value;
-  value = Property::Value( AngleAxis( Radian(Math::PI_2), Vector3::XAXIS ) ); // mismatch
-  DALI_TEST_EQUALS( value.Get<AngleAxis>().axis, Vector3::XAXIS, TEST_LOCATION );
-  DALI_TEST_EQUALS( value.Get<AngleAxis>().angle, Radian(Math::PI_2), TEST_LOCATION );
-  Property::Value copy( Property::ROTATION );
+  value = Property::Value(AngleAxis(Radian(Math::PI_2), Vector3::XAXIS)); // mismatch
+  DALI_TEST_EQUALS(value.Get<AngleAxis>().axis, Vector3::XAXIS, TEST_LOCATION);
+  DALI_TEST_EQUALS(value.Get<AngleAxis>().angle, Radian(Math::PI_2), TEST_LOCATION);
+  Property::Value copy(Property::ROTATION);
   copy = value; // match
-  DALI_TEST_EQUALS( value.Get<AngleAxis>().axis, copy.Get<AngleAxis>().axis, TEST_LOCATION );
-  DALI_TEST_EQUALS( value.Get<AngleAxis>().angle, copy.Get<AngleAxis>().angle, TEST_LOCATION );
+  DALI_TEST_EQUALS(value.Get<AngleAxis>().axis, copy.Get<AngleAxis>().axis, TEST_LOCATION);
+  DALI_TEST_EQUALS(value.Get<AngleAxis>().angle, copy.Get<AngleAxis>().angle, TEST_LOCATION);
   END_TEST;
 }
 
@@ -643,10 +739,10 @@ int UtcDaliPropertyValueAssignmentOperatorStringP(void)
 {
   Property::Value value;
   value = Property::Value("yes"); // mismatch
-  DALI_TEST_CHECK( "yes" == value.Get<std::string>() );
+  DALI_TEST_CHECK("yes" == value.Get<std::string>());
   Property::Value copy("no");
   copy = value; // match
-  DALI_TEST_CHECK( "yes" == copy.Get<std::string>() );
+  DALI_TEST_CHECK("yes" == copy.Get<std::string>());
   END_TEST;
 }
 
@@ -655,14 +751,14 @@ int UtcDaliPropertyValueAssignmentOperatorArrayP(void)
   Property::Value value;
   value = Property::Value(Property::ARRAY); // mismatch
   value.GetArray()->PushBack(10);
-  DALI_TEST_CHECK( value.GetArray() );
+  DALI_TEST_CHECK(value.GetArray());
   Property::Value copy(Property::ARRAY);
   copy = value; // match
   Property::Array array;
-  copy.Get( array );
+  copy.Get(array);
   int getItem = 0;
-  array[0].Get( getItem );
-  DALI_TEST_CHECK( getItem == 10 );
+  array[0].Get(getItem);
+  DALI_TEST_CHECK(getItem == 10);
   END_TEST;
 }
 
@@ -671,55 +767,100 @@ int UtcDaliPropertyValueAssignmentOperatorMapP(void)
   Property::Value value;
   value = Property::Value(Property::MAP); // mismatch
   value.GetMap()->Insert("key", "value");
-  Property::Value copy( Property::MAP ); // match
+  Property::Value copy(Property::MAP); // match
   copy = value;
   Property::Map map;
-  copy.Get( map );
-  DALI_TEST_CHECK( map.GetKey(0) == "key" );
+  copy.Get(map);
+  DALI_TEST_CHECK(map.GetKey(0) == "key");
+  END_TEST;
+}
+
+int UtcDaliPropertyValueAssignmentOperatorExtentsP(void)
+{
+  Property::Value value;
+  value = Property::Value(Extents(4, 3, 2, 1)); // mismatch
+  DALI_TEST_CHECK(Extents(4, 3, 2, 1) == value.Get<Extents>());
+  Property::Value copy(Property::EXTENTS);
+  copy = value; // match
+  Extents copyExtents;
+  copy.Get(copyExtents);
+  DALI_TEST_CHECK(Extents(4, 3, 2, 1) == copyExtents);
+  END_TEST;
+}
+
+int UtcDaliPropertyValueMoveAssignmentOperator(void)
+{
+  Property::Value value1(Vector4::ONE);
+  DALI_TEST_EQUALS(Property::VECTOR4, value1.GetType(), TEST_LOCATION);
+
+  Vector4 valueVector;
+  DALI_TEST_EQUALS(true, value1.Get(valueVector), TEST_LOCATION); // Able to convert
+  DALI_TEST_EQUALS(valueVector, Vector4::ONE, TEST_LOCATION);
+
+  Property::Value value2;
+  value2 = std::move(value1);
+  DALI_TEST_EQUALS(Property::NONE, value1.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value1.Get(valueVector), TEST_LOCATION); // Unable to convert, but no crash either
+  DALI_TEST_EQUALS(Property::VECTOR4, value2.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value2.Get(valueVector), TEST_LOCATION); // Able to convert
+  DALI_TEST_EQUALS(valueVector, Vector4::ONE, TEST_LOCATION);
+
+  // Change to another value type
+  value2 = std::move(Property::Value(1.0f));
+  DALI_TEST_EQUALS(false, value2.Get(valueVector), TEST_LOCATION); // Should not be able to convert to a Vector4 now
+  float valueFloat;
+  DALI_TEST_EQUALS(true, value2.Get(valueFloat), TEST_LOCATION); // Should be able to convert to a float now
+  DALI_TEST_EQUALS(valueFloat, 1.0f, TEST_LOCATION);
+
+  // Ensure self assignment doesn't do anything silly
+  value2 = std::move(value2);
+  DALI_TEST_EQUALS(true, value2.Get(valueFloat), TEST_LOCATION);
+  DALI_TEST_EQUALS(valueFloat, 1.0f, TEST_LOCATION);
+
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetTypeP(void)
 {
   Property::Value value;
-  DALI_TEST_CHECK( value.GetType() == Property::NONE );
+  DALI_TEST_CHECK(value.GetType() == Property::NONE);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetBoolP(void)
 {
   Property::Value value(true);
-  bool boolean( false );
-  DALI_TEST_CHECK( value.Get( boolean ) == true );
-  DALI_TEST_CHECK( value.Get<bool>() == true );
+  bool            boolean(false);
+  DALI_TEST_CHECK(value.Get(boolean) == true);
+  DALI_TEST_CHECK(value.Get<bool>() == true);
   std::string string;
-  DALI_TEST_CHECK( value.Get( string ) == false );
+  DALI_TEST_CHECK(value.Get(string) == false);
   value = Property::Value(1.f);
-  DALI_TEST_CHECK( value.Get<float>() == 1.f );
+  DALI_TEST_CHECK(value.Get<float>() == 1.f);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetBoolN(void)
 {
   Property::Value value;
-  DALI_TEST_CHECK( value.Get<bool>() == false );
-  bool boolean( false );
-  DALI_TEST_CHECK( value.Get( boolean ) == false );
+  DALI_TEST_CHECK(value.Get<bool>() == false);
+  bool boolean(false);
+  DALI_TEST_CHECK(value.Get(boolean) == false);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetFloatP(void)
 {
   Property::Value value(1.1f);
-  float flow( 0.0f );
-  DALI_TEST_EQUALS( 1.1f, value.Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( flow ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1.1f, flow, TEST_LOCATION );
+  float           flow(0.0f);
+  DALI_TEST_EQUALS(1.1f, value.Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(flow), TEST_LOCATION);
+  DALI_TEST_EQUALS(1.1f, flow, TEST_LOCATION);
 
   Property::Value intValue(100);
-  DALI_TEST_EQUALS( 100.f, intValue.Get<float>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, intValue.Get( flow ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 100.f, flow, TEST_LOCATION );
+  DALI_TEST_EQUALS(100.f, intValue.Get<float>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, intValue.Get(flow), TEST_LOCATION);
+  DALI_TEST_EQUALS(100.f, flow, TEST_LOCATION);
 
   END_TEST;
 }
@@ -727,27 +868,27 @@ int UtcDaliPropertyValueGetFloatP(void)
 int UtcDaliPropertyValueGetFloatN(void)
 {
   Property::Value value;
-  float result( 1.0f );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1.0f, result, TEST_LOCATION ); // result is not modified
-  Property::Value value2( "" );
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1.0f, result, TEST_LOCATION ); // result is not modified
+  float           result(1.0f);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(1.0f, result, TEST_LOCATION); // result is not modified
+  Property::Value value2("");
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(1.0f, result, TEST_LOCATION); // result is not modified
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetIntP(void)
 {
   Property::Value value(123);
-  int result( 10 );
-  DALI_TEST_EQUALS( 123, value.Get<int>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 123, result, TEST_LOCATION );
+  int             result(10);
+  DALI_TEST_EQUALS(123, value.Get<int>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(123, result, TEST_LOCATION);
 
   Property::Value floatValue(21.f);
-  DALI_TEST_EQUALS( 21, floatValue.Get<int>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, floatValue.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 21, result, TEST_LOCATION );
+  DALI_TEST_EQUALS(21, floatValue.Get<int>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, floatValue.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(21, result, TEST_LOCATION);
 
   END_TEST;
 }
@@ -755,243 +896,243 @@ int UtcDaliPropertyValueGetIntP(void)
 int UtcDaliPropertyValueGetIntN(void)
 {
   Property::Value value;
-  int result( 10 );
-  DALI_TEST_EQUALS( 0, value.Get<int>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 10, result, TEST_LOCATION ); // result is not modified
+  int             result(10);
+  DALI_TEST_EQUALS(0, value.Get<int>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(10, result, TEST_LOCATION); // result is not modified
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 10, result, TEST_LOCATION ); // result is not modified
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(10, result, TEST_LOCATION); // result is not modified
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetRectP(void)
 {
-  Property::Value value( Rect<int>(1,2,3,4) );
-  Rect<int> result(4,3,2,1);
-  DALI_TEST_EQUALS( Rect<int>(1,2,3,4), value.Get< Rect<int> >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Rect<int>(1,2,3,4), result, TEST_LOCATION );
+  Property::Value value(Rect<int>(1, 2, 3, 4));
+  Rect<int>       result(4, 3, 2, 1);
+  DALI_TEST_EQUALS(Rect<int>(1, 2, 3, 4), value.Get<Rect<int> >(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Rect<int>(1, 2, 3, 4), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetRectN(void)
 {
   Property::Value value;
-  Rect<int> result(4,3,2,1);
-  DALI_TEST_EQUALS( Rect<int>(0,0,0,0), value.Get< Rect<int> >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Rect<int>(4,3,2,1), result, TEST_LOCATION );
+  Rect<int>       result(4, 3, 2, 1);
+  DALI_TEST_EQUALS(Rect<int>(0, 0, 0, 0), value.Get<Rect<int> >(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Rect<int>(4, 3, 2, 1), result, TEST_LOCATION);
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Rect<int>(4,3,2,1), result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Rect<int>(4, 3, 2, 1), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector2P(void)
 {
-  Property::Value value( Vector2(1.0f,2.0f) );
-  Vector2 result;
-  DALI_TEST_EQUALS( Vector2(1.0f,2.0f), value.Get< Vector2 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(1.0f,2.0f), result, TEST_LOCATION );
+  Property::Value value(Vector2(1.0f, 2.0f));
+  Vector2         result;
+  DALI_TEST_EQUALS(Vector2(1.0f, 2.0f), value.Get<Vector2>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector2(1.0f, 2.0f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector2fromVector3P(void)
 {
-  Property::Value value( Vector3(1.f,2.f,3.f) );
-  Vector2 result;
-  DALI_TEST_EQUALS( Vector2(1.0f,2.0f), value.Get< Vector2 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(1.0f,2.0f), result, TEST_LOCATION );
+  Property::Value value(Vector3(1.f, 2.f, 3.f));
+  Vector2         result;
+  DALI_TEST_EQUALS(Vector2(1.0f, 2.0f), value.Get<Vector2>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector2(1.0f, 2.0f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector2fromVector4P(void)
 {
-  Property::Value value( Vector4(1.f,2.f,3.f,4.f) );
-  Vector2 result;
-  DALI_TEST_EQUALS( Vector2(1.0f,2.0f), value.Get< Vector2 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(1.0f,2.0f), result, TEST_LOCATION );
+  Property::Value value(Vector4(1.f, 2.f, 3.f, 4.f));
+  Vector2         result;
+  DALI_TEST_EQUALS(Vector2(1.0f, 2.0f), value.Get<Vector2>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector2(1.0f, 2.0f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector2N(void)
 {
   Property::Value value;
-  Vector2 result;
-  DALI_TEST_EQUALS( Vector2(0.f,0.f), value.Get< Vector2 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(), result, TEST_LOCATION );
+  Vector2         result;
+  DALI_TEST_EQUALS(Vector2(0.f, 0.f), value.Get<Vector2>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector2(), result, TEST_LOCATION);
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(), result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector2(), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector3P(void)
 {
-  Property::Value value( Vector3(1.0f,2.0f,-1.f) );
-  Vector3 result;
-  DALI_TEST_EQUALS( Vector3(1.0f,2.0f,-1.f), value.Get< Vector3 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector3(1.0f,2.0f,-1.f), result, TEST_LOCATION );
+  Property::Value value(Vector3(1.0f, 2.0f, -1.f));
+  Vector3         result;
+  DALI_TEST_EQUALS(Vector3(1.0f, 2.0f, -1.f), value.Get<Vector3>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3(1.0f, 2.0f, -1.f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector3FromVector2P(void)
 {
-  Property::Value value( Vector2(1.0f,2.0f) );
-  Vector3 result(99.f,88.f,77.f);
-  DALI_TEST_EQUALS( Vector3(1.0f,2.0f,0.f), value.Get< Vector3 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector3(1.0f,2.0f,0.f), result, TEST_LOCATION );
+  Property::Value value(Vector2(1.0f, 2.0f));
+  Vector3         result(99.f, 88.f, 77.f);
+  DALI_TEST_EQUALS(Vector3(1.0f, 2.0f, 0.f), value.Get<Vector3>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3(1.0f, 2.0f, 0.f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector3FromVector4P(void)
 {
-  Property::Value value( Vector4(4.f,3.f,2.f,1.f) );
-  Vector3 result;
-  DALI_TEST_EQUALS( Vector3(4.f,3.f,2.f), value.Get< Vector3 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector3(4.f,3.f,2.f), result, TEST_LOCATION );
+  Property::Value value(Vector4(4.f, 3.f, 2.f, 1.f));
+  Vector3         result;
+  DALI_TEST_EQUALS(Vector3(4.f, 3.f, 2.f), value.Get<Vector3>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3(4.f, 3.f, 2.f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector3N(void)
 {
   Property::Value value;
-  Vector3 result;
-  DALI_TEST_EQUALS( Vector3(0.f,0.f,0.f), value.Get< Vector3 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector3(), result, TEST_LOCATION );
+  Vector3         result;
+  DALI_TEST_EQUALS(Vector3(0.f, 0.f, 0.f), value.Get<Vector3>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3(), result, TEST_LOCATION);
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector3(), result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3(), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector4P(void)
 {
-  Property::Value value( Vector4(1.f,2.f,-1.f,-3.f) );
-  Vector4 result;
-  DALI_TEST_EQUALS( Vector4(1.f,2.f,-1.f,-3.f), value.Get< Vector4 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector4(1.f,2.f,-1.f,-3.f), result, TEST_LOCATION );
+  Property::Value value(Vector4(1.f, 2.f, -1.f, -3.f));
+  Vector4         result;
+  DALI_TEST_EQUALS(Vector4(1.f, 2.f, -1.f, -3.f), value.Get<Vector4>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector4(1.f, 2.f, -1.f, -3.f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector4FromVector2P(void)
 {
-  Property::Value value( Vector2(-1.f,-3.f) );
-  Vector4 result(99.f,88.f,77.f,66.f);
-  DALI_TEST_EQUALS( Vector4(-1.f,-3.f,0.f,0.f), value.Get< Vector4 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector4(-1.f,-3.f,0.f,0.f), result, TEST_LOCATION );
+  Property::Value value(Vector2(-1.f, -3.f));
+  Vector4         result(99.f, 88.f, 77.f, 66.f);
+  DALI_TEST_EQUALS(Vector4(-1.f, -3.f, 0.f, 0.f), value.Get<Vector4>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector4(-1.f, -3.f, 0.f, 0.f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector4FromVector3P(void)
 {
-  Property::Value value( Vector3(1.f,2.f,-1.f) );
-  Vector4 result(99.f,88.f,77.f,66.f);
-  DALI_TEST_EQUALS( Vector4(1.f,2.f,-1.f,0.f), value.Get< Vector4 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector4(1.f,2.f,-1.f,0.f), result, TEST_LOCATION );
+  Property::Value value(Vector3(1.f, 2.f, -1.f));
+  Vector4         result(99.f, 88.f, 77.f, 66.f);
+  DALI_TEST_EQUALS(Vector4(1.f, 2.f, -1.f, 0.f), value.Get<Vector4>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector4(1.f, 2.f, -1.f, 0.f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetVector4N(void)
 {
   Property::Value value;
-  Vector4 result;
-  DALI_TEST_EQUALS( Vector4(0.f,0.f,0.f,0.f), value.Get< Vector4 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector4(), result, TEST_LOCATION );
+  Vector4         result;
+  DALI_TEST_EQUALS(Vector4(0.f, 0.f, 0.f, 0.f), value.Get<Vector4>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector4(), result, TEST_LOCATION);
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector4(), result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector4(), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetMatrix3P(void)
 {
-  Property::Value value( Matrix3(1.f,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f) );
-  Matrix3 result;
-  DALI_TEST_EQUALS( Matrix3(1.f,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f), value.Get< Matrix3 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Matrix3(1.f,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f), result, TEST_LOCATION );
+  Property::Value value(Matrix3(1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f));
+  Matrix3         result;
+  DALI_TEST_EQUALS(Matrix3(1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f), value.Get<Matrix3>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Matrix3(1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetMatrix3N(void)
 {
   Property::Value value;
-  Matrix3 result(1.f,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f);
-  DALI_TEST_EQUALS( Matrix3(), value.Get< Matrix3 >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Matrix3(1.f,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f), result, TEST_LOCATION );
+  Matrix3         result(1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f);
+  DALI_TEST_EQUALS(Matrix3(), value.Get<Matrix3>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Matrix3(1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f), result, TEST_LOCATION);
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Matrix3(1.f,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f), result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Matrix3(1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetMatrixP(void)
 {
-  float matrixValues[16] = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 };
-  Matrix input( matrixValues );
-  Property::Value value( input );
-  Matrix result;
-  DALI_TEST_EQUALS( input, value.Get< Matrix >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( input, result, TEST_LOCATION );
+  float           matrixValues[16] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+  Matrix          input(matrixValues);
+  Property::Value value(input);
+  Matrix          result;
+  DALI_TEST_EQUALS(input, value.Get<Matrix>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(input, result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetMatrixN(void)
 {
   Property::Value value;
-  Matrix result( Matrix::IDENTITY );
-  DALI_TEST_EQUALS( Matrix(), value.Get< Matrix >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Matrix::IDENTITY, result, TEST_LOCATION );
+  Matrix          result(Matrix::IDENTITY);
+  DALI_TEST_EQUALS(Matrix(), value.Get<Matrix>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Matrix::IDENTITY, result, TEST_LOCATION);
 
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Matrix::IDENTITY, result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Matrix::IDENTITY, result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetAngleAxisP(void)
 {
-  AngleAxis input( Dali::ANGLE_90, Vector3::XAXIS );
-  Property::Value value( input );
-  AngleAxis result = value.Get<AngleAxis>();
-  DALI_TEST_EQUALS( input.angle, result.angle, TEST_LOCATION );
-  DALI_TEST_EQUALS( input.axis, result.axis, TEST_LOCATION );
+  AngleAxis       input(Dali::ANGLE_90, Vector3::XAXIS);
+  Property::Value value(input);
+  AngleAxis       result = value.Get<AngleAxis>();
+  DALI_TEST_EQUALS(input.angle, result.angle, TEST_LOCATION);
+  DALI_TEST_EQUALS(input.axis, result.axis, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( input, result, TEST_LOCATION );
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(input, result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetAngleAxisN(void)
 {
   Property::Value value;
-  AngleAxis b = value.Get<AngleAxis>();
-  AngleAxis result;
-  DALI_TEST_EQUALS( (Radian)0.f, b.angle, TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector3::ZERO, b.axis, TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( AngleAxis(), result, TEST_LOCATION );
+  AngleAxis       b = value.Get<AngleAxis>();
+  AngleAxis       result;
+  DALI_TEST_EQUALS((Radian)0.f, b.angle, TEST_LOCATION);
+  DALI_TEST_EQUALS(Vector3::ZERO, b.axis, TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(AngleAxis(), result, TEST_LOCATION);
 
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( AngleAxis(), result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(AngleAxis(), result, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1000,103 +1141,103 @@ int UtcDaliPropertyValueGetQuaternionP(void)
   Vector3 axis(1, 1, 0);
   axis.Normalize();
 
-  Quaternion result( Radian( 1.f ), axis );
-  Property::Value value( result );
+  Quaternion      result(Radian(1.f), axis);
+  Property::Value value(result);
 
-  DALI_TEST_EQUALS( result, value.Get< Quaternion >(), TEST_LOCATION );
+  DALI_TEST_EQUALS(result, value.Get<Quaternion>(), TEST_LOCATION);
   Quaternion test2;
-  DALI_TEST_EQUALS( true, value.Get( test2 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(true, value.Get(test2), TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetQuaternionN(void)
 {
   Property::Value value;
-  Vector3 axis(1, 1, 0);
+  Vector3         axis(1, 1, 0);
   axis.Normalize();
-  Quaternion result( Radian( 1.f ), axis );
+  Quaternion result(Radian(1.f), axis);
   Quaternion test(result);
 
-  DALI_TEST_EQUALS( Quaternion(), value.Get< Quaternion >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( test ), TEST_LOCATION );
-  DALI_TEST_EQUALS( test, result, TEST_LOCATION );
+  DALI_TEST_EQUALS(Quaternion(), value.Get<Quaternion>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(test), TEST_LOCATION);
+  DALI_TEST_EQUALS(test, result, TEST_LOCATION);
 
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( test ), TEST_LOCATION );
-  DALI_TEST_EQUALS( test, result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(test), TEST_LOCATION);
+  DALI_TEST_EQUALS(test, result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetStringP(void)
 {
-  Property::Value value( std::string("hello") );
-  std::string result;
-  DALI_TEST_EQUALS( std::string("hello"), value.Get< std::string >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( std::string("hello"), result, TEST_LOCATION );
+  Property::Value value(std::string("hello"));
+  std::string     result;
+  DALI_TEST_EQUALS(std::string("hello"), value.Get<std::string>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(std::string("hello"), result, TEST_LOCATION);
 
-  Property::Value value2( "C hi!" );
-  DALI_TEST_EQUALS( "C hi!", value2.Get< std::string >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "C hi!", result, TEST_LOCATION );
+  Property::Value value2("C hi!");
+  DALI_TEST_EQUALS("C hi!", value2.Get<std::string>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS("C hi!", result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetStringN(void)
 {
   Property::Value value;
-  std::string result("doesn't change");
-  DALI_TEST_EQUALS( std::string(), value.Get< std::string >(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "doesn't change", result, TEST_LOCATION );
+  std::string     result("doesn't change");
+  DALI_TEST_EQUALS(std::string(), value.Get<std::string>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS("doesn't change", result, TEST_LOCATION);
 
   Property::Value value2(10);
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "doesn't change", result, TEST_LOCATION );
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS("doesn't change", result, TEST_LOCATION);
 
   Property::Value value3((char*)NULL);
-  DALI_TEST_EQUALS( true, value3.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( std::string(), result, TEST_LOCATION );
+  DALI_TEST_EQUALS(true, value3.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(std::string(), result, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetArrayP(void)
 {
-  Property::Value value( Property::ARRAY );
-  DALI_TEST_CHECK( NULL != value.GetArray() );
-  value.GetArray()->PushBack( Property::Value(1) );
+  Property::Value value(Property::ARRAY);
+  DALI_TEST_CHECK(NULL != value.GetArray());
+  value.GetArray()->PushBack(Property::Value(1));
   Property::Array got = value.Get<Property::Array>();
-  DALI_TEST_CHECK( got[0].Get<int>() == 1);
+  DALI_TEST_CHECK(got[0].Get<int>() == 1);
   Property::Array result;
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_CHECK( result[0].Get<int>() == 1);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_CHECK(result[0].Get<int>() == 1);
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetArrayN(void)
 {
   Property::Value value;
-  DALI_TEST_CHECK( NULL == value.GetArray() );
+  DALI_TEST_CHECK(NULL == value.GetArray());
   Property::Array result;
-  result.PushBack( Property::Value( 10 ) );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1u, result.Count(), TEST_LOCATION  ); // array is not modified
+  result.PushBack(Property::Value(10));
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, result.Count(), TEST_LOCATION); // array is not modified
 
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1u, result.Count(), TEST_LOCATION  ); // array is not modified
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, result.Count(), TEST_LOCATION); // array is not modified
   END_TEST;
 }
 
 int UtcDaliPropertyValueGetMapP(void)
 {
   Property::Value value(Property::MAP);
-  DALI_TEST_CHECK( NULL == value.GetArray() );
-  DALI_TEST_CHECK( NULL != value.GetMap() );
+  DALI_TEST_CHECK(NULL == value.GetArray());
+  DALI_TEST_CHECK(NULL != value.GetMap());
   value.GetMap()->Insert("key", Property::Value(1));
   Property::Map result = value.Get<Property::Map>();
   DALI_TEST_CHECK(result.Find("key")->Get<int>() == 1);
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
   DALI_TEST_CHECK(result.Find("key")->Get<int>() == 1);
   END_TEST;
 }
@@ -1104,16 +1245,45 @@ int UtcDaliPropertyValueGetMapP(void)
 int UtcDaliPropertyValueGetMapN(void)
 {
   Property::Value value;
-  DALI_TEST_CHECK( NULL == value.GetMap() );
-  DALI_TEST_EQUALS( 0u, value.Get<Property::Map>().Count(), TEST_LOCATION );
+  DALI_TEST_CHECK(NULL == value.GetMap());
+  DALI_TEST_EQUALS(0u, value.Get<Property::Map>().Count(), TEST_LOCATION);
   Property::Map result;
-  result.Insert("key", "value" );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1u, result.Count(), TEST_LOCATION );
+  result.Insert("key", "value");
+  DALI_TEST_EQUALS(false, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, result.Count(), TEST_LOCATION);
 
   Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 1u, result.Count(), TEST_LOCATION  ); // array is not modified
+  DALI_TEST_EQUALS(false, value2.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, result.Count(), TEST_LOCATION); // array is not modified
+  END_TEST;
+}
+
+int UtcDaliPropertyValueGetExtentsP(void)
+{
+  Property::Value value(Extents(1u, 2u, 3u, 4u));
+  Extents         result(4u, 3u, 2u, 1u);
+  DALI_TEST_EQUALS(Extents(1u, 2u, 3u, 4u), value.Get<Extents>(), TEST_LOCATION);
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(Extents(1u, 2u, 3u, 4u), result, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliPropertyValueEnum(void)
+{
+  enum class E
+  {
+    zero,
+    e
+  };
+  Property::Value value(E::e);
+  DALI_TEST_EQUALS(static_cast<int>(E::e), static_cast<int>(value.Get<E>()), TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(E::e), value.Get<int>(), TEST_LOCATION);
+  E result;
+  DALI_TEST_EQUALS(true, value.Get(result), TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(E::e), static_cast<int>(result), TEST_LOCATION);
+  int result2;
+  DALI_TEST_EQUALS(true, value.Get(result2), TEST_LOCATION);
+  DALI_TEST_EQUALS(static_cast<int>(E::e), result2, TEST_LOCATION);
   END_TEST;
 }
 
@@ -1127,92 +1297,92 @@ int UtcDaliPropertyValueOutputStream(void)
   {
     std::ostringstream stream;
     stream << value;
-    DALI_TEST_CHECK( stream.str() == "1" )
+    DALI_TEST_CHECK(stream.str() == "1")
   }
 
   {
-    Property::Value empty;
+    Property::Value    empty;
     std::ostringstream stream;
     stream << empty;
-    DALI_TEST_EQUALS( stream.str(), "empty type", TEST_LOCATION );
+    DALI_TEST_EQUALS(stream.str(), "undefined type", TEST_LOCATION);
   }
 
   {
-    Property::Value empty( Property::NONE );
+    Property::Value    empty(Property::NONE);
     std::ostringstream stream;
     stream << empty;
-    DALI_TEST_CHECK( stream.str() == "undefined type" )
+    DALI_TEST_CHECK(stream.str() == "undefined type")
   }
 
   {
     value = Property::Value(20.2f);
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "20.2" )
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "20.2")
   }
 
   {
     value = Property::Value(-25);
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "-25" )
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "-25")
   }
 
   {
-    value = Property::Value( Vector2(1.f,1.f) );
+    value = Property::Value(Vector2(1.f, 1.f));
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "[1, 1]" );
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "[1, 1]");
   }
 
   {
-    value = Property::Value( Vector3(1.f,1.f,1.f) );
+    value = Property::Value(Vector3(1.f, 1.f, 1.f));
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "[1, 1, 1]" );
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "[1, 1, 1]");
   }
 
   {
-    value = Property::Value( Vector4(-4.f,-3.f,-2.f,-1.f) );
+    value = Property::Value(Vector4(-4.f, -3.f, -2.f, -1.f));
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_EQUALS( stream.str(), "[-4, -3, -2, -1]", TEST_LOCATION );
+    stream << value;
+    DALI_TEST_EQUALS(stream.str(), "[-4, -3, -2, -1]", TEST_LOCATION);
   }
 
   {
-    value = Property::Value( Matrix3::IDENTITY );
+    value = Property::Value(Matrix3::IDENTITY);
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "[ [1, 0, 0], [0, 1, 0], [0, 0, 1] ]" );
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "[ 1, 0, 0, 0, 1, 0, 0, 0, 1 ]");
   }
 
   {
-    value = Property::Value( Matrix::IDENTITY );
+    value = Property::Value(Matrix::IDENTITY);
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "[ [1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1] ]" );
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "[ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]");
   }
 
   {
-    value = Property::Value( Rectangle(1,2,3,4) );
+    value = Property::Value(Rectangle(1, 2, 3, 4));
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "[1, 2, 3, 4]" );
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "[1, 2, 3, 4]");
   }
 
   {
-    value = Property::Value( AngleAxis( Dali::ANGLE_120, Vector3::XAXIS ) );
+    value = Property::Value(AngleAxis(Dali::ANGLE_120, Vector3::XAXIS));
     std::ostringstream stream;
-    stream <<  value;
-    tet_printf("angle axis = %s \n", stream.str().c_str() );
-    DALI_TEST_EQUALS( stream.str(), "[ Axis: [1, 0, 0], Angle: 120 degrees ]", TEST_LOCATION );
+    stream << value;
+    tet_printf("angle axis = %s \n", stream.str().c_str());
+    DALI_TEST_EQUALS(stream.str(), "[ Axis: [1, 0, 0], Angle: 120 degrees ]", TEST_LOCATION);
   }
 
   {
-    value = Property::Value( std::string( "Foo" ) );
+    value = Property::Value(std::string("Foo"));
     std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "Foo" );
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "Foo");
   }
 
   {
@@ -1221,27 +1391,27 @@ int UtcDaliPropertyValueOutputStream(void)
     map.Insert("duration", 10);
     map.Insert("color", Vector4(1.0, 0.5, 1.0, 1.0));
 
-    value = Property::Value( map );
+    value = Property::Value(map);
     std::ostringstream stream;
     stream << value;
     tet_printf("Checking Property::Value is %s", stream.str().c_str());
-    DALI_TEST_CHECK( !stream.str().compare("Map(3) = {key:value, duration:10, color:[1, 0.5, 1, 1]}"));
+    DALI_TEST_CHECK(!stream.str().compare("Map(3) = {key:value, duration:10, color:[1, 0.5, 1, 1]}"));
   }
   {
     Property::Array array;
     array.PushBack(0);
     array.PushBack(2);
     array.PushBack(3);
-    value = Property::Value( array );
+    value = Property::Value(array);
     std::ostringstream stream;
-    stream <<  value;
+    stream << value;
     tet_printf("Checking Property::Value is %s", stream.str().c_str());
-    DALI_TEST_CHECK( !stream.str().compare("Array(3) = [0, 2, 3]") );
+    DALI_TEST_CHECK(!stream.str().compare("Array(3) = [0, 2, 3]"));
   }
 
   {
-    Property::Map map;
-    Property::Map map2;
+    Property::Map   map;
+    Property::Map   map2;
     Property::Array array;
 
     map2.Insert("key", "value");
@@ -1253,16 +1423,22 @@ int UtcDaliPropertyValueOutputStream(void)
     array.PushBack(Vector2(1, 0));
     array.PushBack(Vector2(0, 0.5));
     map.Insert("texCoords", array);
-    value = Property::Value( map );
+    value = Property::Value(map);
 
     std::ostringstream stream;
     stream << value;
 
     tet_printf("Checking Property::Value is %s", stream.str().c_str());
 
-    DALI_TEST_CHECK( !stream.str().compare("Map(3) = {color:[1, 0.5, 1, 1], timePeriod:Map(2) = {key:value, duration:10}, texCoords:Array(4) = [[1, 0], [0, 1], [1, 0], [0, 0.5]]}"));
+    DALI_TEST_CHECK(!stream.str().compare("Map(3) = {color:[1, 0.5, 1, 1], timePeriod:Map(2) = {key:value, duration:10}, texCoords:Array(4) = [[1, 0], [0, 1], [1, 0], [0, 0.5]]}"));
   }
 
+  {
+    value = Property::Value(Extents(1u, 2u, 3u, 4u));
+    std::ostringstream stream;
+    stream << value;
+    DALI_TEST_CHECK(stream.str() == "[1, 2, 3, 4]");
+  }
 
   END_TEST;
 }