[dali_2.3.19] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-Alignment.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
index b1b7aba..d00fa11 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
@@ -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.
@@ -15,17 +15,16 @@
  *
  */
 
-#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;
 }
 
@@ -104,16 +102,16 @@ int UtcDaliAlignmentConstructorRegister(void)
 {
   ToolkitTestApplication application;
 
-  //Te ensure the object is registered after creation
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  //To ensure the object is registered after creation
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
   registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     Alignment alignment = Alignment::New();
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -121,110 +119,110 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOffStage(void)
 {
   ToolkitTestApplication application;
 
-  // Default, HorizontalCenter, VerticalCenter - Ensure they do not change!
+  // Default, HORIZONTAL_CENTER, VERTICAL_CENTER - Ensure they do not change!
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::VerticalCenter));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
 
-  // HorizontalLeft, VerticalCenter
+  // HORIZONTAL_LEFT, VERTICAL_CENTER
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::HorizontalLeft);
+    Alignment::Type type(Alignment::HORIZONTAL_LEFT);
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
 
-  // HorizontalRight, VerticalCenter
+  // HORIZONTAL_RIGHT, VERTICAL_CENTER
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::HorizontalRight);
+    Alignment::Type type(Alignment::HORIZONTAL_RIGHT);
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
 
-  // HorizontalLeft, VerticalTop
+  // HORIZONTAL_LEFT, VERTICAL_TOP
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalTop));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
 
-  // HorizontalCenter, VerticalTop
+  // HORIZONTAL_CENTER, VERTICAL_TOP
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::VerticalTop);
+    Alignment::Type type(Alignment::VERTICAL_TOP);
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
 
-  // HorizontalRight, VerticalTop
+  // HORIZONTAL_RIGHT, VERTICAL_TOP
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalTop));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
 
-  // HorizontalLeft, VerticalBottom
+  // HORIZONTAL_LEFT, VERTICAL_BOTTOM
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalBottom));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
 
-  // HorizontalCenter, VerticalBottom
+  // HORIZONTAL_CENTER, VERTICAL_BOTTOM
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::VerticalBottom);
+    Alignment::Type type(Alignment::VERTICAL_BOTTOM);
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
 
-  // HorizontalRight, VerticalBottom
+  // HORIZONTAL_RIGHT, VERTICAL_BOTTOM
   {
     Alignment alignment = Alignment::New();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalBottom));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
   }
@@ -235,7 +233,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
 {
   ToolkitTestApplication application;
 
-  // Default, HorizontalCenter, VerticalCenter - Ensure they do not change!
+  // Default, HORIZONTAL_CENTER, VERTICAL_CENTER - Ensure they do not change!
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -244,9 +242,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::VerticalCenter));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -255,7 +253,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
   }
 
-  // HorizontalLeft, VerticalCenter
+  // HORIZONTAL_LEFT, VERTICAL_CENTER
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -264,9 +262,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::HorizontalLeft);
+    Alignment::Type type(Alignment::HORIZONTAL_LEFT);
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -275,7 +273,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
   }
 
-  // HorizontalRight, VerticalCenter
+  // HORIZONTAL_RIGHT, VERTICAL_CENTER
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -284,9 +282,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::HorizontalRight);
+    Alignment::Type type(Alignment::HORIZONTAL_RIGHT);
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -295,7 +293,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
   }
 
-  // HorizontalLeft, VerticalTop
+  // HORIZONTAL_LEFT, VERTICAL_TOP
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -304,9 +302,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalTop));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -315,7 +313,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
   }
 
-  // HorizontalCenter, VerticalTop
+  // HORIZONTAL_CENTER, VERTICAL_TOP
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -324,9 +322,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::VerticalTop);
+    Alignment::Type type(Alignment::VERTICAL_TOP);
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -335,7 +333,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
   }
 
-  // HorizontalRight, VerticalTop
+  // HORIZONTAL_RIGHT, VERTICAL_TOP
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -344,9 +342,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalTop));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -355,7 +353,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
   }
 
-  // HorizontalLeft, VerticalBottom
+  // HORIZONTAL_LEFT, VERTICAL_BOTTOM
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -364,9 +362,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalBottom));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -375,7 +373,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
   }
 
-  // HorizontalCenter, VerticalBottom
+  // HORIZONTAL_CENTER, VERTICAL_BOTTOM
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -384,9 +382,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::VerticalBottom);
+    Alignment::Type type(Alignment::VERTICAL_BOTTOM);
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -395,7 +393,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
   }
 
-  // HorizontalRight, VerticalBottom
+  // HORIZONTAL_RIGHT, VERTICAL_BOTTOM
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -404,9 +402,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void)
     application.SendNotification();
 
     // Check default values
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
 
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalBottom));
+    Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM));
     alignment.SetAlignmentType(type);
     DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
 
@@ -421,45 +419,45 @@ int UtcDaliAlignmentSetAlignmentTypeNegative(void)
 {
   ToolkitTestApplication application;
 
-  // Setting HorizontalLeft, HorizontalCenter
+  // Setting HORIZONTAL_LEFT, HORIZONTAL_CENTER
   {
-    Alignment alignment = Alignment::New();
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::HorizontalCenter));
+    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::HorizontalCenter & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::HorizontalLeft & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::HORIZONTAL_LEFT & alignment.GetAlignmentType()));
   }
 
-  // Setting HorizontalCenter, HorizontalRight
+  // Setting HORIZONTAL_CENTER, HORIZONTAL_RIGHT
   {
-    Alignment alignment = Alignment::New();
-    Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::HorizontalRight));
+    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::HorizontalCenter & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::HorizontalRight & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::HORIZONTAL_RIGHT & alignment.GetAlignmentType()));
   }
 
-  // Setting VerticalTop, VerticalCenter
+  // Setting VERTICAL_TOP, VERTICAL_CENTER
   {
-    Alignment alignment = Alignment::New();
-    Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalCenter));
+    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::VerticalCenter & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::VerticalTop & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::VERTICAL_CENTER & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::VERTICAL_TOP & alignment.GetAlignmentType()));
   }
 
-  // Setting VerticalCenter, VerticalBottom
+  // Setting VERTICAL_CENTER, VERTICAL_BOTTOM
   {
-    Alignment alignment = Alignment::New();
-    Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalBottom));
+    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::VerticalTop & alignment.GetAlignmentType() );
-    DALI_TEST_CHECK( !(Alignment::VerticalBottom & alignment.GetAlignmentType()) );
+    DALI_TEST_CHECK(Alignment::VERTICAL_TOP & alignment.GetAlignmentType());
+    DALI_TEST_CHECK(!(Alignment::VERTICAL_BOTTOM & alignment.GetAlignmentType()));
   }
   END_TEST;
 }
@@ -468,10 +466,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
 {
   ToolkitTestApplication application;
 
-  // Default, HorizonalCenter, VerticalCenter
+  // Default, HorizonalCenter, VERTICAL_CENTER
   {
     Alignment alignment = Alignment::New();
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -481,10 +479,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
     application.SendNotification();
   }
 
-  // HorizontalLeft, VerticalCenter
+  // HORIZONTAL_LEFT, VERTICAL_CENTER
   {
-    Alignment alignment = Alignment::New(Alignment::HorizontalLeft);
-    DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -494,10 +492,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
     application.SendNotification();
   }
 
-  // HorizontalRight, VerticalCenter
+  // HORIZONTAL_RIGHT, VERTICAL_CENTER
   {
-    Alignment alignment = Alignment::New(Alignment::HorizontalRight);
-    DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+    Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -507,10 +505,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
     application.SendNotification();
   }
 
-  // HorizontalLeft, VerticalTop
+  // HORIZONTAL_LEFT, VERTICAL_TOP
   {
-    Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalTop);
-    DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
+    Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT, Alignment::VERTICAL_TOP);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -520,10 +518,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
     application.SendNotification();
   }
 
-  // HorizontalCenter, VerticalTop
+  // HORIZONTAL_CENTER, VERTICAL_TOP
   {
-    Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalTop);
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
+    Alignment alignment = Alignment::New(Alignment::HORIZONTAL_CENTER, Alignment::VERTICAL_TOP);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -533,10 +531,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
     application.SendNotification();
   }
 
-  // HorizontalRight, VerticalTop
+  // HORIZONTAL_RIGHT, VERTICAL_TOP
   {
-    Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalTop);
-    DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
+    Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT, Alignment::VERTICAL_TOP);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -546,10 +544,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
     application.SendNotification();
   }
 
-  // HorizontalLeft, VerticalBottom
+  // HORIZONTAL_LEFT, VERTICAL_BOTTOM
   {
-    Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalBottom);
-    DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
+    Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT, Alignment::VERTICAL_BOTTOM);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -559,10 +557,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
     application.SendNotification();
   }
 
-  // HorizontalCenter, VerticalBottom
+  // HORIZONTAL_CENTER, VERTICAL_BOTTOM
   {
-    Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalBottom);
-    DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
+    Alignment alignment = Alignment::New(Alignment::HORIZONTAL_CENTER, Alignment::VERTICAL_BOTTOM);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -572,10 +570,10 @@ int UtcDaliAlignmentGetAlignmentType(void)
     application.SendNotification();
   }
 
-  // HorizontalRight, VerticalBottom
+  // HORIZONTAL_RIGHT, VERTICAL_BOTTOM
   {
-    Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalBottom);
-    DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
+    Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT, Alignment::VERTICAL_BOTTOM);
+    DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION);
     alignment.Add(Actor::New());
     application.GetScene().Add(alignment);
     application.Render();
@@ -591,7 +589,7 @@ int UtcDaliAlignmentSetScaling(void)
 {
   ToolkitTestApplication application;
 
-  // ScaleToFill
+  // SCALE_TO_FILL
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -599,23 +597,23 @@ int UtcDaliAlignmentSetScaling(void)
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
-    alignment.SetScaling(Alignment::ScaleToFill);
-    DALI_TEST_EQUALS(Alignment::ScaleToFill, alignment.GetScaling(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+    alignment.SetScaling(Alignment::SCALE_TO_FILL);
+    DALI_TEST_EQUALS(Alignment::SCALE_TO_FILL, alignment.GetScaling(), TEST_LOCATION);
     application.Render();
     application.SendNotification();
 
     // For complete line coverage
-    alignment.SetAlignmentType(Alignment::HorizontalLeft);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::HorizontalRight);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalTop);
+    alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalBottom);
+    alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
     application.Render();
     application.SendNotification();
 
@@ -624,7 +622,7 @@ int UtcDaliAlignmentSetScaling(void)
     application.SendNotification();
   }
 
-  // ScaleToFitKeepAspect
+  // SCALE_TO_FIT_KEEP_ASPECT
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -632,23 +630,23 @@ int UtcDaliAlignmentSetScaling(void)
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
-    alignment.SetScaling(Alignment::ScaleToFitKeepAspect);
-    DALI_TEST_EQUALS(Alignment::ScaleToFitKeepAspect, alignment.GetScaling(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+    alignment.SetScaling(Alignment::SCALE_TO_FIT_KEEP_ASPECT);
+    DALI_TEST_EQUALS(Alignment::SCALE_TO_FIT_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION);
     application.Render();
     application.SendNotification();
 
     // For complete line coverage
-    alignment.SetAlignmentType(Alignment::HorizontalLeft);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::HorizontalRight);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalTop);
+    alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalBottom);
+    alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
     application.Render();
     application.SendNotification();
 
@@ -657,7 +655,7 @@ int UtcDaliAlignmentSetScaling(void)
     application.SendNotification();
   }
 
-  // ScaleToFillKeepAspect
+  // SCALE_TO_FILL_KEEP_ASPECT
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -665,23 +663,23 @@ int UtcDaliAlignmentSetScaling(void)
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
-    alignment.SetScaling(Alignment::ScaleToFillKeepAspect);
-    DALI_TEST_EQUALS(Alignment::ScaleToFillKeepAspect, alignment.GetScaling(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+    alignment.SetScaling(Alignment::SCALE_TO_FILL_KEEP_ASPECT);
+    DALI_TEST_EQUALS(Alignment::SCALE_TO_FILL_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION);
     application.Render();
     application.SendNotification();
 
     // For complete line coverage
-    alignment.SetAlignmentType(Alignment::HorizontalLeft);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::HorizontalRight);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalTop);
+    alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalBottom);
+    alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
     application.Render();
     application.SendNotification();
 
@@ -690,7 +688,7 @@ int UtcDaliAlignmentSetScaling(void)
     application.SendNotification();
   }
 
-  // ShrinkToFit
+  // SHRINK_TO_FIT
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -698,23 +696,23 @@ int UtcDaliAlignmentSetScaling(void)
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
-    alignment.SetScaling(Alignment::ShrinkToFit);
-    DALI_TEST_EQUALS(Alignment::ShrinkToFit, alignment.GetScaling(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+    alignment.SetScaling(Alignment::SHRINK_TO_FIT);
+    DALI_TEST_EQUALS(Alignment::SHRINK_TO_FIT, alignment.GetScaling(), TEST_LOCATION);
     application.Render();
     application.SendNotification();
 
     // For complete line coverage
-    alignment.SetAlignmentType(Alignment::HorizontalLeft);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::HorizontalRight);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalTop);
+    alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalBottom);
+    alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
     application.Render();
     application.SendNotification();
 
@@ -723,7 +721,7 @@ int UtcDaliAlignmentSetScaling(void)
     application.SendNotification();
   }
 
-  // ShrinkToFitKeepAspect
+  // SHRINK_TO_FIT_KEEP_ASPECT
   {
     Alignment alignment = Alignment::New();
     alignment.Add(Actor::New());
@@ -731,23 +729,23 @@ int UtcDaliAlignmentSetScaling(void)
     application.Render();
     application.SendNotification();
 
-    DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
-    alignment.SetScaling(Alignment::ShrinkToFitKeepAspect);
-    DALI_TEST_EQUALS(Alignment::ShrinkToFitKeepAspect, alignment.GetScaling(), TEST_LOCATION);
+    DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+    alignment.SetScaling(Alignment::SHRINK_TO_FIT_KEEP_ASPECT);
+    DALI_TEST_EQUALS(Alignment::SHRINK_TO_FIT_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION);
     application.Render();
     application.SendNotification();
 
     // For complete line coverage
-    alignment.SetAlignmentType(Alignment::HorizontalLeft);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::HorizontalRight);
+    alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalTop);
+    alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
     application.Render();
     application.SendNotification();
-    alignment.SetAlignmentType(Alignment::VerticalBottom);
+    alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
     application.Render();
     application.SendNotification();
 
@@ -762,49 +760,49 @@ int UtcDaliAlignmentGetScaling(void)
 {
   ToolkitTestApplication application;
 
-  // ScaleToFill
+  // SCALE_TO_FILL
   {
     Alignment alignment = Alignment::New();
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
 
-    alignment.SetScaling(Alignment::ScaleToFill);
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFill);
+    alignment.SetScaling(Alignment::SCALE_TO_FILL);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FILL);
   }
 
-  // ScaleToFitKeepAspect
+  // SCALE_TO_FIT_KEEP_ASPECT
   {
     Alignment alignment = Alignment::New();
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
 
-    alignment.SetScaling(Alignment::ScaleToFitKeepAspect);
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFitKeepAspect);
+    alignment.SetScaling(Alignment::SCALE_TO_FIT_KEEP_ASPECT);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FIT_KEEP_ASPECT);
   }
 
-  // ScaleToFillKeepAspect
+  // SCALE_TO_FILL_KEEP_ASPECT
   {
     Alignment alignment = Alignment::New();
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
 
-    alignment.SetScaling(Alignment::ScaleToFillKeepAspect);
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFillKeepAspect);
+    alignment.SetScaling(Alignment::SCALE_TO_FILL_KEEP_ASPECT);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FILL_KEEP_ASPECT);
   }
 
-  // ShrinkToFit
+  // SHRINK_TO_FIT
   {
     Alignment alignment = Alignment::New();
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
 
-    alignment.SetScaling(Alignment::ShrinkToFit);
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ShrinkToFit);
+    alignment.SetScaling(Alignment::SHRINK_TO_FIT);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SHRINK_TO_FIT);
   }
 
-  // ShrinkToFitKeepAspect
+  // SHRINK_TO_FIT_KEEP_ASPECT
   {
     Alignment alignment = Alignment::New();
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
 
-    alignment.SetScaling(Alignment::ShrinkToFitKeepAspect);
-    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ShrinkToFitKeepAspect);
+    alignment.SetScaling(Alignment::SHRINK_TO_FIT_KEEP_ASPECT);
+    DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SHRINK_TO_FIT_KEEP_ASPECT);
   }
 
   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();
@@ -955,7 +953,7 @@ int UtcDaliAlignmentSizeSetP(void)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-static bool TouchCallback(Actor actor, const TouchData& event)
+static bool TouchCallback(Actor actor, const TouchEvent& event)
 {
   return false;
 }
@@ -967,11 +965,11 @@ 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.TouchSignal().Connect(&TouchCallback);
+  alignment.TouchedSignal().Connect(&TouchCallback);
 
   application.Render();
   application.SendNotification();
@@ -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;