Updating code formatting 79/272179/2
authorDavid Steele <david.steele@samsung.com>
Thu, 10 Mar 2022 11:37:23 +0000 (11:37 +0000)
committerDavid Steele <david.steele@samsung.com>
Thu, 10 Mar 2022 12:46:22 +0000 (12:46 +0000)
Change-Id: I71f58722bae7d13c9866cf7c4f724e09d1ced85b

67 files changed:
automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp
automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp
automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
automated-tests/src/dali-toolkit/utc-Dali-CameraView.cpp [changed mode: 0755->0644]
automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp
automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp
automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp
automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
automated-tests/src/dali-toolkit/utc-Dali-FadeTransition.cpp [changed mode: 0755->0644]
automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp
automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
automated-tests/src/dali-toolkit/utc-Dali-GlView.cpp
automated-tests/src/dali-toolkit/utc-Dali-Image.cpp
automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
automated-tests/src/dali-toolkit/utc-Dali-ImageUrl.cpp
automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp
automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp
automated-tests/src/dali-toolkit/utc-Dali-NPatchUtilities.cpp
automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp
automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-ScaleTransition.cpp [changed mode: 0755->0644]
automated-tests/src/dali-toolkit/utc-Dali-Scene3dView.cpp
automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp
automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp
automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp
automated-tests/src/dali-toolkit/utc-Dali-SlideTransition.cpp [changed mode: 0755->0644]
automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
automated-tests/src/dali-toolkit/utc-Dali-SyncImageLoader.cpp
automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextureManager.cpp
automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
automated-tests/src/dali-toolkit/utc-Dali-Toolkit.cpp
automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp
automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp [changed mode: 0755->0644]
automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp [changed mode: 0755->0644]

index f4b809d..d00fa11 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
-
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
-#include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -43,9 +42,9 @@ void utc_dali_toolkit_alignment_cleanup(void)
 namespace
 {
 /// Compare an int (Or'd Alignment::Type) with an Alignment::Type value
-void DALI_TEST_EQUALS( int value1, Alignment::Type value2, const char* location )
+void DALI_TEST_EQUALS(int value1, Alignment::Type value2, const char* location)
 {
-  ::DALI_TEST_EQUALS< Alignment::Type >( static_cast< Alignment::Type >( value1 ), value2, location );
+  ::DALI_TEST_EQUALS<Alignment::Type>(static_cast<Alignment::Type>(value1), value2, location);
 }
 
 static bool gObjectCreatedCallBackCalled;
@@ -56,7 +55,6 @@ static void TestCallback(BaseHandle handle)
 }
 } // namespace
 
-
 int UtcDaliAlignmentConstructorNegative(void)
 {
   ToolkitTestApplication application;
@@ -69,9 +67,9 @@ int UtcDaliAlignmentConstructorNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "alignment", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "alignment", TEST_LOCATION);
   }
   END_TEST;
 }
@@ -88,15 +86,15 @@ int UtcDaliAlignmentConstructorPositive(void)
     alignment.SetPadding(padding);
     tet_result(TET_PASS);
   }
-  catch (DaliException& exception)
+  catch(DaliException& exception)
   {
     tet_result(TET_FAIL);
   }
 
   Actor actor = alignment;
-  alignment = Alignment::DownCast( actor );
+  alignment   = Alignment::DownCast(actor);
 
-  DALI_TEST_CHECK( alignment );
+  DALI_TEST_CHECK(alignment);
   END_TEST;
 }
 
@@ -106,14 +104,14 @@ int UtcDaliAlignmentConstructorRegister(void)
 
   //To ensure the object is registered after creation
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
   registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     Alignment alignment = Alignment::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -423,43 +421,43 @@ int UtcDaliAlignmentSetAlignmentTypeNegative(void)
 
   // Setting HORIZONTAL_LEFT, HORIZONTAL_CENTER
   {
-    Alignment alignment = Alignment::New();
+    Alignment       alignment = Alignment::New();
     Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::HORIZONTAL_CENTER));
     alignment.SetAlignmentType(type);
     // center will prevail in conflict
-    DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::HORIZONTAL_LEFT & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::HORIZONTAL_LEFT & alignment.GetAlignmentType()));
   }
 
   // Setting HORIZONTAL_CENTER, HORIZONTAL_RIGHT
   {
-    Alignment alignment = Alignment::New();
+    Alignment       alignment = Alignment::New();
     Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::HORIZONTAL_RIGHT));
 
     alignment.SetAlignmentType(type);
     // center will prevail in conflict
-    DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::HORIZONTAL_RIGHT & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::HORIZONTAL_RIGHT & alignment.GetAlignmentType()));
   }
 
   // Setting VERTICAL_TOP, VERTICAL_CENTER
   {
-    Alignment alignment = Alignment::New();
+    Alignment       alignment = Alignment::New();
     Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_CENTER));
     alignment.SetAlignmentType(type);
     // center will prevail in conflict
-    DALI_TEST_CHECK( Alignment::VERTICAL_CENTER & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::VERTICAL_TOP & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::VERTICAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::VERTICAL_TOP & alignment.GetAlignmentType()));
   }
 
   // Setting VERTICAL_CENTER, VERTICAL_BOTTOM
   {
-    Alignment alignment = Alignment::New();
+    Alignment       alignment = Alignment::New();
     Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_BOTTOM));
     alignment.SetAlignmentType(type);
     // top will prevail in conflict
-    DALI_TEST_CHECK( Alignment::VERTICAL_TOP & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::VERTICAL_BOTTOM & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::VERTICAL_TOP & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::VERTICAL_BOTTOM & alignment.GetAlignmentType()));
   }
   END_TEST;
 }
@@ -817,16 +815,16 @@ int UtcDaliAlignmentSetPaddingPositive(void)
   Alignment alignment = Alignment::New();
 
   Alignment::Padding padding(1.0f, 1.5f, 2.f, 0.5f);
-  DALI_TEST_CHECK( fabs( padding.left - alignment.GetPadding().left ) > GetRangedEpsilon( padding.left, alignment.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignment.GetPadding().right ) > GetRangedEpsilon( padding.right, alignment.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignment.GetPadding().top ) > GetRangedEpsilon( padding.top, alignment.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignment.GetPadding().bottom ) > GetRangedEpsilon( padding.bottom, alignment.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignment.GetPadding().left) > GetRangedEpsilon(padding.left, alignment.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignment.GetPadding().right) > GetRangedEpsilon(padding.right, alignment.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignment.GetPadding().top) > GetRangedEpsilon(padding.top, alignment.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignment.GetPadding().bottom) > GetRangedEpsilon(padding.bottom, alignment.GetPadding().bottom));
 
   alignment.SetPadding(padding);
-  DALI_TEST_CHECK( fabs( padding.left - alignment.GetPadding().left ) < GetRangedEpsilon( padding.left, alignment.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignment.GetPadding().right ) < GetRangedEpsilon( padding.right, alignment.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignment.GetPadding().top ) < GetRangedEpsilon( padding.top, alignment.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignment.GetPadding().bottom ) < GetRangedEpsilon( padding.bottom, alignment.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignment.GetPadding().left) < GetRangedEpsilon(padding.left, alignment.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignment.GetPadding().right) < GetRangedEpsilon(padding.right, alignment.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignment.GetPadding().top) < GetRangedEpsilon(padding.top, alignment.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignment.GetPadding().bottom) < GetRangedEpsilon(padding.bottom, alignment.GetPadding().bottom));
   END_TEST;
 }
 
@@ -842,9 +840,9 @@ int UtcDaliAlignmentSetPaddingNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION);
   }
 
   try
@@ -853,9 +851,9 @@ int UtcDaliAlignmentSetPaddingNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION);
   }
 
   try
@@ -864,9 +862,9 @@ int UtcDaliAlignmentSetPaddingNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION);
   }
 
   try
@@ -875,9 +873,9 @@ int UtcDaliAlignmentSetPaddingNegative(void)
     alignment.SetPadding(padding);
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION);
   }
   END_TEST;
 }
@@ -887,17 +885,17 @@ int UtcDaliAlignmentGetPadding(void)
   ToolkitTestApplication application;
 
   Alignment alignment = Alignment::New();
-  DALI_TEST_CHECK( fabs( alignment.GetPadding().left ) < GetRangedEpsilon( 0.f, alignment.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( alignment.GetPadding().right ) < GetRangedEpsilon( 0.f, alignment.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( alignment.GetPadding().top ) < GetRangedEpsilon( 0.f, alignment.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( alignment.GetPadding().bottom ) < GetRangedEpsilon( 0.f, alignment.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(alignment.GetPadding().left) < GetRangedEpsilon(0.f, alignment.GetPadding().left));
+  DALI_TEST_CHECK(fabs(alignment.GetPadding().right) < GetRangedEpsilon(0.f, alignment.GetPadding().right));
+  DALI_TEST_CHECK(fabs(alignment.GetPadding().top) < GetRangedEpsilon(0.f, alignment.GetPadding().top));
+  DALI_TEST_CHECK(fabs(alignment.GetPadding().bottom) < GetRangedEpsilon(0.f, alignment.GetPadding().bottom));
 
   Alignment::Padding padding(1.0f, 1.5f, 2.f, 0.f);
   alignment.SetPadding(padding);
-  DALI_TEST_CHECK( fabs( padding.left - alignment.GetPadding().left ) < GetRangedEpsilon( padding.left, alignment.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignment.GetPadding().right ) < GetRangedEpsilon( padding.right, alignment.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignment.GetPadding().top ) < GetRangedEpsilon( padding.top, alignment.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignment.GetPadding().bottom ) < GetRangedEpsilon( padding.bottom, alignment.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignment.GetPadding().left) < GetRangedEpsilon(padding.left, alignment.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignment.GetPadding().right) < GetRangedEpsilon(padding.right, alignment.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignment.GetPadding().top) < GetRangedEpsilon(padding.top, alignment.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignment.GetPadding().bottom) < GetRangedEpsilon(padding.bottom, alignment.GetPadding().bottom));
   END_TEST;
 }
 
@@ -940,8 +938,8 @@ int UtcDaliAlignmentSizeSetP(void)
   application.Render();
   application.SendNotification();
 
-  Vector2 size( 100.0f, 200.0f );
-  alignment.SetProperty( Actor::Property::SIZE, size);
+  Vector2 size(100.0f, 200.0f);
+  alignment.SetProperty(Actor::Property::SIZE, size);
 
   application.Render();
   application.SendNotification();
@@ -967,8 +965,8 @@ int UtcDaliAlignmentOnTouchEvent(void)
   ToolkitTestApplication application;
 
   Alignment alignment = Alignment::New();
-  alignment.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  alignment.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+  alignment.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+  alignment.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   application.GetScene().Add(alignment);
 
   alignment.TouchedSignal().Connect(&TouchCallback);
@@ -979,10 +977,10 @@ int UtcDaliAlignmentOnTouchEvent(void)
   application.SendNotification();
 
   Integration::TouchEvent touchEvent(1);
-  Integration::Point point;
-  point.SetDeviceId( 1 );
-  point.SetState( PointState::DOWN);
-  point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
+  Integration::Point      point;
+  point.SetDeviceId(1);
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(20.0f, 20.0f));
   touchEvent.AddPoint(point);
   application.ProcessEvent(touchEvent);
 
@@ -1019,7 +1017,7 @@ int UtcDaliAlignmentOnSizeAnimation(void)
   application.GetScene().Add(alignment);
 
   Animation animation = Animation::New(100.0f);
-  animation.AnimateTo( Property( alignment, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f ) );
+  animation.AnimateTo(Property(alignment, Actor::Property::SIZE), Vector3(100.0f, 150.0f, 200.0f));
   animation.Play();
 
   application.Render();
@@ -1042,20 +1040,20 @@ int UtcDaliAlignmentCopyAndAssignment(void)
   alignment.SetPadding(padding);
 
   Alignment alignmentCopy(alignment);
-  DALI_TEST_CHECK( fabs( padding.left - alignmentCopy.GetPadding().left ) < GetRangedEpsilon( padding.left, alignmentCopy.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignmentCopy.GetPadding().right ) < GetRangedEpsilon( padding.right, alignmentCopy.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignmentCopy.GetPadding().top ) < GetRangedEpsilon( padding.top, alignmentCopy.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignmentCopy.GetPadding().bottom ) < GetRangedEpsilon( padding.bottom, alignmentCopy.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignmentCopy.GetPadding().left) < GetRangedEpsilon(padding.left, alignmentCopy.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignmentCopy.GetPadding().right) < GetRangedEpsilon(padding.right, alignmentCopy.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignmentCopy.GetPadding().top) < GetRangedEpsilon(padding.top, alignmentCopy.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignmentCopy.GetPadding().bottom) < GetRangedEpsilon(padding.bottom, alignmentCopy.GetPadding().bottom));
 
   Alignment alignmentEmptyCopy(emptyAlignment);
   DALI_TEST_CHECK(emptyAlignment == alignmentEmptyCopy);
 
   Alignment alignmentEquals;
   alignmentEquals = alignment;
-  DALI_TEST_CHECK( fabs( padding.left - alignmentEquals.GetPadding().left ) < GetRangedEpsilon( padding.left, alignmentEquals.GetPadding().left ) );
-  DALI_TEST_CHECK( fabs( padding.right - alignmentEquals.GetPadding().right ) < GetRangedEpsilon( padding.right, alignmentEquals.GetPadding().right ) );
-  DALI_TEST_CHECK( fabs( padding.top - alignmentEquals.GetPadding().top ) < GetRangedEpsilon( padding.top, alignmentEquals.GetPadding().top ) );
-  DALI_TEST_CHECK( fabs( padding.bottom - alignmentEquals.GetPadding().bottom ) < GetRangedEpsilon( padding.bottom, alignmentEquals.GetPadding().bottom ) );
+  DALI_TEST_CHECK(fabs(padding.left - alignmentEquals.GetPadding().left) < GetRangedEpsilon(padding.left, alignmentEquals.GetPadding().left));
+  DALI_TEST_CHECK(fabs(padding.right - alignmentEquals.GetPadding().right) < GetRangedEpsilon(padding.right, alignmentEquals.GetPadding().right));
+  DALI_TEST_CHECK(fabs(padding.top - alignmentEquals.GetPadding().top) < GetRangedEpsilon(padding.top, alignmentEquals.GetPadding().top));
+  DALI_TEST_CHECK(fabs(padding.bottom - alignmentEquals.GetPadding().bottom) < GetRangedEpsilon(padding.bottom, alignmentEquals.GetPadding().bottom));
 
   Alignment alignmentEmptyEquals;
   alignmentEmptyEquals = emptyAlignment;
index 56d67f4..0d2efcc 100644 (file)
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
-#include <toolkit-timer.h>
+
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-timer.h>
+
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+
 #include "dummy-control.h"
 
 using namespace Dali;
@@ -43,14 +46,13 @@ void dali_animated_image_visual_cleanup(void)
 
 namespace
 {
-const char* TEST_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/application-icon-%02d.png";
-const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif";
-}
-
+const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/application-icon-%02d.png";
+const char* TEST_GIF_FILE_NAME   = TEST_RESOURCE_DIR "/anim.gif";
+} // namespace
 
-void CopyUrlsIntoArray( Property::Array& urls, int startIndex=0 )
+void CopyUrlsIntoArray(Property::Array& urls, int startIndex = 0)
 {
-  for( int i=20+startIndex;i<=30;++i)
+  for(int i = 20 + startIndex; i <= 30; ++i)
   {
     char* url;
     if(asprintf(&url, TEST_IMAGE_FILE_NAME, i) > 0)
@@ -65,230 +67,228 @@ void CopyUrlsIntoArray( Property::Array& urls, int startIndex=0 )
 int UtcDaliAnimatedImageVisualGetPropertyMap01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap" );
+  tet_infoline("UtcDaliAnimatedImageVisualGetPropertyMap");
 
   // request AnimatedImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
-  Visual::Base animatedImageVisual = factory.CreateVisual(
+  VisualFactory factory             = VisualFactory::Get();
+  Visual::Base  animatedImageVisual = factory.CreateVisual(
     Property::Map()
-    .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-    .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-    .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-    .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-    .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-    .Add( DevelVisual::Property::CORNER_RADIUS, 22.2f )
-    .Add( DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE )
-    .Add( DevelVisual::Property::BORDERLINE_WIDTH, 33.3f )
-    .Add( DevelVisual::Property::BORDERLINE_COLOR, Color::RED )
-    .Add( DevelVisual::Property::BORDERLINE_OFFSET, 0.3f ));
+      .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+      .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+      .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+      .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+      .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+      .Add(DevelVisual::Property::CORNER_RADIUS, 22.2f)
+      .Add(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE)
+      .Add(DevelVisual::Property::BORDERLINE_WIDTH, 33.3f)
+      .Add(DevelVisual::Property::BORDERLINE_COLOR, Color::RED)
+      .Add(DevelVisual::Property::BORDERLINE_OFFSET, 0.3f));
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_GIF_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_GIF_FILE_NAME);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4(22.2f, 22.2f, 22.2f, 22.2f), TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(22.2f, 22.2f, 22.2f, 22.2f), TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::Transform::Policy::ABSOLUTE );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::ABSOLUTE);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 33.3f, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 33.3f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Color::RED, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.3f, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.3f, TEST_LOCATION);
 
   // request AnimatedImageVisual with an URL
-  Visual::Base animatedImageVisual2 = factory.CreateVisual( TEST_GIF_FILE_NAME, ImageDimensions() );
+  Visual::Base animatedImageVisual2 = factory.CreateVisual(TEST_GIF_FILE_NAME, ImageDimensions());
   resultMap.Clear();
-  animatedImageVisual2.CreatePropertyMap( resultMap );
+  animatedImageVisual2.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_GIF_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_GIF_FILE_NAME);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualGetPropertyMap02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap for multi image with fixed cache" );
+  tet_infoline("UtcDaliAnimatedImageVisualGetPropertyMap for multi image with fixed cache");
 
   // request AnimatedImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
+  VisualFactory   factory = VisualFactory::Get();
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   Visual::Base animatedImageVisual = factory.CreateVisual(
     Property::Map()
-    .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-    .Add( "url", urls )
-    .Add( "batchSize", 4 )
-    .Add( "cacheSize", 20 )
-    .Add( "loopCount", 10 )
-    .Add( "frameDelay", 200 )
-    .Add( "pixelArea", Vector4() )
-    .Add( "wrapModeU", WrapMode::REPEAT )
-    .Add( "wrapModeV", WrapMode::DEFAULT )
-    .Add( "cornerRadius", Vector4(50.0f, 25.0f, 12.5f, 33.0f) )
-    .Add( "cornerRadiusPolicy", Visual::Transform::Policy::RELATIVE )
-    .Add( "borderlineWidth", 20.0f )
-    .Add( "borderlineColor", Vector4() )
-    .Add( "borderlineOffset", -1.0f));
+      .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+      .Add("url", urls)
+      .Add("batchSize", 4)
+      .Add("cacheSize", 20)
+      .Add("loopCount", 10)
+      .Add("frameDelay", 200)
+      .Add("pixelArea", Vector4())
+      .Add("wrapModeU", WrapMode::REPEAT)
+      .Add("wrapModeV", WrapMode::DEFAULT)
+      .Add("cornerRadius", Vector4(50.0f, 25.0f, 12.5f, 33.0f))
+      .Add("cornerRadiusPolicy", Visual::Transform::Policy::RELATIVE)
+      .Add("borderlineWidth", 20.0f)
+      .Add("borderlineColor", Vector4())
+      .Add("borderlineOffset", -1.0f));
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL, "url" );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(ImageVisual::Property::URL, "url");
+  DALI_TEST_CHECK(value);
   Property::Array* resultUrls = value->GetArray();
-  DALI_TEST_CHECK( resultUrls );
-  DALI_TEST_EQUALS( resultUrls->Count(), urls.Count(), TEST_LOCATION );
+  DALI_TEST_CHECK(resultUrls);
+  DALI_TEST_EQUALS(resultUrls->Count(), urls.Count(), TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 4, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::BATCH_SIZE, "batchSize");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 4, TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 20, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::CACHE_SIZE, "cacheSize");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 20, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 10, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 10, TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::FRAME_DELAY, "frameDelay" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 200, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::FRAME_DELAY, "frameDelay");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 200, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 11, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 11, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4(50.0f, 25.0f, 12.5f, 33.0f), TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(50.0f, 25.0f, 12.5f, 33.0f), TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::Transform::Policy::RELATIVE );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::RELATIVE);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 20.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 20.0f, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4::ZERO, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), -1.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), -1.0f, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualGetPropertyMap03(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap for multi image rolling cache" );
+  tet_infoline("UtcDaliAnimatedImageVisualGetPropertyMap for multi image rolling cache");
 
   // request AnimatedImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
+  VisualFactory   factory = VisualFactory::Get();
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   Visual::Base animatedImageVisual = factory.CreateVisual(
     Property::Map()
-    .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-    .Add( "url", urls )
-    .Add( "batchSize", 4 )
-    .Add( "cacheSize", 8 )
-    .Add( "loopCount", 10 )
-    .Add( "frameDelay", 200 )
-    .Add( "pixelArea", Vector4() )
-    .Add( "wrapModeU", WrapMode::REPEAT )
-    .Add( "wrapModeV", WrapMode::DEFAULT )
-    .Add( "cornerRadius", 50.5f ));
+      .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+      .Add("url", urls)
+      .Add("batchSize", 4)
+      .Add("cacheSize", 8)
+      .Add("loopCount", 10)
+      .Add("frameDelay", 200)
+      .Add("pixelArea", Vector4())
+      .Add("wrapModeU", WrapMode::REPEAT)
+      .Add("wrapModeV", WrapMode::DEFAULT)
+      .Add("cornerRadius", 50.5f));
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL, "url" );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(ImageVisual::Property::URL, "url");
+  DALI_TEST_CHECK(value);
   Property::Array* resultUrls = value->GetArray();
-  DALI_TEST_CHECK( resultUrls );
-  DALI_TEST_EQUALS( resultUrls->Count(), urls.Count(), TEST_LOCATION );
+  DALI_TEST_CHECK(resultUrls);
+  DALI_TEST_EQUALS(resultUrls->Count(), urls.Count(), TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 4, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::BATCH_SIZE, "batchSize");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 4, TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 8, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::CACHE_SIZE, "cacheSize");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 8, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 10, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 10, TEST_LOCATION);
 
-  value = resultMap.Find( ImageVisual::Property::FRAME_DELAY, "frameDelay" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 200, TEST_LOCATION );
+  value = resultMap.Find(ImageVisual::Property::FRAME_DELAY, "frameDelay");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 200, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 11, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 11, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4(50.5f, 50.5f, 50.5f, 50.5f), TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(50.5f, 50.5f, 50.5f, 50.5f), TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::Transform::Policy::ABSOLUTE );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::ABSOLUTE);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Color::BLACK, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::BLACK, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -296,54 +296,54 @@ int UtcDaliAnimatedImageVisualGetPropertyMap03(void)
 int UtcDaliAnimatedImageVisualGetPropertyMap04(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap" );
+  tet_infoline("UtcDaliAnimatedImageVisualGetPropertyMap");
 
   // request AnimatedImageVisual with a property map
-  VisualFactory factory = VisualFactory::Get();
-  Visual::Base animatedImageVisual = factory.CreateVisual(
+  VisualFactory factory             = VisualFactory::Get();
+  Visual::Base  animatedImageVisual = factory.CreateVisual(
     Property::Map()
-    .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-    .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-    .Add( ImageVisual::Property::BATCH_SIZE, 1 )
-    .Add( ImageVisual::Property::CACHE_SIZE, 1 )
-    .Add( ImageVisual::Property::SYNCHRONOUS_LOADING, false )
-    .Add( DevelVisual::Property::BORDERLINE_WIDTH, 0.4f ));
+      .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+      .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+      .Add(ImageVisual::Property::BATCH_SIZE, 1)
+      .Add(ImageVisual::Property::CACHE_SIZE, 1)
+      .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false)
+      .Add(DevelVisual::Property::BORDERLINE_WIDTH, 0.4f));
 
   Property::Map resultMap;
-  animatedImageVisual.CreatePropertyMap( resultMap );
+  animatedImageVisual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::ANIMATED_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL,  Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == TEST_GIF_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_GIF_FILE_NAME);
 
-  value = resultMap.Find( ImageVisual::Property::BATCH_SIZE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == 2 );
+  value = resultMap.Find(ImageVisual::Property::BATCH_SIZE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 2);
 
-  value = resultMap.Find( ImageVisual::Property::CACHE_SIZE,  Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<int>() == 2 );
+  value = resultMap.Find(ImageVisual::Property::CACHE_SIZE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 2);
 
-  value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<int>(), 4, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<int>(), 4, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.4f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.4f, TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<Vector4>(), Vector4(0.0f, 0.0f, 0.0f, 1.0f), TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, "borderlineColor");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(0.0f, 0.0f, 0.0f, 1.0f), TEST_LOCATION);
 
-  value = resultMap.Find( Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get<float>(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, "borderlineOffset");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -351,28 +351,28 @@ int UtcDaliAnimatedImageVisualGetPropertyMap04(void)
 int UtcDaliAnimatedImageVisualImageLoadingFail01(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert( Visual::Property::TYPE, Visual::ANIMATED_IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, "dummy.gif" );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2 );
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 2 );
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20 );
-    propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
-    propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS, 0.23f );
-    propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE );
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, "dummy.gif");
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, 0.23f);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -380,14 +380,14 @@ int UtcDaliAnimatedImageVisualImageLoadingFail01(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 1, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 6 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 6);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 1, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
@@ -398,28 +398,28 @@ int UtcDaliAnimatedImageVisualImageLoadingFail01(void)
 int UtcDaliAnimatedImageVisualSynchronousLoading(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert( Visual::Property::TYPE, Visual::ANIMATED_IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, TEST_GIF_FILE_NAME );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2 );
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 2 );
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20 );
-    propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true );
-    propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS, 0.23f );
-    propertyMap.Insert( DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE );
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(ImageVisual::Property::SYNCHRONOUS_LOADING, true);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS, 0.23f);
+    propertyMap.Insert(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::ABSOLUTE);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -427,70 +427,69 @@ int UtcDaliAnimatedImageVisualSynchronousLoading(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 3 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 3);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualJumpToAction(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 12);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 12);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(20);
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -498,69 +497,68 @@ int UtcDaliAnimatedImageVisualJumpToAction(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map() );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map());
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 20 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 6 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 6);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 6 ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(6), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualStopBehavior(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME);
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 8);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 8);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
     // Expect that a batch of 4 textures has been requested. These will be serially loaded
     // below.
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(20);
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -568,62 +566,61 @@ int UtcDaliAnimatedImageVisualStopBehavior(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map() );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map());
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 1 );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 1);
 
     // Expect the second batch has been requested
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 4, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualStopBehavior02(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 2);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
     // Expect that a batch of 4 textures has been requested. These will be serially loaded
     // below.
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -631,75 +628,74 @@ int UtcDaliAnimatedImageVisualStopBehavior02(void)
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 2, TEST_LOCATION);
 
     Test::EmitGlobalTimerSignal();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map() );
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map());
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualAnimatedImage01(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, TEST_GIF_FILE_NAME );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME);
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 20);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
     // Expect that a batch of 4 textures has been requested. These will be serially loaded
     // below.
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
 
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 2, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 2, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
+    tet_infoline("Test that a timer has been started");
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -709,60 +705,59 @@ int UtcDaliAnimatedImageVisualAnimatedImage01(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(20);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 4, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(20);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualMultiImage01(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 8);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 8);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
     // Expect that a batch of 4 textures has been requested. These will be serially loaded
     // below.
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Ready the visual after the visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     TraceCallStack& textureTrace = gl.GetTextureTrace();
     textureTrace.Enable(true);
@@ -770,51 +765,49 @@ int UtcDaliAnimatedImageVisualMultiImage01(void)
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION );
-    DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 4, TEST_LOCATION);
+    DALI_TEST_EQUALS(textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION);
 
-    tet_infoline( "Test that after 1 tick, and file loads completed, that we have 7 textures" );
+    tet_infoline("Test that after 1 tick, and file loads completed, that we have 7 textures");
     Test::EmitGlobalTimerSignal();
 
     // Expect the second batch has been requested
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 7, TEST_LOCATION);
 
-
-    tet_infoline( "Test that after 2 ticks that we have 6 textures" );
+    tet_infoline("Test that after 2 ticks that we have 6 textures");
 
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 6, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 6, TEST_LOCATION);
 
     tet_infoline("And that at least 2 textures were requested");
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 8, TEST_LOCATION );
-
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 8, TEST_LOCATION);
 
-    tet_infoline( "Test that after 3rd tick that we have 7 textures and 1 request" );
+    tet_infoline("Test that after 3rd tick that we have 7 textures and 1 request");
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 7, TEST_LOCATION);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 8, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 8, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -822,144 +815,143 @@ int UtcDaliAnimatedImageVisualMultiImage01(void)
 int UtcDaliAnimatedImageVisualMultiImage02(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
-  tet_infoline( "Test that the animated visual has different batch and cache size." );
+  tet_infoline("Test that the animated visual has different batch and cache size.");
 
   {
     Property::Array urls;
-    CopyUrlsIntoArray( urls );
+    CopyUrlsIntoArray(urls);
 
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 0);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 0);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 0);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 0);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0
+    Visual::Base  visual  = factory.CreateVisual(propertyMap); // TexMgr::Request load tId:0
 
     // Check the batch size and cache size need to have minimum 2.
     Property::Map resultMap;
-    visual.CreatePropertyMap( resultMap );
-    Property::Value* value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" );
-    DALI_TEST_CHECK( value );
-    DALI_TEST_EQUALS( value->Get<int>(), 2, TEST_LOCATION );
-    value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" );
-    DALI_TEST_CHECK( value );
-    DALI_TEST_EQUALS( value->Get<int>(), 2, TEST_LOCATION );
+    visual.CreatePropertyMap(resultMap);
+    Property::Value* value = resultMap.Find(ImageVisual::Property::BATCH_SIZE, "batchSize");
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION);
+    value = resultMap.Find(ImageVisual::Property::CACHE_SIZE, "cacheSize");
+    DALI_TEST_CHECK(value);
+    DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION);
     visual.Reset();
 
     // Batch size is 2 and cache size is 3
     propertyMap.Clear();
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 3);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 3);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
-    visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0
+    visual = factory.CreateVisual(propertyMap); // TexMgr::Request load tId:0
 
     // Expect that each image is loaded each tick
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl1 = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl1   = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl1.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
     visual.Reset();
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Ready the visual after the visual is on window" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on window");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 1 and 2
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION );
+    application.Render(16); //glGenTextures 1 and 2
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:0
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 3
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    application.Render(16); //glGenTextures 3
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:1
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 4
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    application.Render(16); //glGenTextures 4
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    dummyImpl1.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
+    dummyImpl1.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
     dummyControl.Unparent();
 
-
     // Batch size is 9 and cache size is 4
     propertyMap.Clear();
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 3);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 7);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 3);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 7);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
-    visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0
+    visual = factory.CreateVisual(propertyMap); // TexMgr::Request load tId:0
 
     // Expect that each image is loaded each tick
-    dummyControl = DummyControl::New(true);
+    dummyControl                   = DummyControl::New(true);
     Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
     visual.Reset();
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Ready the visual after the visual is on window" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+    tet_infoline("Ready the visual after the visual is on window");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 1, 2, and 3
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    application.Render(16); //glGenTextures 1, 2, and 3
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:0
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 4, 5, and 6
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 5, TEST_LOCATION );
+    application.Render(16); //glGenTextures 4, 5, and 6
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 5, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:1
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 7, 1, and 2
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION );
+    application.Render(16); //glGenTextures 7, 1, and 2
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 7, TEST_LOCATION);
 
-    tet_infoline( "Test that each tick, a new image is requested" );
+    tet_infoline("Test that each tick, a new image is requested");
     Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:2
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
     application.SendNotification();
-    application.Render(16);//glGenTextures 3
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION );
+    application.Render(16); //glGenTextures 3
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 7, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
   tet_infoline("Test that removing the visual from window deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
@@ -967,70 +959,70 @@ int UtcDaliAnimatedImageVisualMultiImage02(void)
 int UtcDaliAnimatedImageVisualMultiImage03(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
   {
     Property::Array urls1, urls2;
-    CopyUrlsIntoArray( urls1 );
-    CopyUrlsIntoArray( urls2 );
+    CopyUrlsIntoArray(urls1);
+    CopyUrlsIntoArray(urls2);
 
     Property::Map animatedImageMap1;
-    animatedImageMap1.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    animatedImageMap1.Insert( ImageVisual::Property::URL, Property::Value(urls1) );
-    animatedImageMap1.Insert( ImageVisual::Property::BATCH_SIZE, 3);
-    animatedImageMap1.Insert( ImageVisual::Property::CACHE_SIZE, 3);
-    animatedImageMap1.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    animatedImageMap1.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    animatedImageMap1.Insert(ImageVisual::Property::URL, Property::Value(urls1));
+    animatedImageMap1.Insert(ImageVisual::Property::BATCH_SIZE, 3);
+    animatedImageMap1.Insert(ImageVisual::Property::CACHE_SIZE, 3);
+    animatedImageMap1.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     Property::Map animatedImageMap2;
-    animatedImageMap2.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    animatedImageMap2.Insert( ImageVisual::Property::URL, Property::Value(urls2) );
-    animatedImageMap2.Insert( ImageVisual::Property::BATCH_SIZE, 2);
-    animatedImageMap2.Insert( ImageVisual::Property::CACHE_SIZE, 2);
-    animatedImageMap2.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    animatedImageMap2.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    animatedImageMap2.Insert(ImageVisual::Property::URL, Property::Value(urls2));
+    animatedImageMap2.Insert(ImageVisual::Property::BATCH_SIZE, 2);
+    animatedImageMap2.Insert(ImageVisual::Property::CACHE_SIZE, 2);
+    animatedImageMap2.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
-    VisualFactory factory = VisualFactory::Get();
-    Visual::Base animatedImageVisual1 = factory.CreateVisual( animatedImageMap1 );
+    VisualFactory factory              = VisualFactory::Get();
+    Visual::Base  animatedImageVisual1 = factory.CreateVisual(animatedImageMap1);
 
-    tet_infoline( "Create two image views with the same URLs, offset by 1 frame.");
+    tet_infoline("Create two image views with the same URLs, offset by 1 frame.");
 
-    DummyControl dummyControl1 = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl1 = static_cast<Impl::DummyControl&>(dummyControl1.GetImplementation());
-    dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual1 );
-    dummyControl1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl1 );
+    DummyControl        dummyControl1 = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl1    = static_cast<Impl::DummyControl&>(dummyControl1.GetImplementation());
+    dummyImpl1.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual1);
+    dummyControl1.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl1);
 
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Ready the requested image after the first visual is on stage" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+    tet_infoline("Ready the requested image after the first visual is on stage");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    Visual::Base animatedImageVisual2 = factory.CreateVisual( animatedImageMap2 );
-    DummyControl dummyControl2 = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl2 = static_cast<Impl::DummyControl&>(dummyControl2.GetImplementation());
-    dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual2 );
-    dummyControl2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl2 );
+    Visual::Base        animatedImageVisual2 = factory.CreateVisual(animatedImageMap2);
+    DummyControl        dummyControl2        = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl2           = static_cast<Impl::DummyControl&>(dummyControl2.GetImplementation());
+    dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual2);
+    dummyControl2.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl2);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "The texture cache should be holding the requested images; check that the renderer has a texture" );
+    tet_infoline("The texture cache should be holding the requested images; check that the renderer has a texture");
     TextureSet ts = dummyControl2.GetRendererAt(0).GetTextures();
-    Texture t1 = ts.GetTexture( 0 );
-    DALI_TEST_EQUALS( ts.GetTextureCount(), 1, TEST_LOCATION );
+    Texture    t1 = ts.GetTexture(0);
+    DALI_TEST_EQUALS(ts.GetTextureCount(), 1, TEST_LOCATION);
 
-    tet_infoline( "Test that on the first tick, 1 new image is requested" );
+    tet_infoline("Test that on the first tick, 1 new image is requested");
     Test::EmitGlobalTimerSignal(); // Both visuals should tick
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 3, TEST_LOCATION);
 
-    ts = dummyControl2.GetRendererAt(0).GetTextures();
-    Texture t2 = ts.GetTexture( 0 );
-    DALI_TEST_CHECK( t1 != t2 );
+    ts         = dummyControl2.GetRendererAt(0).GetTextures();
+    Texture t2 = ts.GetTexture(0);
+    DALI_TEST_CHECK(t1 != t2);
 
     dummyControl1.Unparent();
     dummyControl2.Unparent();
@@ -1038,87 +1030,86 @@ int UtcDaliAnimatedImageVisualMultiImage03(void)
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualMultiImage04(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction&     gl           = application.GetGlAbstraction();
+  TraceCallStack&        textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
-  tet_infoline( "Test that if the cache size is the same as the number of urls, that once the cache is full, no new images are loaded" );
+  tet_infoline("Test that if the cache size is the same as the number of urls, that once the cache is full, no new images are loaded");
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 6);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 11);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 6);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 11);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    tet_infoline( "Expect that a batch of 7 textures has been requested." );
+    tet_infoline("Expect that a batch of 7 textures has been requested.");
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Wait for the first batch to complete" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 6 ), true, TEST_LOCATION );
+    tet_infoline("Wait for the first batch to complete");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(6), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 6, TEST_LOCATION );
-    tet_infoline( "Test that after 1 tick, and 5 file loads completed, that we have 11 textures" );
+    DALI_TEST_EQUALS(gl.GetLastGenTextureId(), 6, TEST_LOCATION);
+    tet_infoline("Test that after 1 tick, and 5 file loads completed, that we have 11 textures");
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
     // Expect the second batch has been requested
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 5 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(5), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 11, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 11, TEST_LOCATION);
 
-    tet_infoline( "Test that after 2 ticks that we have 11 textures and no requests" );
+    tet_infoline("Test that after 2 ticks that we have 11 textures and no requests");
 
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, 5 ), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 5), false, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 11, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 11, TEST_LOCATION);
 
-    tet_infoline( "Test that after 3rd tick that we have 11 textures and no requests" );
+    tet_infoline("Test that after 3rd tick that we have 11 textures and no requests");
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, 5 ), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1, 5), false, TEST_LOCATION);
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 11, TEST_LOCATION );
+    DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 11, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
@@ -1126,54 +1117,53 @@ int UtcDaliAnimatedImageVisualMultiImage04(void)
   tet_infoline("Test that removing the visual from stage deletes all textures");
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliAnimatedImageVisualMultiImage05(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
+  TestGlAbstraction&     gl = application.GetGlAbstraction();
 
-  tet_infoline( "Test that if the cache size is the same as the number of urls, that removing a partially loaded visual removes all textures" );
+  tet_infoline("Test that if the cache size is the same as the number of urls, that removing a partially loaded visual removes all textures");
 
   Property::Array urls;
-  CopyUrlsIntoArray( urls );
+  CopyUrlsIntoArray(urls);
 
   {
     Property::Map propertyMap;
-    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
-    propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
-    propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
-    propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 11);
-    propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
+    propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE);
+    propertyMap.Insert(ImageVisual::Property::URL, Property::Value(urls));
+    propertyMap.Insert(ImageVisual::Property::BATCH_SIZE, 4);
+    propertyMap.Insert(ImageVisual::Property::CACHE_SIZE, 11);
+    propertyMap.Insert(ImageVisual::Property::FRAME_DELAY, 100);
 
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual( propertyMap );
+    Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-    tet_infoline( "Expect that a batch of 4 textures has been requested." );
+    tet_infoline("Expect that a batch of 4 textures has been requested.");
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    application.GetScene().Add( dummyControl );
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Wait for the first batch to complete" );
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+    tet_infoline("Wait for the first batch to complete");
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
 
-    tet_infoline( "Test that a timer has been started" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been started");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     application.SendNotification();
     application.Render(16);
 
-    tet_infoline( "Test that a timer has been started" );
+    tet_infoline("Test that a timer has been started");
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
@@ -1183,64 +1173,64 @@ int UtcDaliAnimatedImageVisualMultiImage05(void)
 
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
-  tet_infoline( "Test that pending batch of image loads are cancelled instead of uploaded");
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 4 ), true, TEST_LOCATION );
+  tet_infoline("Test that pending batch of image loads are cancelled instead of uploaded");
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(4), true, TEST_LOCATION);
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION );
+  DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 0, TEST_LOCATION);
 
   END_TEST;
 }
 
-void TestLoopCount( ToolkitTestApplication &application, DummyControl &dummyControl, uint16_t frameCount, uint16_t loopCount, const char * location )
+void TestLoopCount(ToolkitTestApplication& application, DummyControl& dummyControl, uint16_t frameCount, uint16_t loopCount, const char* location)
 {
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
 
   textureTrace.Enable(true);
-  application.GetScene().Add( dummyControl );
+  application.GetScene().Add(dummyControl);
 
   application.SendNotification();
   application.Render(16);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_INNER_LOCATION( location ) );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_INNER_LOCATION(location));
 
   application.SendNotification();
   application.Render();
 
-  tet_infoline( "Test that a timer has been created" );
-  DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_INNER_LOCATION( location ) );
+  tet_infoline("Test that a timer has been created");
+  DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_INNER_LOCATION(location));
 
-  for ( uint16_t i = 0; i < loopCount; i++ )
+  for(uint16_t i = 0; i < loopCount; i++)
   {
-    for ( uint16_t j = 0; j < frameCount; j++ )
+    for(uint16_t j = 0; j < frameCount; j++)
     {
-      if( i == 0 && j == 0 )
+      if(i == 0 && j == 0)
       {
         continue; // Because first frame is already showed and we call 2nd frame at the first time of timer animation.
       }
-      tet_printf( "Test that after %u ticks, and we have %u frame \n", j + 1u, j + 1u );
+      tet_printf("Test that after %u ticks, and we have %u frame \n", j + 1u, j + 1u);
       Test::EmitGlobalTimerSignal();
       application.SendNotification();
       application.Render(16);
 
-      DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_INNER_LOCATION( location ) );
+      DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_INNER_LOCATION(location));
 
       application.SendNotification();
       application.Render();
-      DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_INNER_LOCATION( location ) );
-      DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_INNER_LOCATION( location ) );
+      DALI_TEST_EQUALS(gl.GetNumGeneratedTextures(), 2, TEST_INNER_LOCATION(location));
+      DALI_TEST_EQUALS(Test::AreTimersRunning(), true, TEST_INNER_LOCATION(location));
     }
-    tet_printf( "Test Loop %u \n\n", i + 1u );
+    tet_printf("Test Loop %u \n\n", i + 1u);
   }
 
-  tet_printf( "Test that after %u loops, and we have no frame. Timer should stop \n", loopCount );
+  tet_printf("Test that after %u loops, and we have no frame. Timer should stop \n", loopCount);
   Test::EmitGlobalTimerSignal();
   application.SendNotification();
   application.Render(16);
-  DALI_TEST_EQUALS( Test::AreTimersRunning(), false, TEST_INNER_LOCATION( location ) );
+  DALI_TEST_EQUALS(Test::AreTimersRunning(), false, TEST_INNER_LOCATION(location));
 
   dummyControl.Unparent();
 }
@@ -1249,29 +1239,29 @@ int UtcDaliAnimatedImageVisualLoopCount(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliAnimatedImageVisualLoopCount" );
+  tet_infoline("UtcDaliAnimatedImageVisualLoopCount");
 
   {
     // request AnimatedImageVisual with a property map
     // Test with no (0) loop count
-    VisualFactory factory = VisualFactory::Get();
-    Visual::Base animatedImageVisual = factory.CreateVisual(
+    VisualFactory factory             = VisualFactory::Get();
+    Visual::Base  animatedImageVisual = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-      .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-      .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-      .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-      .Add( DevelImageVisual::Property::LOOP_COUNT, 0 ));
+        .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+        .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+        .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+        .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+        .Add(DevelImageVisual::Property::LOOP_COUNT, 0));
 
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual );
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
-    TestLoopCount( application, dummyControl, 4, 0, TEST_LOCATION );
+    TestLoopCount(application, dummyControl, 4, 0, TEST_LOCATION);
 
-    dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
+    dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
     animatedImageVisual.Reset();
 
     application.SendNotification();
@@ -1280,18 +1270,18 @@ int UtcDaliAnimatedImageVisualLoopCount(void)
     // Test with no (1) loop count. Request AnimatedImageVisual with a property map
     animatedImageVisual = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-      .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-      .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-      .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-      .Add( DevelImageVisual::Property::LOOP_COUNT, 1 ));
+        .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+        .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+        .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+        .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+        .Add(DevelImageVisual::Property::LOOP_COUNT, 1));
 
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual );
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
 
-    TestLoopCount( application, dummyControl, 4, 1, TEST_LOCATION );
+    TestLoopCount(application, dummyControl, 4, 1, TEST_LOCATION);
 
-    dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL );
+    dummyImpl.UnregisterVisual(DummyControl::Property::TEST_VISUAL);
     animatedImageVisual.Reset();
 
     application.SendNotification();
@@ -1300,16 +1290,16 @@ int UtcDaliAnimatedImageVisualLoopCount(void)
     // Test with no (100) loop count. Request AnimatedImageVisual with a property map
     animatedImageVisual = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-      .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-      .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-      .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-      .Add( DevelImageVisual::Property::LOOP_COUNT, 100 ));
+        .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+        .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+        .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+        .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+        .Add(DevelImageVisual::Property::LOOP_COUNT, 100));
 
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual );
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
 
-    TestLoopCount( application, dummyControl, 4, 100, TEST_LOCATION );
+    TestLoopCount(application, dummyControl, 4, 100, TEST_LOCATION);
   }
   END_TEST;
 }
@@ -1317,90 +1307,90 @@ int UtcDaliAnimatedImageVisualLoopCount(void)
 int UtcDaliAnimatedImageVisualPlayback(void)
 {
   ToolkitTestApplication application;
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction&     gl           = application.GetGlAbstraction();
+  TraceCallStack&        textureTrace = gl.GetTextureTrace();
 
-  tet_infoline( "UtcDaliAnimatedImageVisualPlayback" );
+  tet_infoline("UtcDaliAnimatedImageVisualPlayback");
 
   {
     // request AnimatedImageVisual with a property map
     // Test with forever (-1) loop count
-    VisualFactory factory = VisualFactory::Get();
-    Visual::Base animatedImageVisual = factory.CreateVisual(
+    VisualFactory factory             = VisualFactory::Get();
+    Visual::Base  animatedImageVisual = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
-      .Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
-      .Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
-      .Add( ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT )
-      .Add( DevelImageVisual::Property::LOOP_COUNT, -1 ));
-
-    DummyControl dummyControl = DummyControl::New(true);
-    Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual );
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+        .Add(Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_GIF_FILE_NAME)
+        .Add(ImageVisual::Property::PIXEL_AREA, Vector4())
+        .Add(ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT)
+        .Add(ImageVisual::Property::WRAP_MODE_V, WrapMode::DEFAULT)
+        .Add(DevelImageVisual::Property::LOOP_COUNT, -1));
+
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, animatedImageVisual);
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
     textureTrace.Enable(true);
-    application.GetScene().Add( dummyControl );
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
 
-    tet_infoline( "Test that a timer has been created" );
-    DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION );
+    tet_infoline("Test that a timer has been created");
+    DALI_TEST_EQUALS(Test::GetTimerCount(), 1, TEST_LOCATION);
 
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), true, TEST_LOCATION);
 
     Property::Map attributes;
-    tet_infoline( "Test Pause action. Timer should stop after Pause action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PAUSE, attributes );
+    tet_infoline("Test Pause action. Timer should stop after Pause action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PAUSE, attributes);
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), false, TEST_LOCATION);
 
-    tet_infoline( "Test Play action. Timer should Restart after Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action. Timer should Restart after Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes);
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), true, TEST_LOCATION);
 
-    tet_infoline( "Test Stop action. Timer should stop after Stop action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, attributes );
+    tet_infoline("Test Stop action. Timer should stop after Stop action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, attributes);
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), false, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), false, TEST_LOCATION);
 
-    tet_infoline( "Test Play action. Timer should Restart after Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action. Timer should Restart after Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::PLAY, attributes);
     Test::EmitGlobalTimerSignal();
     application.SendNotification();
     application.Render(16);
 
-    DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION );
+    DALI_TEST_EQUALS(Test::AreTimersRunning(), true, TEST_LOCATION);
 
     dummyControl.Unparent();
   }
index 1eb713e..41028c1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
  * limitations under the License.
  */
 
-#include <iostream>
 #include <stdlib.h>
 #include <chrono>
+#include <iostream>
 #include <thread>
+
 #include <dali-toolkit-test-suite-utils.h>
-#include <toolkit-timer.h>
 #include <toolkit-event-thread-callback.h>
+#include <toolkit-timer.h>
 #include <toolkit-vector-animation-renderer.h>
+#include "dummy-control.h"
+
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-signals-devel.h>
-#include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali/devel-api/adaptor-framework/window-devel.h>
-#include "dummy-control.h"
+#include <dali/devel-api/rendering/renderer-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -49,49 +52,48 @@ void dali_animated_vector_image_visual_cleanup(void)
 
 namespace
 {
-
-const char* TEST_VECTOR_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/insta_camera.json";
+const char* TEST_VECTOR_IMAGE_FILE_NAME            = TEST_RESOURCE_DIR "/insta_camera.json";
 const char* TEST_VECTOR_IMAGE_FILE_NAME_FRAME_DROP = "framedrop.json";
-const char* TEST_VECTOR_IMAGE_INVALID_FILE_NAME  "invalid.json";
+const char* TEST_VECTOR_IMAGE_INVALID_FILE_NAME    = "invalid.json";
 
 bool gAnimationFinishedSignalFired = false;
 
-void VisualEventSignal( Control control, Dali::Property::Index visualIndex, Dali::Property::Index signalId )
+void VisualEventSignal(Control control, Dali::Property::Index visualIndex, Dali::Property::Index signalId)
 {
-  if( visualIndex == DummyControl::Property::TEST_VISUAL && signalId == DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED )
+  if(visualIndex == DummyControl::Property::TEST_VISUAL && signalId == DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED)
   {
     gAnimationFinishedSignalFired = true;
   }
 }
 
-}
+} // namespace
 
 int UtcDaliVisualFactoryGetAnimatedVectorImageVisual01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual01: Request animated vector image visual with a json url" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual01: Request animated vector image visual with a json url");
 
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base  visual  = factory.CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   // Test SetOffScene().
   actor.Unparent();
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -99,31 +101,31 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual01(void)
 int UtcDaliVisualFactoryGetAnimatedVectorImageVisual02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual02: Request animated vector image visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual02: Request animated vector image visual with a Property::Map");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -131,40 +133,40 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual02(void)
 int UtcDaliVisualFactoryGetAnimatedVectorImageVisual03(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual03: Request animated vector image visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual03: Request animated vector image visual with a Property::Map");
 
-  int startFrame = 1, endFrame = 3;
+  int             startFrame = 1, endFrame = 3;
   Property::Array playRange;
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, playRange  )
-             .Add( DevelVisual::Property::CORNER_RADIUS, 50.0f )
-             .Add( DevelVisual::Property::BORDERLINE_WIDTH, 20.0f );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, playRange)
+    .Add(DevelVisual::Property::CORNER_RADIUS, 50.0f)
+    .Add(DevelVisual::Property::BORDERLINE_WIDTH, 20.0f);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -172,106 +174,106 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual03(void)
 int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual04: Request animated vector image visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual04: Request animated vector image visual with a Property::Map");
 
-  int startFrame = 1, endFrame = 3;
-  float cornerRadius = 22.0f;
-  float borderlineWidth = 2.0f;
-  Vector4 borderlineColor = Vector4(1.0f, 1.0f, 1.0f, 1.0f);
-  float borderlineOffset = 0.1f;
+  int             startFrame = 1, endFrame = 3;
+  float           cornerRadius     = 22.0f;
+  float           borderlineWidth  = 2.0f;
+  Vector4         borderlineColor  = Vector4(1.0f, 1.0f, 1.0f, 1.0f);
+  float           borderlineOffset = 0.1f;
   Property::Array playRange;
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( "visualType", DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( "url", TEST_VECTOR_IMAGE_FILE_NAME )
-             .Add( "loopCount", 3 )
-             .Add( "playRange", playRange )
-             .Add( "stopBehavior", DevelImageVisual::StopBehavior::FIRST_FRAME )
-             .Add( "loopingMode", DevelImageVisual::LoopingMode::AUTO_REVERSE )
-             .Add( "redrawInScalingDown", false )
-             .Add( "cornerRadius", cornerRadius )
-             .Add( "borderlineWidth", borderlineWidth )
-             .Add( "borderlineColor", borderlineColor )
-             .Add( "borderlineOffset", borderlineOffset );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  propertyMap.Add("visualType", DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add("url", TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add("loopCount", 3)
+    .Add("playRange", playRange)
+    .Add("stopBehavior", DevelImageVisual::StopBehavior::FIRST_FRAME)
+    .Add("loopingMode", DevelImageVisual::LoopingMode::AUTO_REVERSE)
+    .Add("redrawInScalingDown", false)
+    .Add("cornerRadius", cornerRadius)
+    .Add("borderlineWidth", borderlineWidth)
+    .Add("borderlineColor", borderlineColor)
+    .Add("borderlineOffset", borderlineOffset);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - render a frame
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
 
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   Property::Map resultMap;
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( ImageVisual::Property::URL, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< std::string >() == TEST_VECTOR_IMAGE_FILE_NAME );
+  Property::Value* value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_VECTOR_IMAGE_FILE_NAME);
 
-  value = resultMap.Find( DevelImageVisual::Property::LOOP_COUNT, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == 3 );
+  value = resultMap.Find(DevelImageVisual::Property::LOOP_COUNT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 3);
 
-  value = resultMap.Find( DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY);
+  DALI_TEST_CHECK(value);
 
   Property::Array* result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == startFrame);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == endFrame);
 
-  value = resultMap.Find( DevelImageVisual::Property::STOP_BEHAVIOR, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::StopBehavior::FIRST_FRAME );
+  value = resultMap.Find(DevelImageVisual::Property::STOP_BEHAVIOR, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::StopBehavior::FIRST_FRAME);
 
-  value = resultMap.Find( DevelImageVisual::Property::LOOPING_MODE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::LoopingMode::AUTO_REVERSE );
+  value = resultMap.Find(DevelImageVisual::Property::LOOPING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::LoopingMode::AUTO_REVERSE);
 
-  value = resultMap.Find( DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< bool >() == false );
+  value = resultMap.Find(DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == false);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius), TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius), TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == Visual::Transform::Policy::ABSOLUTE );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::ABSOLUTE);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), borderlineWidth, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineWidth, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), borderlineColor, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), borderlineColor, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), borderlineOffset, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineOffset, TEST_LOCATION);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -279,120 +281,120 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void)
 int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualGetPropertyMap01" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualGetPropertyMap01");
 
-  int startFrame = 1, endFrame = 3;
-  Vector4 cornerRadius(50.0f, 22.0f, 0.0f, 3.0f);
-  float borderlineWidth = 2.3f;
-  Vector4 borderlineColor = Vector4(0.3f, 0.3f, 1.0f, 1.0f);
-  float borderlineOffset = 0.3f;
+  int             startFrame = 1, endFrame = 3;
+  Vector4         cornerRadius(50.0f, 22.0f, 0.0f, 3.0f);
+  float           borderlineWidth  = 2.3f;
+  Vector4         borderlineColor  = Vector4(0.3f, 0.3f, 1.0f, 1.0f);
+  float           borderlineOffset = 0.3f;
   Property::Array playRange;
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE,  DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3 )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, playRange )
-             .Add( DevelVisual::Property::CORNER_RADIUS, cornerRadius )
-             .Add( DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::RELATIVE)
-             .Add( DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth )
-             .Add( DevelVisual::Property::BORDERLINE_COLOR, borderlineColor )
-             .Add( DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, playRange)
+    .Add(DevelVisual::Property::CORNER_RADIUS, cornerRadius)
+    .Add(DevelVisual::Property::CORNER_RADIUS_POLICY, Visual::Transform::Policy::RELATIVE)
+    .Add(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth)
+    .Add(DevelVisual::Property::BORDERLINE_COLOR, borderlineColor)
+    .Add(DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset);
 
   // request AnimatedVectorImageVisual with a property map
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( propertyMap );
+  Visual::Base  visual  = factory.CreateVisual(propertyMap);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
   Property::Map resultMap;
-  resultMap = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
+  resultMap = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelVisual::ANIMATED_VECTOR_IMAGE );
+  Property::Value* value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelVisual::ANIMATED_VECTOR_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< std::string >() == TEST_VECTOR_IMAGE_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_VECTOR_IMAGE_FILE_NAME);
 
-  value = resultMap.Find( DevelImageVisual::Property::LOOP_COUNT, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == 3 );
+  value = resultMap.Find(DevelImageVisual::Property::LOOP_COUNT, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == 3);
 
-  value = resultMap.Find( DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY);
+  DALI_TEST_CHECK(value);
 
   Property::Array* result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == startFrame);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == endFrame);
 
-  value = resultMap.Find( DevelImageVisual::Property::STOP_BEHAVIOR, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::StopBehavior::CURRENT_FRAME );
+  value = resultMap.Find(DevelImageVisual::Property::STOP_BEHAVIOR, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::StopBehavior::CURRENT_FRAME);
 
-  value = resultMap.Find( DevelImageVisual::Property::LOOPING_MODE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::LoopingMode::RESTART );
+  value = resultMap.Find(DevelImageVisual::Property::LOOPING_MODE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::LoopingMode::RESTART);
 
-  value = resultMap.Find( DevelImageVisual::Property::CONTENT_INFO, Property::MAP );
-  DALI_TEST_CHECK( value );
+  value = resultMap.Find(DevelImageVisual::Property::CONTENT_INFO, Property::MAP);
+  DALI_TEST_CHECK(value);
 
-  value = resultMap.Find( DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, Property::BOOLEAN );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< bool >() == true );    // Check default value
+  value = resultMap.Find(DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, Property::BOOLEAN);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<bool>() == true); // Check default value
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), cornerRadius, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), cornerRadius, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == Visual::Transform::Policy::RELATIVE );
+  value = resultMap.Find(DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == Visual::Transform::Policy::RELATIVE);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth" );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), borderlineWidth, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_WIDTH, "borderlineWidth");
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineWidth, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), borderlineColor, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), borderlineColor, TEST_LOCATION);
 
-  value = resultMap.Find( DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), borderlineOffset, TEST_LOCATION );
+  value = resultMap.Find(DevelVisual::Property::BORDERLINE_OFFSET, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), borderlineOffset, TEST_LOCATION);
 
   // request AnimatedVectorImageVisual with an URL
-  Visual::Base visual2 = factory.CreateVisual( TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions() );
+  Visual::Base visual2 = factory.CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions());
 
   resultMap.Clear();
-  visual2.CreatePropertyMap( resultMap );
+  visual2.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelVisual::ANIMATED_VECTOR_IMAGE );
+  value = resultMap.Find(Toolkit::Visual::Property::TYPE, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelVisual::ANIMATED_VECTOR_IMAGE);
 
-  value = resultMap.Find( ImageVisual::Property::URL, Property::STRING );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< std::string >() == TEST_VECTOR_IMAGE_FILE_NAME );
+  value = resultMap.Find(ImageVisual::Property::URL, Property::STRING);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<std::string>() == TEST_VECTOR_IMAGE_FILE_NAME);
 
   END_TEST;
 }
@@ -401,123 +403,123 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void)
 {
   ToolkitTestApplication application;
 
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualPlayback" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualPlayback");
 
   {
     // request AnimatedVectorImageVisual with a property map
     VisualFactory factory = VisualFactory::Get();
-    Visual::Base visual = factory.CreateVisual(
+    Visual::Base  visual  = factory.CreateVisual(
       Property::Map()
-      .Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-      .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME ) );
+        .Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+        .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME));
 
-    DummyControl dummyControl = DummyControl::New( true );
-    Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummyControl.GetImplementation() );
-    dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-    dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    DummyControl        dummyControl = DummyControl::New(true);
+    Impl::DummyControl& dummyImpl    = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+    dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+    dummyControl.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
     Property::Map attributes;
-    tet_infoline( "Test Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
-    application.GetScene().Add( dummyControl );
+    application.GetScene().Add(dummyControl);
     application.SendNotification();
-    application.Render( 16 );
+    application.Render(16);
 
-    Property::Map map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING );
+    Property::Map    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PLAYING);
 
-    tet_infoline( "Test Pause action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes );
+    tet_infoline("Test Pause action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PAUSED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PAUSED);
 
-    tet_infoline( "Test Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PLAYING);
 
-    tet_infoline( "Test Stop action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
+    tet_infoline("Test Stop action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-    tet_infoline( "Test Stop action again" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
+    tet_infoline("Test Stop action again");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-    tet_infoline( "Test Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PLAYING);
 
-    tet_infoline( "Off stage" );
+    tet_infoline("Off stage");
     dummyControl.Unparent();
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-    tet_infoline( "On stage again" );
-    application.GetScene().Add( dummyControl );
+    tet_infoline("On stage again");
+    application.GetScene().Add(dummyControl);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-    tet_infoline( "Test Play action" );
-    DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+    tet_infoline("Test Play action");
+    DevelControl::DoAction(dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
     application.SendNotification();
     application.Render(16);
 
-    map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-    value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-    DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING );
+    map   = dummyControl.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+    value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+    DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::PLAYING);
 
     // Change Size
-    Vector3 newSize( 100.0f, 100.0f, 0.0f );
-    dummyControl.SetProperty( Actor::Property::SIZE, newSize );
+    Vector3 newSize(100.0f, 100.0f, 0.0f);
+    dummyControl.SetProperty(Actor::Property::SIZE, newSize);
 
     application.SendNotification();
     application.Render(16);
 
     // Size should be changed
     Vector3 naturalSize = dummyControl.GetNaturalSize();
-    DALI_TEST_CHECK( naturalSize == newSize );
+    DALI_TEST_CHECK(naturalSize == newSize);
 
     dummyControl.Unparent();
   }
@@ -528,48 +530,48 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void)
 int UtcDaliAnimatedVectorImageVisualCustomShader(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualCustomShader Test custom shader" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualCustomShader Test custom shader");
 
-  VisualFactory factory = VisualFactory::Get();
-  Property::Map properties;
-  Property::Map shader;
-  const std::string vertexShader = "Foobar";
-  const std::string fragmentShader = "Foobar sampler2D Foobar";
+  VisualFactory     factory = VisualFactory::Get();
+  Property::Map     properties;
+  Property::Map     shader;
+  const std::string vertexShader                    = "Foobar";
+  const std::string fragmentShader                  = "Foobar sampler2D Foobar";
   shader[Visual::Shader::Property::FRAGMENT_SHADER] = fragmentShader;
-  shader[Visual::Shader::Property::VERTEX_SHADER] = vertexShader;
+  shader[Visual::Shader::Property::VERTEX_SHADER]   = vertexShader;
 
-  properties[Visual::Property::TYPE] = Visual::IMAGE;
-  properties[Visual::Property::SHADER] = shader;
+  properties[Visual::Property::TYPE]     = Visual::IMAGE;
+  properties[Visual::Property::SHADER]   = shader;
   properties[ImageVisual::Property::URL] = TEST_VECTOR_IMAGE_FILE_NAME;
 
-  Visual::Base visual = factory.CreateVisual( properties );
+  Visual::Base visual = factory.CreateVisual(properties);
 
   // trigger creation through setting on stage
-  DummyControl dummy = DummyControl::New( true );
-  Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl        dummy     = DummyControl::New(true);
+  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummy.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  application.GetScene().Add( dummy );
+  dummy.SetProperty(Actor::Property::SIZE, Vector2(200.f, 200.f));
+  dummy.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(dummy);
 
   application.SendNotification();
   application.Render();
 
-  Renderer renderer = dummy.GetRendererAt( 0 );
-  Shader shader2 = renderer.GetShader();
-  Property::Value value = shader2.GetProperty( Shader::Property::PROGRAM );
-  Property::Map* map = value.GetMap();
-  DALI_TEST_CHECK( map );
+  Renderer        renderer = dummy.GetRendererAt(0);
+  Shader          shader2  = renderer.GetShader();
+  Property::Value value    = shader2.GetProperty(Shader::Property::PROGRAM);
+  Property::Map*  map      = value.GetMap();
+  DALI_TEST_CHECK(map);
 
-  std::string resultFragmentShader, resultVertexShader;
-  Property::Value* fragment = map->Find( "fragment" ); // fragment key name from shader-impl.cpp
-  fragment->Get( resultFragmentShader );
-  DALI_TEST_CHECK( resultFragmentShader.find( fragmentShader ) != std::string::npos );
+  std::string      resultFragmentShader, resultVertexShader;
+  Property::Value* fragment = map->Find("fragment"); // fragment key name from shader-impl.cpp
+  fragment->Get(resultFragmentShader);
+  DALI_TEST_CHECK(resultFragmentShader.find(fragmentShader) != std::string::npos);
 
-  Property::Value* vertex = map->Find( "vertex" ); // vertex key name from shader-impl.cpp
-  vertex->Get( resultVertexShader );
-  DALI_TEST_CHECK( resultVertexShader.find( vertexShader ) != std::string::npos );
+  Property::Value* vertex = map->Find("vertex"); // vertex key name from shader-impl.cpp
+  vertex->Get(resultVertexShader);
+  DALI_TEST_CHECK(resultVertexShader.find(vertexShader) != std::string::npos);
 
   END_TEST;
 }
@@ -577,36 +579,36 @@ int UtcDaliAnimatedVectorImageVisualCustomShader(void)
 int UtcDaliAnimatedVectorImageVisualNaturalSize(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualNaturalSize" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualNaturalSize");
 
   VisualFactory factory = VisualFactory::Get();
-  Visual::Base visual = factory.CreateVisual( TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions() );
-  DALI_TEST_CHECK( visual );
+  Visual::Base  visual  = factory.CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions());
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
+  Vector2 controlSize(20.f, 30.f);
   Vector2 naturalSize;
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  visual.GetNaturalSize( naturalSize );
+  visual.GetNaturalSize(naturalSize);
 
-  DALI_TEST_EQUALS( naturalSize, Vector2( 100.0f, 100.0f ), TEST_LOCATION );    // 100x100 is the content default size.
+  DALI_TEST_EQUALS(naturalSize, Vector2(100.0f, 100.0f), TEST_LOCATION); // 100x100 is the content default size.
 
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
   application.SendNotification();
   application.Render();
 
-  visual.GetNaturalSize( naturalSize );
+  visual.GetNaturalSize(naturalSize);
 
-  DALI_TEST_EQUALS( naturalSize, controlSize, TEST_LOCATION );
+  DALI_TEST_EQUALS(naturalSize, controlSize, TEST_LOCATION);
 
   END_TEST;
 }
@@ -614,38 +616,38 @@ int UtcDaliAnimatedVectorImageVisualNaturalSize(void)
 int UtcDaliAnimatedVectorImageVisualLoopCount(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualLoopCount" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualLoopCount");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - render a frame
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   END_TEST;
 }
@@ -653,119 +655,119 @@ int UtcDaliAnimatedVectorImageVisualLoopCount(void)
 int UtcDaliAnimatedVectorImageVisualPlayRange(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualPlayRange" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualPlayRange");
 
-  int startFrame = 1, endFrame = 3;
+  int             startFrame = 1, endFrame = 3;
   Property::Array array;
-  array.PushBack( endFrame );
-  array.PushBack( startFrame );
+  array.PushBack(endFrame);
+  array.PushBack(startFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, array  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, array);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
-  int resultStartFrame, resultEndFrame;
+  int              resultStartFrame, resultEndFrame;
   Property::Array* result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( startFrame, resultStartFrame, TEST_LOCATION );
-  DALI_TEST_EQUALS( endFrame, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(startFrame, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(endFrame, resultEndFrame, TEST_LOCATION);
 
   // Set invalid play range
   array.Clear();
-  array.PushBack( 1 );
-  array.PushBack( 100 );
+  array.PushBack(1);
+  array.PushBack(100);
 
   attributes.Clear();
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( startFrame, resultStartFrame, TEST_LOCATION );  // Should not be changed
-  DALI_TEST_EQUALS( endFrame, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(startFrame, resultStartFrame, TEST_LOCATION); // Should not be changed
+  DALI_TEST_EQUALS(endFrame, resultEndFrame, TEST_LOCATION);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, Property::Map() );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, Property::Map());
 
   application.SendNotification();
   application.Render();
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 3, TEST_LOCATION);
 
   array.Clear();
-  array.PushBack( 0 );
-  array.PushBack( 2 );
+  array.PushBack(0);
+  array.PushBack(2);
 
   attributes.Clear();
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( 0, resultStartFrame, TEST_LOCATION );
-  DALI_TEST_EQUALS( 2, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(0, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(2, resultEndFrame, TEST_LOCATION);
 
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION );    // CURRENT_FRAME_NUMBER should be changed also.
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION); // CURRENT_FRAME_NUMBER should be changed also.
 
   END_TEST;
 }
@@ -773,99 +775,99 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void)
 int UtcDaliAnimatedVectorImageVisualPlayRangeMarker(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualPlayRangeMarker" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualPlayRangeMarker");
 
   Property::Array array;
-  array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 );
+  array.PushBack(VECTOR_ANIMATION_MARKER_NAME_1);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, array  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, array);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
-  int resultStartFrame, resultEndFrame;
+  int              resultStartFrame, resultEndFrame;
   Property::Array* result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION );
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_1, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_1, resultEndFrame, TEST_LOCATION);
 
   // Set 2 markers
   array.Clear();
-  array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 );
-  array.PushBack( VECTOR_ANIMATION_MARKER_NAME_2 );
+  array.PushBack(VECTOR_ANIMATION_MARKER_NAME_1);
+  array.PushBack(VECTOR_ANIMATION_MARKER_NAME_2);
 
   attributes.Clear();
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION );
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION);
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION);
 
   // Set invalid play range
   array.Clear();
-  array.PushBack( 1 );
-  array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 );
+  array.PushBack(1);
+  array.PushBack(VECTOR_ANIMATION_MARKER_NAME_1);
 
   attributes.Clear();
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  result->GetElementAt( 0 ).Get( resultStartFrame );
-  result->GetElementAt( 1 ).Get( resultEndFrame );
+  result->GetElementAt(0).Get(resultStartFrame);
+  result->GetElementAt(1).Get(resultEndFrame);
 
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION );  // Should not be changed
-  DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION );
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION); // Should not be changed
+  DALI_TEST_EQUALS(VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION);
 
   END_TEST;
 }
@@ -873,41 +875,41 @@ int UtcDaliAnimatedVectorImageVisualPlayRangeMarker(void)
 int UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  DevelControl::VisualEventSignal( actor ).Connect( &VisualEventSignal );
+  DevelControl::VisualEventSignal(actor).Connect(&VisualEventSignal);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Wait for animation finish
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_STATE );
-  DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_STATE);
+  DALI_TEST_CHECK(value->Get<int>() == DevelImageVisual::PlayState::STOPPED);
 
-  DALI_TEST_EQUALS( gAnimationFinishedSignalFired, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gAnimationFinishedSignalFired, true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -915,108 +917,108 @@ int UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal(void)
 int UtcDaliAnimatedVectorImageVisualJumpTo(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualJumpTo" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualJumpTo");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  tet_printf( "1. Visual is created.\n" );
+  tet_printf("1. Visual is created.\n");
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 2 );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 2);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION);
 
-  tet_printf( "2. The current frame number is [%d].\n", value->Get< int >() );
+  tet_printf("2. The current frame number is [%d].\n", value->Get<int>());
 
   Property::Array array;
-  array.PushBack( 0 );
-  array.PushBack( 2 );
+  array.PushBack(0);
+  array.PushBack(2);
 
   Property::Map attributes;
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 2, TEST_LOCATION);
 
-  tet_printf( "3. The current frame number is [%d].\n", value->Get< int >() );
+  tet_printf("3. The current frame number is [%d].\n", value->Get<int>());
 
   // Change play range
   attributes.Clear();
   array.Clear();
 
-  array.PushBack( 0 );
-  array.PushBack( 4 );
+  array.PushBack(0);
+  array.PushBack(4);
 
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, array);
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   attributes.Clear();
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Stop and jump to 3
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 3, TEST_LOCATION);
 
-  tet_printf( "4. The current frame number is [%d].\n", value->Get< int >() );
+  tet_printf("4. The current frame number is [%d].\n", value->Get<int>());
 
   // Jump to the same position
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 3, TEST_LOCATION);
 
-  tet_printf( "5. The current frame number is [%d].\n", value->Get< int >() );
+  tet_printf("5. The current frame number is [%d].\n", value->Get<int>());
 
   END_TEST;
 }
@@ -1024,116 +1026,116 @@ int UtcDaliAnimatedVectorImageVisualJumpTo(void)
 int UtcDaliAnimatedVectorImageVisualUpdateProperty(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualUpdateProperty" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualUpdateProperty");
 
-  int startFrame = 1, endFrame = 3;
+  int             startFrame = 1, endFrame = 3;
   Property::Array playRange;
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3  )
-             .Add( DevelImageVisual::Property::PLAY_RANGE, playRange  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::PLAY_RANGE, playRange);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::LOOP_COUNT );
-  DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::LOOP_COUNT);
+  DALI_TEST_EQUALS(value->Get<int>(), 3, TEST_LOCATION);
 
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY );
-  DALI_TEST_CHECK( value );
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY);
+  DALI_TEST_CHECK(value);
 
   Property::Array* result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == startFrame);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == endFrame);
 
   playRange.Clear();
-  playRange.PushBack( 0 );
-  playRange.PushBack( 2 );
+  playRange.PushBack(0);
+  playRange.PushBack(2);
 
   Property::Map attributes;
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
-  attributes.Add( DevelImageVisual::Property::LOOP_COUNT, 5 );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, playRange);
+  attributes.Add(DevelImageVisual::Property::LOOP_COUNT, 5);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::LOOP_COUNT );
-  DALI_TEST_EQUALS( value->Get< int >(), 5, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::LOOP_COUNT);
+  DALI_TEST_EQUALS(value->Get<int>(), 5, TEST_LOCATION);
 
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  value  = map.Find(DevelImageVisual::Property::PLAY_RANGE);
   result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == 0 );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == 2 );
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == 0);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == 2);
 
   attributes.Clear();
 
   playRange.Clear();
-  playRange.PushBack( startFrame );
-  playRange.PushBack( endFrame );
+  playRange.PushBack(startFrame);
+  playRange.PushBack(endFrame);
 
-  attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
+  attributes.Add(DevelImageVisual::Property::PLAY_RANGE, playRange);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );    // wait for next rasterize thread run
+  std::this_thread::sleep_for(std::chrono::milliseconds(20)); // wait for next rasterize thread run
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::PLAY_RANGE);
 
   result = value->GetArray();
-  DALI_TEST_CHECK( result );
+  DALI_TEST_CHECK(result);
 
-  DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
-  DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
+  DALI_TEST_CHECK(result->GetElementAt(0).Get<int>() == startFrame);
+  DALI_TEST_CHECK(result->GetElementAt(1).Get<int>() == endFrame);
 
   // Play and update property
   attributes.Clear();
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  attributes.Add( DevelImageVisual::Property::LOOP_COUNT, 10 );
+  attributes.Add(DevelImageVisual::Property::LOOP_COUNT, 10);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::LOOP_COUNT );
-  DALI_TEST_EQUALS( value->Get< int >(), 10, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::LOOP_COUNT);
+  DALI_TEST_EQUALS(value->Get<int>(), 10, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1141,93 +1143,93 @@ int UtcDaliAnimatedVectorImageVisualUpdateProperty(void)
 int UtcDaliAnimatedVectorImageVisualStopBehavior(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualStopBehavior" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualStopBehavior");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3 )
-             .Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::FIRST_FRAME);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 0, TEST_LOCATION );  // Should be the first frame
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 0, TEST_LOCATION); // Should be the first frame
 
   // Change stop behavior
-  attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME );
+  attributes.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   attributes.Clear();
 
   // Play again
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
+  map = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
 
-  Property::Value* value1 = map.Find( DevelImageVisual::Property::TOTAL_FRAME_NUMBER );
-  int totalFrameNumber = value1->Get< int >();
+  Property::Value* value1           = map.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER);
+  int              totalFrameNumber = value1->Get<int>();
 
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), totalFrameNumber - 1, TEST_LOCATION );  // Should be the last frame
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), totalFrameNumber - 1, TEST_LOCATION); // Should be the last frame
 
   // Change stop behavior
-  attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME );
-  attributes.Add( DevelImageVisual::Property::LOOP_COUNT, -1 );
+  attributes.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME);
+  attributes.Add(DevelImageVisual::Property::LOOP_COUNT, -1);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   attributes.Clear();
 
   // Play again
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Pause
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PAUSE, attributes);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  int currentFrameNumber = value->Get< int >();
+  map                    = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value                  = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  int currentFrameNumber = value->Get<int>();
 
   // Stop
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes);
 
   application.SendNotification();
-  application.Render( 16 );
+  application.Render(16);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), currentFrameNumber, TEST_LOCATION );  // Should be same with currentFrameNumber
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), currentFrameNumber, TEST_LOCATION); // Should be same with currentFrameNumber
 
   END_TEST;
 }
@@ -1235,78 +1237,78 @@ int UtcDaliAnimatedVectorImageVisualStopBehavior(void)
 int UtcDaliAnimatedVectorImageVisualLoopingMode(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualLoopingMode" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualLoopingMode");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME )
-             .Add( DevelImageVisual::Property::LOOP_COUNT, 3 )
-             .Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME )
-             .Add( DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::AUTO_REVERSE );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME)
+    .Add(DevelImageVisual::Property::LOOP_COUNT, 3)
+    .Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME)
+    .Add(DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::AUTO_REVERSE);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(2), true, TEST_LOCATION);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 0, TEST_LOCATION );  // Should be the first frame because of auto reverse
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 0, TEST_LOCATION); // Should be the first frame because of auto reverse
 
   // Change stop behavior
-  attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME );
+  attributes.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   // Play again
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), 0, TEST_LOCATION );  // Should be the first frame
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), 0, TEST_LOCATION); // Should be the first frame
 
   // Change looping mode
-  attributes.Add( DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::RESTART );
+  attributes.Add(DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::RESTART);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   // Play again
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Trigger count is 1 - animation finished
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION);
 
-  Property::Value* value1 = map.Find( DevelImageVisual::Property::TOTAL_FRAME_NUMBER );
-  int totalFrameNumber = value1->Get< int >();
+  Property::Value* value1           = map.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER);
+  int              totalFrameNumber = value1->Get<int>();
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
-  DALI_TEST_EQUALS( value->Get< int >(), totalFrameNumber - 1, TEST_LOCATION );  // Should be the last frame
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelImageVisual::Property::CURRENT_FRAME_NUMBER);
+  DALI_TEST_EQUALS(value->Get<int>(), totalFrameNumber - 1, TEST_LOCATION); // Should be the last frame
 
   END_TEST;
 }
@@ -1314,25 +1316,25 @@ int UtcDaliAnimatedVectorImageVisualLoopingMode(void)
 int UtcDaliAnimatedVectorImageVisualPropertyNotification(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualPropertyNotification" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualPropertyNotification");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME  );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  Vector3 controlScale( 2.0f, 2.0f, 1.0f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
-  actor.SetProperty( Actor::Property::SCALE, controlScale );
+  Vector2 controlSize(20.f, 30.f);
+  Vector3 controlScale(2.0f, 2.0f, 1.0f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+  actor.SetProperty(Actor::Property::SCALE, controlScale);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
@@ -1340,20 +1342,20 @@ int UtcDaliAnimatedVectorImageVisualPropertyNotification(void)
   application.SendNotification();
   application.Render();
 
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   auto textureSet = renderer.GetTextures();
-  auto texture = textureSet.GetTexture(0);
+  auto texture    = textureSet.GetTexture(0);
 
-  DALI_TEST_EQUALS( controlSize.width * controlScale.width, texture.GetWidth(), TEST_LOCATION );
-  DALI_TEST_EQUALS( controlSize.height * controlScale.height, texture.GetHeight(), TEST_LOCATION );
+  DALI_TEST_EQUALS(controlSize.width * controlScale.width, texture.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(controlSize.height * controlScale.height, texture.GetHeight(), TEST_LOCATION);
 
   // Change scale and size
-  controlSize = Vector2( 50.f, 40.f );
-  controlScale= Vector3( 0.5f, 0.5f, 1.0f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
-  actor.SetProperty( Actor::Property::SCALE, controlScale );
+  controlSize  = Vector2(50.f, 40.f);
+  controlScale = Vector3(0.5f, 0.5f, 1.0f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
+  actor.SetProperty(Actor::Property::SCALE, controlScale);
 
   application.SendNotification();
   application.Render();
@@ -1361,14 +1363,14 @@ int UtcDaliAnimatedVectorImageVisualPropertyNotification(void)
   application.SendNotification();
   application.Render();
 
-  renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   textureSet = renderer.GetTextures();
-  texture = textureSet.GetTexture(0);
+  texture    = textureSet.GetTexture(0);
 
-  DALI_TEST_EQUALS( controlSize.width * controlScale.width, texture.GetWidth(), TEST_LOCATION );
-  DALI_TEST_EQUALS( controlSize.height * controlScale.height, texture.GetHeight(), TEST_LOCATION );
+  DALI_TEST_EQUALS(controlSize.width * controlScale.width, texture.GetWidth(), TEST_LOCATION);
+  DALI_TEST_EQUALS(controlSize.height * controlScale.height, texture.GetHeight(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1376,63 +1378,63 @@ int UtcDaliAnimatedVectorImageVisualPropertyNotification(void)
 int UtcDaliAnimatedVectorImageVisualMultipleInstances(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualMultipleInstances" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualMultipleInstances");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  Visual::Base visual1 = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual1 );
+  Visual::Base visual1 = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual1);
 
-  DummyControl actor1 = DummyControl::New( true );
-  DummyControlImpl& dummyImpl1 = static_cast< DummyControlImpl& >( actor1.GetImplementation() );
-  dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual1 );
+  DummyControl      actor1     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl1 = static_cast<DummyControlImpl&>(actor1.GetImplementation());
+  dummyImpl1.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual1);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor1.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor1.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor1 );
+  application.GetScene().Add(actor1);
 
   propertyMap.Clear();
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  Visual::Base visual2 = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual2 );
+  Visual::Base visual2 = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual2);
 
-  DummyControl actor2 = DummyControl::New( true );
-  DummyControlImpl& dummyImpl2 = static_cast< DummyControlImpl& >( actor2.GetImplementation() );
-  dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual2 );
+  DummyControl      actor2     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl2 = static_cast<DummyControlImpl&>(actor2.GetImplementation());
+  dummyImpl2.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual2);
 
-  actor2.SetProperty( Actor::Property::SIZE, controlSize );
+  actor2.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor2 );
+  application.GetScene().Add(actor2);
 
-  DevelControl::DoAction( actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map() );
+  DevelControl::DoAction(actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map());
 
   application.SendNotification();
   application.Render();
 
-  std::this_thread::sleep_for( std::chrono::milliseconds( 200 ) );
+  std::this_thread::sleep_for(std::chrono::milliseconds(200));
 
   Property::Map attributes;
-  attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME );
+  attributes.Add(DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME);
 
-  DevelControl::DoAction( actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
-  DevelControl::DoAction( actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
+  DevelControl::DoAction(actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
-  DevelControl::DoAction( actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map() );
+  DevelControl::DoAction(actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map());
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor1.GetRendererCount() == 1u );
-  Renderer renderer1 = actor1.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer1 );
+  DALI_TEST_CHECK(actor1.GetRendererCount() == 1u);
+  Renderer renderer1 = actor1.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer1);
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor2.GetRendererCount() == 1u );
-  Renderer renderer2 = actor2.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer2 );
+  DALI_TEST_CHECK(actor2.GetRendererCount() == 1u);
+  Renderer renderer2 = actor2.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer2);
 
   END_TEST;
 }
@@ -1440,46 +1442,46 @@ int UtcDaliAnimatedVectorImageVisualMultipleInstances(void)
 int UtcDaliAnimatedVectorImageVisualControlVisibilityChanged(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualControlVisibilityChanged" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualControlVisibilityChanged");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Check rendering behavior
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
-  DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::CONTINUOUSLY );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  DALI_TEST_CHECK(renderer.GetProperty<int>(DevelRenderer::Property::RENDERING_BEHAVIOR) == DevelRenderer::Rendering::CONTINUOUSLY);
 
-  actor.SetProperty( Actor::Property::VISIBLE, false );
+  actor.SetProperty(Actor::Property::VISIBLE, false);
 
   application.SendNotification();
   application.Render();
 
   // Check rendering behavior again
-  DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::IF_REQUIRED );
+  DALI_TEST_CHECK(renderer.GetProperty<int>(DevelRenderer::Property::RENDERING_BEHAVIOR) == DevelRenderer::Rendering::IF_REQUIRED);
 
   END_TEST;
 }
@@ -1487,47 +1489,47 @@ int UtcDaliAnimatedVectorImageVisualControlVisibilityChanged(void)
 int UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged" );
+  tet_infoline("UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
-             .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  Vector2 controlSize( 20.f, 30.f );
-  actor.SetProperty( Actor::Property::SIZE, controlSize );
+  Vector2 controlSize(20.f, 30.f);
+  actor.SetProperty(Actor::Property::SIZE, controlSize);
 
-  application.GetScene().Add( actor );
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   Property::Map attributes;
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
 
   application.SendNotification();
   application.Render();
 
   // Check rendering behavior
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
-  DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::CONTINUOUSLY );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
+  DALI_TEST_CHECK(renderer.GetProperty<int>(DevelRenderer::Property::RENDERING_BEHAVIOR) == DevelRenderer::Rendering::CONTINUOUSLY);
 
-  Window window = DevelWindow::Get( actor );
+  Window window = DevelWindow::Get(actor);
   window.Hide();
 
   application.SendNotification();
   application.Render();
 
   // Check rendering behavior again
-  DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::IF_REQUIRED );
+  DALI_TEST_CHECK(renderer.GetProperty<int>(DevelRenderer::Property::RENDERING_BEHAVIOR) == DevelRenderer::Rendering::IF_REQUIRED);
 
   END_TEST;
 }
@@ -1537,19 +1539,19 @@ int UtcDaliAnimatedVectorImageVisualInvalidFile(void)
   ToolkitTestApplication application;
   tet_infoline("Request loading with invalid file - should draw broken image");
 
-  TestGlAbstraction& gl = application.GetGlAbstraction();
-  TraceCallStack& textureTrace = gl.GetTextureTrace();
+  TestGlAbstraction& gl           = application.GetGlAbstraction();
+  TraceCallStack&    textureTrace = gl.GetTextureTrace();
   textureTrace.Enable(true);
 
   Property::Map propertyMap;
   propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
-             .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_INVALID_FILE_NAME);
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_INVALID_FILE_NAME);
 
   Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
   DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New(true);
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >(actor.GetImplementation());
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
   actor.SetProperty(Actor::Property::SIZE, Vector2(20.0f, 20.0f));
@@ -1577,12 +1579,12 @@ int UtcDaliAnimatedVectorImageVisualFrameDrops(void)
 
   Property::Map propertyMap;
   propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE)
-             .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME_FRAME_DROP);
+    .Add(ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME_FRAME_DROP);
 
   Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
   DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New(true);
+  DummyControl      actor     = DummyControl::New(true);
   DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
   dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
@@ -1591,9 +1593,9 @@ int UtcDaliAnimatedVectorImageVisualFrameDrops(void)
 
   application.GetScene().Add(actor);
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelImageVisual::Property::TOTAL_FRAME_NUMBER );
-  int totalFrameNumber = value->Get< int >();
+  Property::Map    map              = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value            = map.Find(DevelImageVisual::Property::TOTAL_FRAME_NUMBER);
+  int              totalFrameNumber = value->Get<int>();
 
   Property::Map attributes;
   DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes);
index 146a1b5..89add36 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
  * limitations under the License.
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h>
 #include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali/devel-api/rendering/renderer-devel.h>
+#include <stdlib.h>
+#include <iostream>
 #include "dummy-control.h"
 
 using namespace Dali;
@@ -42,32 +42,32 @@ void dali_arc_visual_cleanup(void)
 int UtcDaliVisualFactoryGetArcVisual01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetArcVisual01: Request arc visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetArcVisual01: Request arc visual with a Property::Map");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ARC )
-             .Add( Visual::Property::MIX_COLOR, Color::RED )
-             .Add( DevelArcVisual::Property::THICKNESS, 20.0f );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ARC)
+    .Add(Visual::Property::MIX_COLOR, Color::RED)
+    .Add(DevelArcVisual::Property::THICKNESS, 20.0f);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -75,35 +75,35 @@ int UtcDaliVisualFactoryGetArcVisual01(void)
 int UtcDaliVisualFactoryGetArcVisual02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliVisualFactoryGetArcVisual02: Request arc visual with a Property::Map" );
+  tet_infoline("UtcDaliVisualFactoryGetArcVisual02: Request arc visual with a Property::Map");
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ARC )
-             .Add( Visual::Property::MIX_COLOR, Color::RED )
-             .Add( DevelArcVisual::Property::THICKNESS, 20.0f )
-             .Add( DevelArcVisual::Property::START_ANGLE, 0.0f )
-             .Add( DevelArcVisual::Property::SWEEP_ANGLE, 90.0f )
-             .Add( DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ARC)
+    .Add(Visual::Property::MIX_COLOR, Color::RED)
+    .Add(DevelArcVisual::Property::THICKNESS, 20.0f)
+    .Add(DevelArcVisual::Property::START_ANGLE, 0.0f)
+    .Add(DevelArcVisual::Property::SWEEP_ANGLE, 90.0f)
+    .Add(DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -111,89 +111,89 @@ int UtcDaliVisualFactoryGetArcVisual02(void)
 int UtcDaliArcVisualGetPropertyMap01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliArcVisualGetPropertyMap01" );
+  tet_infoline("UtcDaliArcVisualGetPropertyMap01");
 
-  float thickness = 20.0f;
+  float thickness  = 20.0f;
   float startAngle = 0.0f, sweepAngle = 90.0f;
 
   Property::Map propertyMap;
-  propertyMap.Add( "visualType", DevelVisual::ARC )
-             .Add( "mixColor", Color::RED )
-             .Add( "thickness", thickness )
-             .Add( "startAngle", startAngle )
-             .Add( "sweepAngle", sweepAngle )
-             .Add( "cap", DevelArcVisual::Cap::ROUND );
-
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
-
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  propertyMap.Add("visualType", DevelVisual::ARC)
+    .Add("mixColor", Color::RED)
+    .Add("thickness", thickness)
+    .Add("startAngle", startAngle)
+    .Add("sweepAngle", sweepAngle)
+    .Add("cap", DevelArcVisual::Cap::ROUND);
+
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
+
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
   // renderer is added to actor
-  DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
-  Renderer renderer = actor.GetRendererAt( 0u );
-  DALI_TEST_CHECK( renderer );
+  DALI_TEST_CHECK(actor.GetRendererCount() == 1u);
+  Renderer renderer = actor.GetRendererAt(0u);
+  DALI_TEST_CHECK(renderer);
 
   Property::Map resultMap;
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), Color::RED, TEST_LOCATION );
+  Property::Value* value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), thickness, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), thickness, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), startAngle, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), startAngle, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), sweepAngle, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), sweepAngle, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::CAP, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelArcVisual::Cap::ROUND );
+  value = resultMap.Find(DevelArcVisual::Property::CAP, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelArcVisual::Cap::ROUND);
 
   // Test wrong values
-  propertyMap[DevelArcVisual::Property::THICKNESS] = "3.0f";
+  propertyMap[DevelArcVisual::Property::THICKNESS]   = "3.0f";
   propertyMap[DevelArcVisual::Property::START_ANGLE] = "0.0f";
   propertyMap[DevelArcVisual::Property::SWEEP_ANGLE] = "90.0f";
-  propertyMap[DevelArcVisual::Property::CAP] = "1";
+  propertyMap[DevelArcVisual::Property::CAP]         = "1";
 
-  visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
-  value = resultMap.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), 0.0f, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 0.0f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), 360.0f, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), 360.0f, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::CAP, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelArcVisual::Cap::BUTT );
+  value = resultMap.Find(DevelArcVisual::Property::CAP, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelArcVisual::Cap::BUTT);
 
-  actor.Unparent( );
-  DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+  actor.Unparent();
+  DALI_TEST_CHECK(actor.GetRendererCount() == 0u);
 
   END_TEST;
 }
@@ -201,45 +201,45 @@ int UtcDaliArcVisualGetPropertyMap01(void)
 int UtcDaliArcVisualGetPropertyMap02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliArcVisualGetPropertyMap02" );
+  tet_infoline("UtcDaliArcVisualGetPropertyMap02");
 
-  float thickness = 20.0f;
+  float thickness  = 20.0f;
   float startAngle = 0.0f, sweepAngle = 90.0f;
 
   Property::Map propertyMap;
   propertyMap.Add(Visual::Property::TYPE, DevelVisual::ARC)
-             .Add(Visual::Property::MIX_COLOR, Color::RED)
-             .Add(DevelArcVisual::Property::THICKNESS, thickness )
-             .Add(DevelArcVisual::Property::START_ANGLE, startAngle )
-             .Add(DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle )
-             .Add(DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND );
+    .Add(Visual::Property::MIX_COLOR, Color::RED)
+    .Add(DevelArcVisual::Property::THICKNESS, thickness)
+    .Add(DevelArcVisual::Property::START_ANGLE, startAngle)
+    .Add(DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle)
+    .Add(DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
   Property::Map resultMap;
-  visual.CreatePropertyMap( resultMap );
+  visual.CreatePropertyMap(resultMap);
 
   // check the property values from the returned map from a visual
-  Property::Value* value = resultMap.Find( Visual::Property::MIX_COLOR, Property::VECTOR4 );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< Vector4 >(), Color::RED, TEST_LOCATION );
+  Property::Value* value = resultMap.Find(Visual::Property::MIX_COLOR, Property::VECTOR4);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<Vector4>(), Color::RED, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), thickness, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), thickness, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), startAngle, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), startAngle, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_EQUALS( value->Get< float >(), sweepAngle, TEST_LOCATION );
+  value = resultMap.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_EQUALS(value->Get<float>(), sweepAngle, TEST_LOCATION);
 
-  value = resultMap.Find( DevelArcVisual::Property::CAP, Property::INTEGER );
-  DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get< int >() == DevelArcVisual::Cap::ROUND );
+  value = resultMap.Find(DevelArcVisual::Property::CAP, Property::INTEGER);
+  DALI_TEST_CHECK(value);
+  DALI_TEST_CHECK(value->Get<int>() == DevelArcVisual::Cap::ROUND);
 
   END_TEST;
 }
@@ -247,83 +247,83 @@ int UtcDaliArcVisualGetPropertyMap02(void)
 int UtcDaliArcVisualUpdateProperty(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliArcVisualUpdateProperty" );
+  tet_infoline("UtcDaliArcVisualUpdateProperty");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("thickness", Property::Type::FLOAT),
-    UniformData("startAngle", Property::Type::FLOAT),
-    UniformData("sweepAngle", Property::Type::FLOAT),
-  };
+    {
+      UniformData("thickness", Property::Type::FLOAT),
+      UniformData("startAngle", Property::Type::FLOAT),
+      UniformData("sweepAngle", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
-  float thickness = 20.0f;
+  float thickness  = 20.0f;
   float startAngle = 0.0f;
   float sweepAngle = 90.0f;
 
   Property::Map propertyMap;
-  propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ARC )
-             .Add( Visual::Property::MIX_COLOR, Color::RED )
-             .Add( DevelArcVisual::Property::THICKNESS, thickness )
-             .Add( DevelArcVisual::Property::START_ANGLE, startAngle )
-             .Add( DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle );
+  propertyMap.Add(Toolkit::Visual::Property::TYPE, DevelVisual::ARC)
+    .Add(Visual::Property::MIX_COLOR, Color::RED)
+    .Add(DevelArcVisual::Property::THICKNESS, thickness)
+    .Add(DevelArcVisual::Property::START_ANGLE, startAngle)
+    .Add(DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle);
 
-  Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
-  DALI_TEST_CHECK( visual );
+  Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap);
+  DALI_TEST_CHECK(visual);
 
-  DummyControl actor = DummyControl::New( true );
-  DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() );
-  dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual );
+  DummyControl      actor     = DummyControl::New(true);
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+  dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual);
 
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) );
-  application.GetScene().Add( actor );
+  actor.SetProperty(Actor::Property::SIZE, Vector2(200.0f, 200.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
   application.Render();
 
-  Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  Property::Value* value = map.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), thickness, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "thickness", thickness ), true, TEST_LOCATION );
+  Property::Map    map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  Property::Value* value = map.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), thickness, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("thickness", thickness), true, TEST_LOCATION);
 
-  value = map.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), startAngle, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "startAngle", startAngle ), true, TEST_LOCATION );
+  value = map.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), startAngle, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("startAngle", startAngle), true, TEST_LOCATION);
 
-  value = map.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), sweepAngle, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "sweepAngle", sweepAngle ), true, TEST_LOCATION );
+  value = map.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), sweepAngle, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("sweepAngle", sweepAngle), true, TEST_LOCATION);
 
-  thickness = 10.0f;
+  thickness  = 10.0f;
   startAngle = 90.0f;
   sweepAngle = 180.0f;
 
   Property::Map attributes;
-  attributes.Add( DevelArcVisual::Property::THICKNESS, thickness )
-            .Add( DevelArcVisual::Property::START_ANGLE, startAngle )
-            .Add( DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle );
+  attributes.Add(DevelArcVisual::Property::THICKNESS, thickness)
+    .Add(DevelArcVisual::Property::START_ANGLE, startAngle)
+    .Add(DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle);
 
-  DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes );
+  DevelControl::DoAction(actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes);
 
   application.SendNotification();
   application.Render();
 
-  map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
-  value = map.Find( DevelArcVisual::Property::THICKNESS, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), thickness, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "thickness", thickness ), true, TEST_LOCATION );
+  map   = actor.GetProperty<Property::Map>(DummyControl::Property::TEST_VISUAL);
+  value = map.Find(DevelArcVisual::Property::THICKNESS, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), thickness, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("thickness", thickness), true, TEST_LOCATION);
 
-  value = map.Find( DevelArcVisual::Property::START_ANGLE, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), startAngle, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "startAngle", startAngle ), true, TEST_LOCATION );
+  value = map.Find(DevelArcVisual::Property::START_ANGLE, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), startAngle, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("startAngle", startAngle), true, TEST_LOCATION);
 
-  value = map.Find( DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT );
-  DALI_TEST_EQUALS( value->Get< float >(), sweepAngle, TEST_LOCATION );
-  DALI_TEST_EQUALS( gl.CheckUniformValue< float >( "sweepAngle", sweepAngle ), true, TEST_LOCATION );
+  value = map.Find(DevelArcVisual::Property::SWEEP_ANGLE, Property::FLOAT);
+  DALI_TEST_EQUALS(value->Get<float>(), sweepAngle, TEST_LOCATION);
+  DALI_TEST_EQUALS(gl.CheckUniformValue<float>("sweepAngle", sweepAngle), true, TEST_LOCATION);
 
   END_TEST;
 }
index 175ccfc..067a34a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
  * limitations under the License.
  *
  */
-#include <stdlib.h>
-#include <unistd.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali/dali.h>
 #include <dali/devel-api/actors/actor-devel.h>
-#include <dali-toolkit-test-suite-utils.h>
+#include <stdlib.h>
 #include <toolkit-event-thread-callback.h>
-#include <dali-toolkit/dali-toolkit.h>
+#include <unistd.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -38,18 +38,19 @@ static const char* gImage_128_RGB = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
 class ImageLoadedSignalVerifier : public ConnectionTracker
 {
 public:
-
   ImageLoadedSignalVerifier()
-  : mCount( 0 )
-  {}
+  : mCount(0)
+  {
+  }
 
   virtual ~ImageLoadedSignalVerifier()
-  {}
+  {
+  }
 
-  void ImageLoaded( uint32_t id, PixelData pixelData )
+  void ImageLoaded(uint32_t id, PixelData pixelData)
   {
-    mIDs.push_back( id );
-    mPixelDataList.push_back( pixelData );
+    mIDs.push_back(id);
+    mPixelDataList.push_back(pixelData);
     mCount++;
   }
 
@@ -58,15 +59,14 @@ public:
     return mCount;
   }
 
-  bool Verify( uint32_t id, uint32_t width, uint32_t height )
+  bool Verify(uint32_t id, uint32_t width, uint32_t height)
   {
     int size = mIDs.size();
-    for( int i = 0; i<size; i++  )
+    for(int i = 0; i < size; i++)
     {
-      if( mIDs[i] == id )
+      if(mIDs[i] == id)
       {
-        return mPixelDataList[i].GetWidth() == width
-            && mPixelDataList[i].GetHeight() == height;
+        return mPixelDataList[i].GetWidth() == width && mPixelDataList[i].GetHeight() == height;
       }
     }
 
@@ -74,14 +74,12 @@ public:
   }
 
 private:
-
   int mCount;
 
-  std::vector<uint32_t> mIDs;
+  std::vector<uint32_t>  mIDs;
   std::vector<PixelData> mPixelDataList;
 };
 
-
 } // anonymous namespace
 
 void dali_async_image_loader_startup(void)
@@ -101,11 +99,11 @@ int UtcDaliImageAtlasNew01(void)
   //invoke default handle constructor
   AsyncImageLoader loader;
 
-  DALI_TEST_CHECK( !loader );
+  DALI_TEST_CHECK(!loader);
 
   // initialise handle
   loader = AsyncImageLoader::New();
-  DALI_TEST_CHECK( loader );
+  DALI_TEST_CHECK(loader);
 
   END_TEST;
 }
@@ -114,11 +112,11 @@ int UtcDaliAsyncImageLoaderCopyConstructor(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New( );
-  DALI_TEST_CHECK( loader );
+  AsyncImageLoader loader = AsyncImageLoader::New();
+  DALI_TEST_CHECK(loader);
 
   AsyncImageLoader loaderCopy(loader);
-  DALI_TEST_CHECK( loaderCopy );
+  DALI_TEST_CHECK(loaderCopy);
 
   END_TEST;
 }
@@ -127,14 +125,14 @@ int UtcDaliAsyncImageLoaderMoveConstructor(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New( );
-  DALI_TEST_CHECK( loader );
-  DALI_TEST_EQUALS( 1, loader.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  AsyncImageLoader loader = AsyncImageLoader::New();
+  DALI_TEST_CHECK(loader);
+  DALI_TEST_EQUALS(1, loader.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
-  AsyncImageLoader moved = std::move( loader );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( !loader );
+  AsyncImageLoader moved = std::move(loader);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!loader);
 
   END_TEST;
 }
@@ -144,14 +142,14 @@ int UtcDaliAsyncImageLoaderAssignmentOperator(void)
   ToolkitTestApplication application;
 
   AsyncImageLoader loader = AsyncImageLoader::New();
-  DALI_TEST_CHECK( loader );
+  DALI_TEST_CHECK(loader);
 
   AsyncImageLoader loader2;
-  DALI_TEST_CHECK( !loader2 );
+  DALI_TEST_CHECK(!loader2);
 
   loader2 = loader;
-  DALI_TEST_CHECK( loader2 );
-  DALI_TEST_CHECK( loader == loader2 ); // the two handles are pointing to the same object.
+  DALI_TEST_CHECK(loader2);
+  DALI_TEST_CHECK(loader == loader2); // the two handles are pointing to the same object.
 
   END_TEST;
 }
@@ -160,15 +158,15 @@ int UtcDaliAsyncImageLoaderMoveAssignment(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New( );
-  DALI_TEST_CHECK( loader );
-  DALI_TEST_EQUALS( 1, loader.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  AsyncImageLoader loader = AsyncImageLoader::New();
+  DALI_TEST_CHECK(loader);
+  DALI_TEST_EQUALS(1, loader.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
   AsyncImageLoader moved;
-  moved = std::move( loader );
-  DALI_TEST_CHECK( moved );
-  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
-  DALI_TEST_CHECK( !loader );
+  moved = std::move(loader);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_CHECK(!loader);
 
   END_TEST;
 }
@@ -178,11 +176,11 @@ int UtcDaliAsyncImageLoaderDownCastP(void)
   ToolkitTestApplication application;
 
   AsyncImageLoader asyncImageLoader = AsyncImageLoader::New();
-  BaseHandle object(asyncImageLoader);
+  BaseHandle       object(asyncImageLoader);
 
-  AsyncImageLoader asyncImageLoader2 = AsyncImageLoader::DownCast( object );
+  AsyncImageLoader asyncImageLoader2 = AsyncImageLoader::DownCast(object);
 
-  DALI_TEST_CHECK( asyncImageLoader2 );
+  DALI_TEST_CHECK(asyncImageLoader2);
 
   END_TEST;
 }
@@ -191,10 +189,10 @@ int UtcDaliAsyncImageLoaderDownCastN(void)
 {
   ToolkitTestApplication application;
 
-  BaseHandle unInitializedObject;
-  AsyncImageLoader asyncImageLoader = AsyncImageLoader::DownCast( unInitializedObject );
+  BaseHandle       unInitializedObject;
+  AsyncImageLoader asyncImageLoader = AsyncImageLoader::DownCast(unInitializedObject);
 
-  DALI_TEST_CHECK( !asyncImageLoader );
+  DALI_TEST_CHECK(!asyncImageLoader);
 
   END_TEST;
 }
@@ -203,23 +201,23 @@ int UtcDaliAsyncImageLoaderLoadAndLoadedSignal(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New();
+  AsyncImageLoader          loader = AsyncImageLoader::New();
   ImageLoadedSignalVerifier loadedSignalVerifier;
 
-  loader.ImageLoadedSignal().Connect( &loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded );
+  loader.ImageLoadedSignal().Connect(&loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded);
 
-  loader.Load( gImage_34_RGBA );
-  uint32_t id02 = loader.Load( gImage_50_RGBA, ImageDimensions( 25, 25 ) );
-  uint32_t id03 = loader.Load( gImage_128_RGB, ImageDimensions( 100, 100 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
+  loader.Load(gImage_34_RGBA);
+  uint32_t id02 = loader.Load(gImage_50_RGBA, ImageDimensions(25, 25));
+  uint32_t id03 = loader.Load(gImage_128_RGB, ImageDimensions(100, 100), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( loadedSignalVerifier.LoadedImageCount() == 3 );
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id02, 25, 25 ) );
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id03, 100, 100 ) );
+  DALI_TEST_CHECK(loadedSignalVerifier.LoadedImageCount() == 3);
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id02, 25, 25));
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id03, 100, 100));
 
   END_TEST;
 }
@@ -229,27 +227,27 @@ int UtcDaliAsyncImageLoaderCancel(void)
 {
   ToolkitTestApplication application;
 
-  AsyncImageLoader loader = AsyncImageLoader::New();
+  AsyncImageLoader          loader = AsyncImageLoader::New();
   ImageLoadedSignalVerifier loadedSignalVerifier;
 
-  loader.ImageLoadedSignal().Connect( &loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded );
+  loader.ImageLoadedSignal().Connect(&loadedSignalVerifier, &ImageLoadedSignalVerifier::ImageLoaded);
 
-  uint32_t id01 = loader.Load( gImage_34_RGBA, ImageDimensions( 34, 34 ) );
-  uint32_t id02 = loader.Load( gImage_50_RGBA, ImageDimensions( 25, 25 ) );
-  uint32_t id03 = loader.Load( gImage_128_RGB, ImageDimensions( 100, 100 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
+  uint32_t id01 = loader.Load(gImage_34_RGBA, ImageDimensions(34, 34));
+  uint32_t id02 = loader.Load(gImage_50_RGBA, ImageDimensions(25, 25));
+  uint32_t id03 = loader.Load(gImage_128_RGB, ImageDimensions(100, 100), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true);
 
-  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(3), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( loadedSignalVerifier.LoadedImageCount() == 3 );
+  DALI_TEST_CHECK(loadedSignalVerifier.LoadedImageCount() == 3);
 
-  DALI_TEST_CHECK( !loader.Cancel( id03 ) ); // Cannot cancel a task that is already implemeted
+  DALI_TEST_CHECK(!loader.Cancel(id03)); // Cannot cancel a task that is already implemeted
 
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id01, 34, 34 ) );   // first image is loaded
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id02, 25, 25 ) );   // second image is loaded
-  DALI_TEST_CHECK( loadedSignalVerifier.Verify( id03, 100, 100 ) ); // third image is loaded
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id01, 34, 34));   // first image is loaded
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id02, 25, 25));   // second image is loaded
+  DALI_TEST_CHECK(loadedSignalVerifier.Verify(id03, 100, 100)); // third image is loaded
 
   END_TEST;
 }
@@ -272,7 +270,7 @@ int UtcDaliAsyncImageLoaderCancelAll(void)
 
   // Test that cancelling a non-existing loading task will return false
   uint32_t id = 1;
-  DALI_TEST_CHECK( !(loader.Cancel( id )) );
+  DALI_TEST_CHECK(!(loader.Cancel(id)));
 
   END_TEST;
 }
index 2105c4a..f328ef2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/bloom-view/bloom-view.h>
-
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
-
 void bloom_view_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -48,13 +46,13 @@ int UtcDaliBloomViewUninitialized(void)
   {
     // New() must be called to create a BloomView or it wont be valid.
     Actor a = Actor::New();
-    view.Add( a );
-    DALI_TEST_CHECK( false );
+    view.Add(a);
+    DALI_TEST_CHECK(false);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(!view);
   }
   END_TEST;
@@ -67,10 +65,10 @@ int UtcDaliBloomViewNew(void)
   tet_infoline(" UtcDaliBloomViewNew");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Toolkit::BloomView view2 = Toolkit::BloomView::New(10, 1.0f, Pixel::RGB888, 0.5f, 0.5f);
-  DALI_TEST_CHECK( view2 );
+  DALI_TEST_CHECK(view2);
   END_TEST;
 }
 
@@ -81,16 +79,15 @@ int UtcDaliBloomViewDownCast(void)
   tet_infoline(" UtcDaliBloomViewDownCast");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  BaseHandle handle(view);
+  BaseHandle         handle(view);
 
-  Toolkit::BloomView bloomView = Toolkit::BloomView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( bloomView );
-  DALI_TEST_CHECK( bloomView == view );
+  Toolkit::BloomView bloomView = Toolkit::BloomView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(bloomView);
+  DALI_TEST_CHECK(bloomView == view);
   END_TEST;
 }
 
-
 // Positive test case for a method
 int UtcDaliBloomViewPropertyNames(void)
 {
@@ -98,16 +95,16 @@ int UtcDaliBloomViewPropertyNames(void)
   tet_infoline(" UtcDaliBloomViewPropertyNames");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // Check the names, this names are used in the shader code,
   // if they change in the shader code, then it has to be updated here.
-  DALI_TEST_EQUALS( view.GetBloomThresholdPropertyIndex(), view.GetPropertyIndex("uBloomThreshold"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("BlurStrengthProperty"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetBloomIntensityPropertyIndex(), view.GetPropertyIndex("uBloomIntensity"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetBloomSaturationPropertyIndex(), view.GetPropertyIndex("uBloomSaturation"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetImageIntensityPropertyIndex(), view.GetPropertyIndex("uImageIntensity"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetImageSaturationPropertyIndex(), view.GetPropertyIndex("uImageSaturation"), TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetBloomThresholdPropertyIndex(), view.GetPropertyIndex("uBloomThreshold"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("BlurStrengthProperty"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetBloomIntensityPropertyIndex(), view.GetPropertyIndex("uBloomIntensity"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetBloomSaturationPropertyIndex(), view.GetPropertyIndex("uBloomSaturation"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetImageIntensityPropertyIndex(), view.GetPropertyIndex("uImageIntensity"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetImageSaturationPropertyIndex(), view.GetPropertyIndex("uImageSaturation"), TEST_LOCATION);
   END_TEST;
 }
 
@@ -118,22 +115,21 @@ int UtcDaliBloomViewAddRemove(void)
   tet_infoline(" UtcDaliBloomViewAddRemove");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-
-  view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(actor);
   application.GetScene().Add(view);
 
-  DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
   view.Remove(actor);
 
-  DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
   END_TEST;
 }
 
@@ -144,24 +140,24 @@ int UtcDaliBloomActivateDeactivate(void)
   tet_infoline(" UtcDaliBloomActivateDeactivate");
 
   Toolkit::BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   RenderTaskList taskList = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
+  DALI_TEST_CHECK(1u == taskList.GetTaskCount());
 
-  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
-  view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
   application.GetScene().Add(view);
   view.Activate();
 
   RenderTaskList taskList2 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
+  DALI_TEST_CHECK(1u != taskList2.GetTaskCount());
 
   view.Deactivate();
 
   RenderTaskList taskList3 = application.GetScene().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
+  DALI_TEST_CHECK(1u == taskList3.GetTaskCount());
   END_TEST;
 }
 
@@ -170,16 +166,16 @@ int UtcDaliBloomCopyAndAssignment(void)
   ToolkitTestApplication application;
 
   BloomView view = Toolkit::BloomView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  BloomView copy( view );
-  DALI_TEST_CHECK( view == copy );
+  BloomView copy(view);
+  DALI_TEST_CHECK(view == copy);
 
   BloomView assign;
-  DALI_TEST_CHECK( ! assign );
+  DALI_TEST_CHECK(!assign);
 
   assign = copy;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -189,16 +185,16 @@ int UtcDaliBloomTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "BloomView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("BloomView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  BloomView view = BloomView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  BloomView view = BloomView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -209,18 +205,18 @@ int UtcDaliBloomOnSizeSet(void)
 
   BloomView view = Toolkit::BloomView::New();
 
-  application.GetScene().Add( view );
+  application.GetScene().Add(view);
 
   application.SendNotification();
   application.Render();
 
-  Vector3 size( 200.0f, 300.0f, 0.0f );
-  view.SetProperty( Actor::Property::SIZE, size );
+  Vector3 size(200.0f, 300.0f, 0.0f);
+  view.SetProperty(Actor::Property::SIZE, size);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), size, TEST_LOCATION);
 
   END_TEST;
 }
index 7fa50ed..fd04bbd 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 
 // Need to override adaptor classes for toolkit test harness, so include
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
-#include <dali.h>
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
+#include <dali.h>
+#include <dali/public-api/rendering/renderer.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -40,10 +40,8 @@ void utc_dali_toolkit_bubble_emitter_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 namespace
 {
-
 const int RENDER_FRAME_INTERVAL = 16;
 
 static bool gObjectCreatedCallBackCalled;
@@ -65,7 +63,7 @@ static int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -75,13 +73,12 @@ static int Wait(ToolkitTestApplication& application, int duration = 0)
   return time;
 }
 
-static Texture CreateSolidColorTexture( ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height )
+static Texture CreateSolidColorTexture(ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height)
 {
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height );
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
   return texture;
 }
-}//namespace
-
+} //namespace
 
 int UtcDaliBubbleEmitterNew(void)
 {
@@ -91,32 +88,32 @@ int UtcDaliBubbleEmitterNew(void)
 
   // Test default constructor
   BubbleEmitter emitter;
-  DALI_TEST_CHECK( !emitter );
+  DALI_TEST_CHECK(!emitter);
 
   // Test object creation
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
-  DALI_TEST_CHECK( emitter );
+  Texture shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  emitter            = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
+  DALI_TEST_CHECK(emitter);
 
   // Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = application.GetCore().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  DALI_TEST_CHECK(registry);
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+    BubbleEmitter emitter = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
 
   // Test copy constructor
-  BubbleEmitter emitterCopy( emitter );
-  DALI_TEST_CHECK( emitterCopy );
+  BubbleEmitter emitterCopy(emitter);
+  DALI_TEST_CHECK(emitterCopy);
 
   // Test down cast
   Handle handleEmitter;
-  handleEmitter = emitter;
-  BubbleEmitter downCastEmitter = BubbleEmitter::DownCast( handleEmitter );
-  DALI_TEST_CHECK( downCastEmitter );
+  handleEmitter                 = emitter;
+  BubbleEmitter downCastEmitter = BubbleEmitter::DownCast(handleEmitter);
+  DALI_TEST_CHECK(downCastEmitter);
   END_TEST;
 }
 
@@ -126,12 +123,12 @@ int UtcDaliBubbleEmitterDownCast01(void)
 
   tet_infoline(" UtcDaliBubbleEmitterDownCast01 ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
 
-  BaseHandle handle(emitter);
+  BaseHandle    handle(emitter);
   BubbleEmitter emitter2 = BubbleEmitter::DownCast(handle);
-  DALI_TEST_EQUALS( (bool)emitter2, true, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)emitter2, true, TEST_LOCATION);
   END_TEST;
 }
 
@@ -141,44 +138,44 @@ int UtcDaliBubbleEmitterDownCast02(void)
 
   tet_infoline(" UtcDaliBubbleEmitterDownCast02 ");
 
-  Handle handle = Handle::New(); // Create a custom object
+  Handle        handle  = Handle::New(); // Create a custom object
   BubbleEmitter emitter = BubbleEmitter::DownCast(handle);
-  DALI_TEST_EQUALS( (bool)emitter, false, TEST_LOCATION );
+  DALI_TEST_EQUALS((bool)emitter, false, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliBubbleEmitterGetRootActor(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterGetRootActor " );
+  tet_infoline(" UtcDaliBubbleEmitterGetRootActor ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 270, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 270, Vector2(5.f, 10.f));
 
   Actor root = emitter.GetRootActor();
-  DALI_TEST_CHECK( root );
-  DALI_TEST_CHECK( root.GetChildCount() == 0 );
+  DALI_TEST_CHECK(root);
+  DALI_TEST_CHECK(root.GetChildCount() == 0);
   END_TEST;
 }
 
 int UtcDaliBubbleEmitterSetBackground(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterSetBackground " );
+  tet_infoline(" UtcDaliBubbleEmitterSetBackground ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
 
-  RenderTaskList taskList = application.GetScene().GetRenderTaskList();
-  unsigned int taskCount = taskList.GetTaskCount();
+  RenderTaskList taskList  = application.GetScene().GetRenderTaskList();
+  unsigned int   taskCount = taskList.GetTaskCount();
 
-  Texture bgImage = CreateSolidColorTexture( application, Color::RED, 50, 50 );
-  emitter.SetBackground( bgImage, Vector3(0.f, 0.f, 0.5f) );
+  Texture bgImage = CreateSolidColorTexture(application, Color::RED, 50, 50);
+  emitter.SetBackground(bgImage, Vector3(0.f, 0.f, 0.5f));
 
-  DALI_TEST_CHECK( taskList.GetTaskCount() == taskCount+1 );
+  DALI_TEST_CHECK(taskList.GetTaskCount() == taskCount + 1);
 
   Wait(application, 500);
-  DALI_TEST_CHECK( taskList.GetTaskCount() == taskCount );
+  DALI_TEST_CHECK(taskList.GetTaskCount() == taskCount);
   END_TEST;
 }
 
@@ -191,42 +188,42 @@ int UtcDaliBubbleEmitterSetBackground(void)
 int UtcDaliBubbleEmitterSetBubbleScale(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterSetBubbleScale " );
+  tet_infoline(" UtcDaliBubbleEmitterSetBubbleScale ");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uDynamicScale", Property::Type::FLOAT),
-  };
+    {
+      UniformData("uDynamicScale", Property::Type::FLOAT),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 150, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 150, Vector2(5.f, 10.f));
   DALI_TEST_CHECK(emitter);
   Actor root = emitter.GetRootActor();
-  application.GetScene().Add( root );
-  root.SetProperty( Actor::Property::POSITION, Vector3::ZERO );
-  root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  application.GetScene().Add(root);
+  root.SetProperty(Actor::Property::POSITION, Vector3::ZERO);
+  root.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  root.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
   Wait(application);
 
   float scaleValue;
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uDynamicScale", scaleValue ) );
-  DALI_TEST_EQUALS( scaleValue, 1.f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uDynamicScale", scaleValue));
+  DALI_TEST_EQUALS(scaleValue, 1.f, TEST_LOCATION);
 
-  emitter.SetBubbleScale( 2.f );
+  emitter.SetBubbleScale(2.f);
   Wait(application);
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uDynamicScale", scaleValue ) );
-  DALI_TEST_EQUALS( scaleValue, 2.f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uDynamicScale", scaleValue));
+  DALI_TEST_EQUALS(scaleValue, 2.f, TEST_LOCATION);
 
-  emitter.SetBubbleScale( 0.5f );
+  emitter.SetBubbleScale(0.5f);
   Wait(application);
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uDynamicScale", scaleValue ) );
-  DALI_TEST_EQUALS( scaleValue, 0.5f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uDynamicScale", scaleValue));
+  DALI_TEST_EQUALS(scaleValue, 0.5f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -234,20 +231,20 @@ int UtcDaliBubbleEmitterSetBubbleScale(void)
 int UtcDaliBubbleEmitterSetBubbleDensity01(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterSetBubbleDensity " );
+  tet_infoline(" UtcDaliBubbleEmitterSetBubbleDensity ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
 
   try
   {
-    emitter.SetBubbleDensity( 3.f );
+    emitter.SetBubbleDensity(3.f);
     DALI_TEST_CHECK(true);
   }
   catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
-    DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION );
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION);
   }
   END_TEST;
 }
@@ -255,19 +252,19 @@ int UtcDaliBubbleEmitterSetBubbleDensity01(void)
 int UtcDaliBubbleEmitterSetBubbleDensity02(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterSetBubbleDensity " );
+  tet_infoline(" UtcDaliBubbleEmitterSetBubbleDensity ");
 
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 200, Vector2( 5.f, 10.f ));
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage, 200, Vector2(5.f, 10.f));
 
   try
   {
-    emitter.SetBubbleDensity( 10.f );
+    emitter.SetBubbleDensity(10.f);
   }
   catch(Dali::DaliException& e)
   {
-    DALI_TEST_PRINT_ASSERT( e );
-    DALI_TEST_ASSERT(e, "density > 0 && density <= 9", TEST_LOCATION );
+    DALI_TEST_PRINT_ASSERT(e);
+    DALI_TEST_ASSERT(e, "density > 0 && density <= 9", TEST_LOCATION);
   }
   END_TEST;
 }
@@ -275,47 +272,47 @@ int UtcDaliBubbleEmitterSetBubbleDensity02(void)
 int UtcDaliBubbleEmitterEmitBubble(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterEmitBubble " );
-
-  Texture shapeImage1 = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage1, 200, Vector2( 5.f, 10.f ));
-
-  Actor root = emitter.GetRootActor();
-  Renderer bubbleRenderer = root.GetRendererAt( 0 );
-  application.GetScene().Add( root );
-  DALI_TEST_CHECK( bubbleRenderer );
-
-  Property::Index propertyIndex0 = bubbleRenderer.GetPropertyIndex( "uPercentage[0]" );
-  Property::Index propertyIndex1 = bubbleRenderer.GetPropertyIndex( "uPercentage[1]" );
-  float value0, value1;
-
-  Animation animation = Animation::New( 0.5f );
-  emitter.EmitBubble( animation, Vector2(40.f,40.f), Vector2(-5.f,-5.f), Vector2(30.f,30.f) );
-  emitter.EmitBubble( animation, Vector2(10.f,10.f), Vector2(5.f,5.f), Vector2(30.f,30.f) );
-  (bubbleRenderer.GetProperty(propertyIndex0)).Get( value0 );
-  (bubbleRenderer.GetProperty(propertyIndex1)).Get( value1 );
-  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
-  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
-  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
-  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
+  tet_infoline(" UtcDaliBubbleEmitterEmitBubble ");
+
+  Texture       shapeImage1 = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter     = BubbleEmitter::New(Vector2(50.f, 50.f), shapeImage1, 200, Vector2(5.f, 10.f));
+
+  Actor    root           = emitter.GetRootActor();
+  Renderer bubbleRenderer = root.GetRendererAt(0);
+  application.GetScene().Add(root);
+  DALI_TEST_CHECK(bubbleRenderer);
+
+  Property::Index propertyIndex0 = bubbleRenderer.GetPropertyIndex("uPercentage[0]");
+  Property::Index propertyIndex1 = bubbleRenderer.GetPropertyIndex("uPercentage[1]");
+  float           value0, value1;
+
+  Animation animation = Animation::New(0.5f);
+  emitter.EmitBubble(animation, Vector2(40.f, 40.f), Vector2(-5.f, -5.f), Vector2(30.f, 30.f));
+  emitter.EmitBubble(animation, Vector2(10.f, 10.f), Vector2(5.f, 5.f), Vector2(30.f, 30.f));
+  (bubbleRenderer.GetProperty(propertyIndex0)).Get(value0);
+  (bubbleRenderer.GetProperty(propertyIndex1)).Get(value1);
+  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value0);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value1);
+  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION);
 
   animation.Play();
 
   Wait(application, 300);
-  propertyIndex0 = bubbleRenderer.GetPropertyIndex( "uPercentage[0]" );
-  propertyIndex1 = bubbleRenderer.GetPropertyIndex( "uPercentage[1]" );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
-  DALI_TEST_CHECK( value0 >= 0.6f );
-  DALI_TEST_CHECK( value1 >= 0.6f );
-
-  Wait(application,500);
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
-  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
-  DALI_TEST_EQUALS(value0, 1.f, TEST_LOCATION );
-  DALI_TEST_EQUALS(value1, 1.f, TEST_LOCATION );
+  propertyIndex0 = bubbleRenderer.GetPropertyIndex("uPercentage[0]");
+  propertyIndex1 = bubbleRenderer.GetPropertyIndex("uPercentage[1]");
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value0);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value1);
+  DALI_TEST_CHECK(value0 >= 0.6f);
+  DALI_TEST_CHECK(value1 >= 0.6f);
+
+  Wait(application, 500);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value0);
+  (bubbleRenderer.GetCurrentProperty(propertyIndex0)).Get(value1);
+  DALI_TEST_EQUALS(value0, 1.f, TEST_LOCATION);
+  DALI_TEST_EQUALS(value1, 1.f, TEST_LOCATION);
   END_TEST;
 }
 
@@ -323,66 +320,66 @@ int UtcDaliBubbleEmitterRestore(void)
 {
 #ifdef OLD_GRAPHICS_TEST
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliBubbleEmitterRestore " );
+  tet_infoline(" UtcDaliBubbleEmitterRestore ");
 
   static std::vector<UniformData> customUniforms =
-  {
-    UniformData("uPercentage[0]", Property::Type::FLOAT),
-    UniformData("uStartEndPosition[0]", Property::Type::VECTOR4),
-  };
+    {
+      UniformData("uPercentage[0]", Property::Type::FLOAT),
+      UniformData("uStartEndPosition[0]", Property::Type::VECTOR4),
+    };
 
   TestGraphicsController& graphics = application.GetGraphicsController();
   graphics.AddCustomUniforms(customUniforms);
 
-  Vector2 movementArea(50.f,50.f);
-  Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 );
-  BubbleEmitter emitter = BubbleEmitter::New( movementArea,shapeImage, 90, Vector2( 5.f, 10.f ));
-  Actor root = emitter.GetRootActor();
-  application.GetScene().Add( root );
-  root.SetProperty( Actor::Property::POSITION, Vector3::ZERO );
-  root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+  Vector2       movementArea(50.f, 50.f);
+  Texture       shapeImage = CreateSolidColorTexture(application, Color::GREEN, 5, 5);
+  BubbleEmitter emitter    = BubbleEmitter::New(movementArea, shapeImage, 90, Vector2(5.f, 10.f));
+  Actor         root       = emitter.GetRootActor();
+  application.GetScene().Add(root);
+  root.SetProperty(Actor::Property::POSITION, Vector3::ZERO);
+  root.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  root.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
 
-  Renderer renderer = root.GetRendererAt( 0 );
-  DALI_TEST_CHECK( renderer );
+  Renderer renderer = root.GetRendererAt(0);
+  DALI_TEST_CHECK(renderer);
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
-  float percentageValue;
+  float   percentageValue;
   Vector4 startEndPosValue;
 
-  Animation animation = Animation::New( 0.5f );
-  emitter.EmitBubble( animation, Vector2(40.f,40.f), Vector2(-5.f,-5.f), Vector2(30.f,30.f) );
+  Animation animation = Animation::New(0.5f);
+  emitter.EmitBubble(animation, Vector2(40.f, 40.f), Vector2(-5.f, -5.f), Vector2(30.f, 30.f));
 
   Wait(application);
 
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uPercentage[0]", percentageValue ) );
-  DALI_TEST_EQUALS( percentageValue, 0.f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uPercentage[0]", percentageValue));
+  DALI_TEST_EQUALS(percentageValue, 0.f, TEST_LOCATION);
 
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "uStartEndPosition[0]", startEndPosValue ) );
-  DALI_TEST_EQUALS( startEndPosValue.x, 40.f - movementArea.x*0.5f, TEST_LOCATION );
-  DALI_TEST_EQUALS( startEndPosValue.y, 40.f- movementArea.x*0.5f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("uStartEndPosition[0]", startEndPosValue));
+  DALI_TEST_EQUALS(startEndPosValue.x, 40.f - movementArea.x * 0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(startEndPosValue.y, 40.f - movementArea.x * 0.5f, TEST_LOCATION);
 
   animation.Play();
   Wait(application, 200);
   animation.Clear();
 
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uPercentage[0]", percentageValue ) );
-  DALI_TEST_CHECK( percentageValue < 0.5f && percentageValue >= 0.4);
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uPercentage[0]", percentageValue));
+  DALI_TEST_CHECK(percentageValue < 0.5f && percentageValue >= 0.4);
 
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "uStartEndPosition[0]", startEndPosValue ) );
-  DALI_TEST_EQUALS( startEndPosValue.x, 40.f- movementArea.x*0.5f, TEST_LOCATION );
-  DALI_TEST_EQUALS( startEndPosValue.y, 40.f- movementArea.x*0.5f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("uStartEndPosition[0]", startEndPosValue));
+  DALI_TEST_EQUALS(startEndPosValue.x, 40.f - movementArea.x * 0.5f, TEST_LOCATION);
+  DALI_TEST_EQUALS(startEndPosValue.y, 40.f - movementArea.x * 0.5f, TEST_LOCATION);
 
   emitter.Restore();
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_CHECK( gl.GetUniformValue<float>( "uPercentage[0]", percentageValue ) );
-  DALI_TEST_EQUALS( percentageValue, 0.f, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<float>("uPercentage[0]", percentageValue));
+  DALI_TEST_EQUALS(percentageValue, 0.f, TEST_LOCATION);
 
-  DALI_TEST_CHECK( gl.GetUniformValue<Vector4>( "uStartEndPosition[0]", startEndPosValue ) );
-  DALI_TEST_EQUALS( startEndPosValue,  Vector4::ZERO, TEST_LOCATION );
+  DALI_TEST_CHECK(gl.GetUniformValue<Vector4>("uStartEndPosition[0]", startEndPosValue));
+  DALI_TEST_EQUALS(startEndPosValue, Vector4::ZERO, TEST_LOCATION);
 #else
   tet_result(TET_PASS);
 #endif
index ca32522..802f7b4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
  *
  */
 
+#include <algorithm>
+#include <cstdlib>
 #include <iostream>
 #include <iterator>
 #include <vector>
-#include <algorithm>
-#include <cstdlib>
 
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/devel-api/builder/builder.h>
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/builder/base64-encoding.h>
+#include <dali-toolkit/devel-api/builder/builder.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <test-button.h>
-#include <test-animation-data.h>
 #include <dummy-control.h>
+#include <test-animation-data.h>
+#include <test-button.h>
 
-
-#define STRINGIFY(A)#A
+#define STRINGIFY(A) #A
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace BuilderControlProperty
 {
-
 enum
 {
   INTEGER_PROPERTY = Toolkit::Control::CONTROL_PROPERTY_END_INDEX + 1,
@@ -49,7 +47,6 @@ enum
 
 namespace
 {
-
 BaseHandle Create()
 {
   return Toolkit::Control::New();
@@ -57,12 +54,12 @@ BaseHandle Create()
 
 int gSetPropertyCalledCount = 0;
 
-void SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
+void SetProperty(BaseObject* object, Property::Index propertyIndex, const Property::Value& value)
 {
   ++gSetPropertyCalledCount;
 }
 
-Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex )
+Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex)
 {
   return Property::Value();
 }
@@ -70,21 +67,21 @@ Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex )
 } // unnamed namespace
 
 // Properties
-Dali::TypeRegistration typeRegistration( "BuilderControl", typeid( Toolkit::Control ), Create );
+Dali::TypeRegistration typeRegistration("BuilderControl", typeid(Toolkit::Control), Create);
 
-Dali::PropertyRegistration propertyInteger( typeRegistration, "integerProperty", INTEGER_PROPERTY, Property::INTEGER, &SetProperty, &GetProperty );
-Dali::PropertyRegistration propertyMatrix3( typeRegistration, "matrix3Property", MATRIX3_PROPERTY, Property::MATRIX3, &SetProperty, &GetProperty );
-Dali::PropertyRegistration propertyMatrix(  typeRegistration, "matrixProperty",  MATRIX_PROPERTY,  Property::MATRIX,  &SetProperty, &GetProperty );
-Dali::PropertyRegistration propertyNone(    typeRegistration, "noneProperty",    NONE_PROPERTY,    Property::NONE,    &SetProperty, &GetProperty );
+Dali::PropertyRegistration propertyInteger(typeRegistration, "integerProperty", INTEGER_PROPERTY, Property::INTEGER, &SetProperty, &GetProperty);
+Dali::PropertyRegistration propertyMatrix3(typeRegistration, "matrix3Property", MATRIX3_PROPERTY, Property::MATRIX3, &SetProperty, &GetProperty);
+Dali::PropertyRegistration propertyMatrix(typeRegistration, "matrixProperty", MATRIX_PROPERTY, Property::MATRIX, &SetProperty, &GetProperty);
+Dali::PropertyRegistration propertyNone(typeRegistration, "noneProperty", NONE_PROPERTY, Property::NONE, &SetProperty, &GetProperty);
 
-}
+} // namespace BuilderControlProperty
 
 namespace
 {
-
 struct BuilderFunctor
 {
-  BuilderFunctor( bool& called ) : mCalled( called )
+  BuilderFunctor(bool& called)
+  : mCalled(called)
   {
     mCalled = false;
   }
@@ -99,8 +96,6 @@ struct BuilderFunctor
 
 } // namespace
 
-
-
 void builder_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -117,30 +112,29 @@ int UtcDaliBuilderQuitSignal(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{"
-         "\"stage\":"
-         "[{"
-           "\"type\": \"Layer\","
-           "\"size\": [100,100,1],"
-           "\"parentOrigin\": \"TOP_LEFT\","
-           "\"anchorPoint\": \"TOP_LEFT\","
-           "\"maximumSize\": [100,100],"
-           "\"orientation\": [10,10,10,10],"
-           "\"clippingBox\": [10,10,10,10],"
-           "\"signals\": [{"
-             "\"name\": \"touched\","
-             "\"action\": \"quit\""
-           "}]"
-         "}]"
-      "}"
-  );
+    "{"
+    "\"stage\":"
+    "[{"
+    "\"type\": \"Layer\","
+    "\"size\": [100,100,1],"
+    "\"parentOrigin\": \"TOP_LEFT\","
+    "\"anchorPoint\": \"TOP_LEFT\","
+    "\"maximumSize\": [100,100],"
+    "\"orientation\": [10,10,10,10],"
+    "\"clippingBox\": [10,10,10,10],"
+    "\"signals\": [{"
+    "\"name\": \"touched\","
+    "\"action\": \"quit\""
+    "}]"
+    "}]"
+    "}");
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Connect to builder's quit signal
-  bool functorCalled( false );
-  builder.QuitSignal().Connect( &application, BuilderFunctor( functorCalled ) );
+  bool functorCalled(false);
+  builder.QuitSignal().Connect(&application, BuilderFunctor(functorCalled));
 
   // Render and notify
   application.SendNotification();
@@ -148,204 +142,202 @@ int UtcDaliBuilderQuitSignal(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
-  DALI_TEST_CHECK( functorCalled );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
+  DALI_TEST_CHECK(functorCalled);
 
   END_TEST;
 }
 
-
 int UtcDaliBuilderAnimationP(void)
 {
   ToolkitTestApplication application;
 
   // JSON with a quit event when the actor is touched
   std::string json(
-        "{"
-        "   \"constants\":"
-        "   {"
-        "     \"ALPHA_FUNCTION\":\"EASE_IN_OUT\""
-        "   },"
-        "   \"paths\":"
-        "   {"
-        "     \"path0\":"
-        "     {"
-        "       \"points\":[ [-150, -50, 0], [0.0,70.0,0.0], [190.0,-150.0,0.0] ],"
-        "       \"curvature\":0.35"
-        "     }"
-        "   },"
-        "  \"animations\": {"
-        "    \"animate\": {"
-        "      \"loop\": true,"
-        "      \"endAction\": \"BAKE\","
-        "      \"disconnectAction\": \"BAKE\","
-        "      \"properties\":"
-        "      [{"
-        "        \"actor\": \"greeting\","
-        "        \"property\": \"position\","
-        "        \"value\": [300, 300, -1000],"
-        "        \"alphaFunction\": \"{ALPHA_FUNCTION}\","
-        "        \"relative\": true,"
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"visible\","
-        "         \"alphaFunction\": \"LINEAR\","
-        "         \"value\": true"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"sizeWidth\","
-        "         \"alphaFunction\": \"REVERSE\","
-        "         \"value\": 10.0"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_IN\","
-        "         \"value\": [10.0,20.0,30.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_OUT\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_IN_OUT\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_IN_SINE\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_OUT_SINE\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_IN_OUT_SINE\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"BOUNCE\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"SIN\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       },"
-        "       {"
-        "         \"actor\": \"greeting\","
-        "         \"property\": \"orientation\","
-        "         \"alphaFunction\": \"EASE_OUT_BACK\","
-        "         \"value\": [0.0, 0.0, 0.0, 1.0]"
-        "       }"
-        "      ]"
-        "    },"
-        "    \"pathAnimation\": {"
-        "      \"duration\": 3.0,"
-        "      \"endAction\": \"DISCARD\","
-        "      \"disconnectAction\": \"BAKE_FINAL\","
-        "      \"properties\": [{"
-        "        \"actor\": \"greeting\","
-        "        \"path\":\"path0\","
-        "        \"forward\":[1,0,0],"
-        "        \"alphaFunction\": \"EASE_IN_OUT\","
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }]"
-        "    },"
-        "    \"pathAnimation2\": {"
-        "      \"duration\": 3.0,"
-        "      \"endAction\": \"BAKE_FINAL\","
-        "      \"disconnectAction\": \"DISCARD\","
-        "      \"properties\": [{"
-        "        \"actor\": \"greeting\","
-        "        \"path\":\"path0\","
-        "        \"forward\":[1,0,0],"
-        "        \"alphaFunction\": \"EASE_IN_OUT\","
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }]"
-        "    }"
-        "  },"
-        "  \"stage\": [{"
-        "    \"name\": \"greeting\","
-        "    \"type\": \"TextLabel\","
-        "    \"text\": \"Touch me\","
-        "    \"inherit\": [\"basicText\"],"
-        "    \"position\": [0, -120, 0],"
-        "    \"size\": [200, 200, 1],"
-        "    \"orientation\": [0, 0, 30],"
-        "    \"signals\": [{"
-        "      \"name\": \"touched\","
-        "      \"action\": \"play\","
-        "      \"animation\": \"animate\""
-        "    }]"
-        "  }]"
-        "}");
+    "{"
+    "   \"constants\":"
+    "   {"
+    "     \"ALPHA_FUNCTION\":\"EASE_IN_OUT\""
+    "   },"
+    "   \"paths\":"
+    "   {"
+    "     \"path0\":"
+    "     {"
+    "       \"points\":[ [-150, -50, 0], [0.0,70.0,0.0], [190.0,-150.0,0.0] ],"
+    "       \"curvature\":0.35"
+    "     }"
+    "   },"
+    "  \"animations\": {"
+    "    \"animate\": {"
+    "      \"loop\": true,"
+    "      \"endAction\": \"BAKE\","
+    "      \"disconnectAction\": \"BAKE\","
+    "      \"properties\":"
+    "      [{"
+    "        \"actor\": \"greeting\","
+    "        \"property\": \"position\","
+    "        \"value\": [300, 300, -1000],"
+    "        \"alphaFunction\": \"{ALPHA_FUNCTION}\","
+    "        \"relative\": true,"
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"visible\","
+    "         \"alphaFunction\": \"LINEAR\","
+    "         \"value\": true"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"sizeWidth\","
+    "         \"alphaFunction\": \"REVERSE\","
+    "         \"value\": 10.0"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_IN\","
+    "         \"value\": [10.0,20.0,30.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_OUT\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_IN_OUT\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_IN_SINE\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_OUT_SINE\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_IN_OUT_SINE\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"BOUNCE\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"SIN\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       },"
+    "       {"
+    "         \"actor\": \"greeting\","
+    "         \"property\": \"orientation\","
+    "         \"alphaFunction\": \"EASE_OUT_BACK\","
+    "         \"value\": [0.0, 0.0, 0.0, 1.0]"
+    "       }"
+    "      ]"
+    "    },"
+    "    \"pathAnimation\": {"
+    "      \"duration\": 3.0,"
+    "      \"endAction\": \"DISCARD\","
+    "      \"disconnectAction\": \"BAKE_FINAL\","
+    "      \"properties\": [{"
+    "        \"actor\": \"greeting\","
+    "        \"path\":\"path0\","
+    "        \"forward\":[1,0,0],"
+    "        \"alphaFunction\": \"EASE_IN_OUT\","
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }]"
+    "    },"
+    "    \"pathAnimation2\": {"
+    "      \"duration\": 3.0,"
+    "      \"endAction\": \"BAKE_FINAL\","
+    "      \"disconnectAction\": \"DISCARD\","
+    "      \"properties\": [{"
+    "        \"actor\": \"greeting\","
+    "        \"path\":\"path0\","
+    "        \"forward\":[1,0,0],"
+    "        \"alphaFunction\": \"EASE_IN_OUT\","
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }]"
+    "    }"
+    "  },"
+    "  \"stage\": [{"
+    "    \"name\": \"greeting\","
+    "    \"type\": \"TextLabel\","
+    "    \"text\": \"Touch me\","
+    "    \"inherit\": [\"basicText\"],"
+    "    \"position\": [0, -120, 0],"
+    "    \"size\": [200, 200, 1],"
+    "    \"orientation\": [0, 0, 30],"
+    "    \"signals\": [{"
+    "      \"name\": \"touched\","
+    "      \"action\": \"play\","
+    "      \"animation\": \"animate\""
+    "    }]"
+    "  }]"
+    "}");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   Animation anim = builder.CreateAnimation("animate");
 
-  DALI_TEST_CHECK( anim );
+  DALI_TEST_CHECK(anim);
 
   Property::Map map;
   map["ALPHA_FUNCTION"] = "EASE_IN_SQUARE";
-  anim = builder.CreateAnimation("animate", map);
+  anim                  = builder.CreateAnimation("animate", map);
 
-  DALI_TEST_CHECK( anim );
+  DALI_TEST_CHECK(anim);
 
   anim = builder.CreateAnimation("pathAnimation");
 
-  DALI_TEST_CHECK( anim );
+  DALI_TEST_CHECK(anim);
 
   anim = builder.CreateAnimation("pathAnimation2");
 
-  DALI_TEST_CHECK( anim );
+  DALI_TEST_CHECK(anim);
 
   // trigger play
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-
   END_TEST;
 }
 
@@ -355,98 +347,97 @@ int UtcDaliBuilderAnimationN(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-        "{"
-        "   \"constants\":"
-        "   {"
-        "     \"TEXT\": \"Touch Me\","
-        "     \"NAME\": \"greeting\" "
-        "   },"
-        "   \"paths\":"
-        "   {"
-        "     \"path0\":"
-        "     {"
-        "       \"points\":[ [-150, -50, 0], [0.0,70.0,0.0], [190.0,-150.0,0.0] ],"
-        "       \"curvature\":0.35"
-        "     }"
-        "   },"
-        "  \"animations\": {"
-        "    \"animate\": {"
-        "      \"loop\": true,"
-        "      \"endAction\": \"BAKE\","
-        "      \"disconnectAction\": \"BAKE\","
-        "      \"properties\":"
-        "      [{"
-        "        \"actor\": \"{NAME}\","
-        "        \"property\": \"positioninvalid\","
-        "        \"value\": [300, 300, -1000],"
-        "        \"alphaFunction\": \"EASE_IN_OUT\","
-        "        \"relative\": true,"
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }"
-        "      ]"
-        "    },"
-        "    \"animate2\": {"
-        "      \"loop\": true,"
-        "      \"endAction\": \"BAKE\","
-        "      \"disconnectAction\": \"BAKE\","
-        "      \"properties\":"
-        "      [{"
-        "        \"actor\": \"{NAME}\","
-        "        \"property\": \"positioninvalid\","
-        "        \"value\": [300, 300, -1000],"
-        "        \"alphaFunction\": \"EGGS_OVER_EASY\","
-        "        \"relative\": true,"
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }"
-        "      ]"
-        "    },"
-        "    \"pathAnimation\": {"
-        "      \"duration\": 3.0,"
-        "      \"endAction\": \"DISCARD\","
-        "      \"disconnectAction\": \"BAKE_FINAL\","
-        "      \"properties\": [{"
-        "        \"actor\": \"greeting\","
-        "        \"path\":\"pathDoesntExist\","
-        "        \"forward\":[1,0,0],"
-        "        \"alphaFunction\": \"EASE_IN_OUT\","
-        "        \"timePeriod\": {"
-        "          \"delay\": 0,"
-        "          \"duration\": 3"
-        "        }"
-        "      }]"
-        "    }"
-        "  },"
-        "  \"stage\": [{"
-        "    \"name\": \"greeting\","
-        "    \"type\": \"TextLabel\","
-        "    \"text\": \"Touch me\","
-        "    \"inherit\": [\"basicText\"],"
-        "    \"position\": [0, -120, 0],"
-        "    \"size\": [200, 200, 1],"
-        "    \"orientation\": [0, 0, 30],"
-        "    \"signals\": [{"
-        "      \"name\": \"touched\","
-        "      \"action\": \"play\","
-        "      \"animation\": \"animate\""
-        "    }]"
-        "  },"
-        "  {"
-        "    \"name\": \"greeting2\","
-        "    \"type\": \"TextLabel\","
-        "    \"text\": \"Touch me\""
-        "  }]"
-        "}");
-
+    "{"
+    "   \"constants\":"
+    "   {"
+    "     \"TEXT\": \"Touch Me\","
+    "     \"NAME\": \"greeting\" "
+    "   },"
+    "   \"paths\":"
+    "   {"
+    "     \"path0\":"
+    "     {"
+    "       \"points\":[ [-150, -50, 0], [0.0,70.0,0.0], [190.0,-150.0,0.0] ],"
+    "       \"curvature\":0.35"
+    "     }"
+    "   },"
+    "  \"animations\": {"
+    "    \"animate\": {"
+    "      \"loop\": true,"
+    "      \"endAction\": \"BAKE\","
+    "      \"disconnectAction\": \"BAKE\","
+    "      \"properties\":"
+    "      [{"
+    "        \"actor\": \"{NAME}\","
+    "        \"property\": \"positioninvalid\","
+    "        \"value\": [300, 300, -1000],"
+    "        \"alphaFunction\": \"EASE_IN_OUT\","
+    "        \"relative\": true,"
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }"
+    "      ]"
+    "    },"
+    "    \"animate2\": {"
+    "      \"loop\": true,"
+    "      \"endAction\": \"BAKE\","
+    "      \"disconnectAction\": \"BAKE\","
+    "      \"properties\":"
+    "      [{"
+    "        \"actor\": \"{NAME}\","
+    "        \"property\": \"positioninvalid\","
+    "        \"value\": [300, 300, -1000],"
+    "        \"alphaFunction\": \"EGGS_OVER_EASY\","
+    "        \"relative\": true,"
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }"
+    "      ]"
+    "    },"
+    "    \"pathAnimation\": {"
+    "      \"duration\": 3.0,"
+    "      \"endAction\": \"DISCARD\","
+    "      \"disconnectAction\": \"BAKE_FINAL\","
+    "      \"properties\": [{"
+    "        \"actor\": \"greeting\","
+    "        \"path\":\"pathDoesntExist\","
+    "        \"forward\":[1,0,0],"
+    "        \"alphaFunction\": \"EASE_IN_OUT\","
+    "        \"timePeriod\": {"
+    "          \"delay\": 0,"
+    "          \"duration\": 3"
+    "        }"
+    "      }]"
+    "    }"
+    "  },"
+    "  \"stage\": [{"
+    "    \"name\": \"greeting\","
+    "    \"type\": \"TextLabel\","
+    "    \"text\": \"Touch me\","
+    "    \"inherit\": [\"basicText\"],"
+    "    \"position\": [0, -120, 0],"
+    "    \"size\": [200, 200, 1],"
+    "    \"orientation\": [0, 0, 30],"
+    "    \"signals\": [{"
+    "      \"name\": \"touched\","
+    "      \"action\": \"play\","
+    "      \"animation\": \"animate\""
+    "    }]"
+    "  },"
+    "  {"
+    "    \"name\": \"greeting2\","
+    "    \"type\": \"TextLabel\","
+    "    \"text\": \"Touch me\""
+    "  }]"
+    "}");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   Animation anim = builder.CreateAnimation("animate");
 
@@ -463,7 +454,7 @@ int UtcDaliBuilderAnimationN(void)
   // create referencing a different actor aka animation templates
   Property::Map map;
   map["NAME"] = "greeting2";
-  anim = builder.CreateAnimation("animate2", map);
+  anim        = builder.CreateAnimation("animate2", map);
   DALI_TEST_CHECK(anim);
 
   // alternative actor to use for FindChildByName
@@ -474,9 +465,7 @@ int UtcDaliBuilderAnimationN(void)
   anim = builder.CreateAnimation("animate2", map, application.GetScene().GetRootLayer());
   DALI_TEST_CHECK(anim);
 
-
   END_TEST;
-
 }
 
 int UtcDaliBuilderConstantsP(void)
@@ -485,56 +474,55 @@ int UtcDaliBuilderConstantsP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{"
-      "\"constants\":"
-      "{"
-      "  \"IMAGE_PATH\": \"apath\","
-      "  \"WIDTH\": 22.3,"
-      "  \"ANCHOR\": \"TOP_LEFT\","
-      "  \"PADDING\": [1,2,3,4]"
-      "},"
-      "\"stage\":"
-      "[{"
-      "  \"type\": \"ImageView\","
-      "  \"name\": \"{NAME}\","
-      "  \"size\": [100,100,1],"
-      "  \"parentOrigin\": \"TOP_LEFT\","
-      "  \"anchorPoint\": \"{ANCHOR}\","
-      "  \"padding\": \"{PADDING}\","
-      "  \"image\": { \"url\": \"dir/{IMAGE_PATH}\" },"
-      "  \"sizeWidth\": \"{WIDTH}\","
-      "  \"signals\": [{"
-      "    \"name\": \"touched\","
-      "    \"action\": \"quit\""
-      "  }]"
-      "}]"
-      "}"
-  );
+    "{"
+    "\"constants\":"
+    "{"
+    "  \"IMAGE_PATH\": \"apath\","
+    "  \"WIDTH\": 22.3,"
+    "  \"ANCHOR\": \"TOP_LEFT\","
+    "  \"PADDING\": [1,2,3,4]"
+    "},"
+    "\"stage\":"
+    "[{"
+    "  \"type\": \"ImageView\","
+    "  \"name\": \"{NAME}\","
+    "  \"size\": [100,100,1],"
+    "  \"parentOrigin\": \"TOP_LEFT\","
+    "  \"anchorPoint\": \"{ANCHOR}\","
+    "  \"padding\": \"{PADDING}\","
+    "  \"image\": { \"url\": \"dir/{IMAGE_PATH}\" },"
+    "  \"sizeWidth\": \"{WIDTH}\","
+    "  \"signals\": [{"
+    "    \"name\": \"touched\","
+    "    \"action\": \"quit\""
+    "  }]"
+    "}]"
+    "}");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
-  builder.AddConstant( "NAME", "image" );
+  builder.AddConstant("NAME", "image");
 
   Property::Map map = builder.GetConstants();
 
-  Dali::Property::Value* pValue = map.Find( "NAME" );
+  Dali::Property::Value* pValue = map.Find("NAME");
 
-  DALI_TEST_CHECK( pValue );
+  DALI_TEST_CHECK(pValue);
 
-  pValue = map.Find( "IMAGE_PATH" );
+  pValue = map.Find("IMAGE_PATH");
 
-  DALI_TEST_CHECK( pValue );
+  DALI_TEST_CHECK(pValue);
 
-  Dali::Property::Value value = builder.GetConstant( "WIDTH" );
+  Dali::Property::Value value = builder.GetConstant("WIDTH");
 
-  DALI_TEST_CHECK( value.GetType() != Property::NONE );
+  DALI_TEST_CHECK(value.GetType() != Property::NONE);
 
-  builder.AddActors ( application.GetScene().GetRootLayer() );
-  DALI_TEST_CHECK( builder );
+  builder.AddActors(application.GetScene().GetRootLayer());
+  DALI_TEST_CHECK(builder);
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("image");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
   END_TEST;
 }
@@ -545,64 +533,63 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "\"constants\":"
-      "{"
-      "  \"SIZE\": [10,20,30]"
-      "},"
-      "\"styles\":\n"
-      "{\n"
-      "  \"imageStyle\": \n"
-      "  {\n"
-      "    \"color\": [1,0,0,1],\n"
-      "    \"actors\": {\n"
-      "      \"childImage\": {\n"
-      "        \"color\": \"34\"\n"
-      "      }\n"
-      "    }\n"
-      "  }\n"
-      "},\n"
-      "\"templates\":\n"
-      "{\n"
-      "  \"imageViewTemplate\": { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"styles\": [\"imageStyle\"]\n"
-      "  },\n"
-      "  \"imageTree\": { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"styles\": [\"imageStyle\"],\n"
-      "    \"name\": \"image\",\n"
-      "    \"size\": \"{SIZE}\",\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"quit\"\n"
-      "    }],\n"
-      "    \"actors\": [\n"
-      "      {\n"
-      "        \"type\":\"ImageView\",\n"
-      "        \"name\":\"childImage\", \n"
-      "        \"color\": \n"
-      "          {\n"
-      "            \"r\": 10,\n"
-      "            \"g\": 10,\n"
-      "            \"b\": 10,\n"
-      "            \"a\": 100\n"
-      "          }\n"
-      "      },\n"
-      "      {\n"
-      "        \"type\":\"imageViewTemplate\",\n"
-      "        \"name\":\"childImage2\"\n"
-      "      }\n"
-      "    ]\n"
-      "  }\n"
-      "},\n"
-      "\"stage\":"
-      "[{"
-      "  \"type\": \"imageTree\","
-      "  \"size\": [100,100,1]"
-      "}]"
-      "}\n"
-  );
+    "{\n"
+    "\"constants\":"
+    "{"
+    "  \"SIZE\": [10,20,30]"
+    "},"
+    "\"styles\":\n"
+    "{\n"
+    "  \"imageStyle\": \n"
+    "  {\n"
+    "    \"color\": [1,0,0,1],\n"
+    "    \"actors\": {\n"
+    "      \"childImage\": {\n"
+    "        \"color\": \"34\"\n"
+    "      }\n"
+    "    }\n"
+    "  }\n"
+    "},\n"
+    "\"templates\":\n"
+    "{\n"
+    "  \"imageViewTemplate\": { \n"
+    "    \"type\": \"ImageView\",\n"
+    "    \"styles\": [\"imageStyle\"]\n"
+    "  },\n"
+    "  \"imageTree\": { \n"
+    "    \"type\": \"ImageView\",\n"
+    "    \"styles\": [\"imageStyle\"],\n"
+    "    \"name\": \"image\",\n"
+    "    \"size\": \"{SIZE}\",\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"quit\"\n"
+    "    }],\n"
+    "    \"actors\": [\n"
+    "      {\n"
+    "        \"type\":\"ImageView\",\n"
+    "        \"name\":\"childImage\", \n"
+    "        \"color\": \n"
+    "          {\n"
+    "            \"r\": 10,\n"
+    "            \"g\": 10,\n"
+    "            \"b\": 10,\n"
+    "            \"a\": 100\n"
+    "          }\n"
+    "      },\n"
+    "      {\n"
+    "        \"type\":\"imageViewTemplate\",\n"
+    "        \"name\":\"childImage2\"\n"
+    "      }\n"
+    "    ]\n"
+    "  }\n"
+    "},\n"
+    "\"stage\":"
+    "[{"
+    "  \"type\": \"imageTree\","
+    "  \"size\": [100,100,1]"
+    "}]"
+    "}\n");
 
   std::string stylejson(
     "{\n"
@@ -612,8 +599,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     "     \"color\": \"#344353\"\n"
     "   }\n"
     " }\n"
-    "}\n"
-    );
+    "}\n");
 
   std::string templatejson(
     "{ \n"
@@ -631,30 +617,28 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     "      \"name\":\"childImage\" \n"
     "    }\n"
     "  ]\n"
-    "}\n"
-    );
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
-  ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) );
-  DALI_TEST_CHECK( actor );
+  ImageView actor = ImageView::DownCast(builder.Create("imageTree"));
+  DALI_TEST_CHECK(actor);
 
   Dali::Property::Map map;
-  map["SIZE"] = Vector3(100,100,1);
-  actor = ImageView::DownCast( builder.Create( "imageTree",  map ) );
-  DALI_TEST_CHECK( actor );
+  map["SIZE"] = Vector3(100, 100, 1);
+  actor       = ImageView::DownCast(builder.Create("imageTree", map));
+  DALI_TEST_CHECK(actor);
 
   // create from json snippet
-  actor = ImageView::DownCast( builder.CreateFromJson( templatejson ) );
-  DALI_TEST_CHECK( actor );
-
+  actor = ImageView::DownCast(builder.CreateFromJson(templatejson));
+  DALI_TEST_CHECK(actor);
 
   // NB: already applied in create
-  DALI_TEST_CHECK( builder.ApplyStyle( "imageStyle",  actor ) );
+  DALI_TEST_CHECK(builder.ApplyStyle("imageStyle", actor));
 
   // apply from json snippet
-  DALI_TEST_CHECK( builder.ApplyFromJson( actor, stylejson ) );
+  DALI_TEST_CHECK(builder.ApplyFromJson(actor, stylejson));
 
   END_TEST;
 }
@@ -665,49 +649,48 @@ int UtcDaliBuilderRenderTasksP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "\"renderTasks\":\n"
-      "{\n"
-      "  \"task0\": {\n"
-      "    \"sourceActor\": \"image\",\n"
-      "    \"cameraActor\": \"camera\" \n"
-      "  }\n"
-      "},\n"
-      "\"stage\":\n"
-      "[\n"
-      "  { \n"
-      "    \"type\": \"CameraActor\",\n"
-      "    \"name\": \"camera\"\n"
-      "  }, \n"
-      "  { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"name\": \"image\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"quit\"\n"
-      "    }],\n"
-      "    \"actors\": [\n"
-      "      {\n"
-      "        \"type\":\"ImageView\",\n"
-      "        \"name\":\"childImage\" \n"
-      "      }\n"
-      "    ]\n"
-      "  }\n"
-      "]\n"
-      "}\n"
-  );
+    "{\n"
+    "\"renderTasks\":\n"
+    "{\n"
+    "  \"task0\": {\n"
+    "    \"sourceActor\": \"image\",\n"
+    "    \"cameraActor\": \"camera\" \n"
+    "  }\n"
+    "},\n"
+    "\"stage\":\n"
+    "[\n"
+    "  { \n"
+    "    \"type\": \"CameraActor\",\n"
+    "    \"name\": \"camera\"\n"
+    "  }, \n"
+    "  { \n"
+    "    \"type\": \"ImageView\",\n"
+    "    \"name\": \"image\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"quit\"\n"
+    "    }],\n"
+    "    \"actors\": [\n"
+    "      {\n"
+    "        \"type\":\"ImageView\",\n"
+    "        \"name\":\"childImage\" \n"
+    "      }\n"
+    "    ]\n"
+    "  }\n"
+    "]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
+  builder.LoadFromString(json);
 
   unsigned int count = application.GetScene().GetRenderTaskList().GetTaskCount();
 
   // coverage
-  builder.CreateRenderTask( "task0" );
+  builder.CreateRenderTask("task0");
 
-  DALI_TEST_CHECK( count <
-                   application.GetScene().GetRenderTaskList().GetTaskCount() );
+  DALI_TEST_CHECK(count <
+                  application.GetScene().GetRenderTaskList().GetTaskCount());
 
   END_TEST;
 }
@@ -718,31 +701,30 @@ int UtcDaliBuilderChildActionP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\"\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"hide\",\n"
-      "      \"actor\": \"actor\",\n"
-      "      \"childActor\": \"subActor\"\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\"\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"hide\",\n"
+    "      \"actor\": \"actor\",\n"
+    "      \"childActor\": \"subActor\"\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -750,20 +732,20 @@ int UtcDaliBuilderChildActionP(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("subActor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(!actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@ -774,32 +756,31 @@ int UtcDaliBuilderSetPropertyActionP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\"\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"set\",\n"
-      "      \"actor\": \"subActor\",\n"
-      "      \"property\": \"visible\",\n"
-      "      \"value\": false\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\"\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"set\",\n"
+    "      \"actor\": \"subActor\",\n"
+    "      \"property\": \"visible\",\n"
+    "      \"value\": false\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -807,20 +788,20 @@ int UtcDaliBuilderSetPropertyActionP(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("subActor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(!actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@ -831,29 +812,28 @@ int UtcDaliBuilderGenericActionP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\"\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"hide\"\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\"\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"hide\"\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -861,20 +841,20 @@ int UtcDaliBuilderGenericActionP(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("actor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(!actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@ -885,60 +865,59 @@ int UtcDaliBuilderPropertyNotificationP(void)
 
   // JSON with a quit event when the actor is touched
   std::string json(
-      "{\n"
-      "  \"stage\":\n"
-      "  [{\n"
-      "    \"type\": \"Actor\",\n"
-      "    \"name\": \"actor\",\n"
-      "    \"size\": [100,100,1],\n"
-      "    \"parentOrigin\": \"TOP_LEFT\",\n"
-      "    \"anchorPoint\": \"TOP_LEFT\",\n"
-      "    \"actors\": [{\n"
-      "      \"type\": \"Actor\",\n"
-      "      \"name\": \"subActor\"\n"
-      "    }],\n"
-      "    \"signals\": [{\n"
-      "      \"name\": \"touched\",\n"
-      "      \"action\": \"hide\"\n"
-      "    }],\n"
-      "    \"notifications\": [{\n"
-      "      \"property\": \"visible\",\n"
-      "      \"condition\": \"False\",\n"
-      "      \"action\": \"show\"\n"
-      "    },\n"
-      "    {\n"
-      "      \"property\": \"positionX\",\n"
-      "      \"condition\": \"LessThan\",\n"
-      "      \"arg0\": 0.0,\n"
-      "      \"action\": \"show\"\n"
-      "    },\n"
-      "    {\n"
-      "      \"property\": \"positionY\",\n"
-      "      \"condition\": \"GreaterThan\",\n"
-      "      \"arg0\": 200.0,\n"
-      "      \"action\": \"show\"\n"
-      "    },\n"
-      "    {\n"
-      "      \"property\": \"positionZ\",\n"
-      "      \"condition\": \"Inside\",\n"
-      "      \"arg0\": 0.0,\n"
-      "      \"arg1\": 10.0,\n"
-      "      \"action\": \"show\"\n"
-      "    },\n"
-      "    {\n"
-      "      \"property\": \"positionZ\",\n"
-      "      \"condition\": \"Outside\",\n"
-      "      \"arg0\": 40.0,\n"
-      "      \"arg1\": 50.0,\n"
-      "      \"action\": \"show\"\n"
-      "    }]\n"
-      "  }]\n"
-      "}\n"
-  );
+    "{\n"
+    "  \"stage\":\n"
+    "  [{\n"
+    "    \"type\": \"Actor\",\n"
+    "    \"name\": \"actor\",\n"
+    "    \"size\": [100,100,1],\n"
+    "    \"parentOrigin\": \"TOP_LEFT\",\n"
+    "    \"anchorPoint\": \"TOP_LEFT\",\n"
+    "    \"actors\": [{\n"
+    "      \"type\": \"Actor\",\n"
+    "      \"name\": \"subActor\"\n"
+    "    }],\n"
+    "    \"signals\": [{\n"
+    "      \"name\": \"touched\",\n"
+    "      \"action\": \"hide\"\n"
+    "    }],\n"
+    "    \"notifications\": [{\n"
+    "      \"property\": \"visible\",\n"
+    "      \"condition\": \"False\",\n"
+    "      \"action\": \"show\"\n"
+    "    },\n"
+    "    {\n"
+    "      \"property\": \"positionX\",\n"
+    "      \"condition\": \"LessThan\",\n"
+    "      \"arg0\": 0.0,\n"
+    "      \"action\": \"show\"\n"
+    "    },\n"
+    "    {\n"
+    "      \"property\": \"positionY\",\n"
+    "      \"condition\": \"GreaterThan\",\n"
+    "      \"arg0\": 200.0,\n"
+    "      \"action\": \"show\"\n"
+    "    },\n"
+    "    {\n"
+    "      \"property\": \"positionZ\",\n"
+    "      \"condition\": \"Inside\",\n"
+    "      \"arg0\": 0.0,\n"
+    "      \"arg1\": 10.0,\n"
+    "      \"action\": \"show\"\n"
+    "    },\n"
+    "    {\n"
+    "      \"property\": \"positionZ\",\n"
+    "      \"condition\": \"Outside\",\n"
+    "      \"arg0\": 40.0,\n"
+    "      \"arg1\": 50.0,\n"
+    "      \"action\": \"show\"\n"
+    "    }]\n"
+    "  }]\n"
+    "}\n");
 
   Builder builder = Builder::New();
-  builder.LoadFromString( json );
-  builder.AddActors ( application.GetScene().GetRootLayer() );
+  builder.LoadFromString(json);
+  builder.AddActors(application.GetScene().GetRootLayer());
 
   // Render and notify
   application.SendNotification();
@@ -946,11 +925,11 @@ int UtcDaliBuilderPropertyNotificationP(void)
 
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
-  Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-  touchEvent.points.push_back( point );
-  application.ProcessEvent( touchEvent );
+  Integration::Point      point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10.0f, 10.0f));
+  touchEvent.points.push_back(point);
+  application.ProcessEvent(touchEvent);
 
   // Render and notify
   application.SendNotification();
@@ -961,9 +940,9 @@ int UtcDaliBuilderPropertyNotificationP(void)
   application.Render();
 
   Actor actor = application.GetScene().GetRootLayer().FindChildByName("actor");
-  DALI_TEST_CHECK( actor );
+  DALI_TEST_CHECK(actor);
 
-  DALI_TEST_CHECK( actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
+  DALI_TEST_CHECK(actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE));
 
   END_TEST;
 }
@@