X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Button.cpp;h=83ebfb67868ac91860c8bf27d02beaabcc4b99b2;hp=a2bf49d7d70128041326b8d83a253d52129c06f0;hb=HEAD;hpb=caf7677175a0e8b9c690d4f2ab73adc295f22c0e

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index a2bf49d..76a10fc 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -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.
@@ -15,26 +15,23 @@
  *
  */
 
-#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-test-utils/toolkit-timer.h"
 
-#include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
-
 void utc_dali_toolkit_button_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -47,22 +44,42 @@ void utc_dali_toolkit_button_cleanup(void)
 
 namespace
 {
-static const char* TEST_IMAGE_ONE = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
+static bool gIsCalledButtonCallback      = false;
+static bool gIsCalledChildButtonCallback = false;
 
-static bool gIsCalledButtonCallback = false;
-
-const int RENDER_FRAME_INTERVAL = 16;
-
-static bool ButtonCallback( Button button )
+static bool ButtonCallback(Button button)
 {
   gIsCalledButtonCallback = true;
   return false;
 }
 
+static bool ChildButtonCallback(Button button)
+{
+  gIsCalledChildButtonCallback = true;
+  return false;
+}
+
+static std::string GetButtonText(Button button)
+{
+  Property::Value value = button.GetProperty(Toolkit::Button::Property::LABEL);
+
+  Property::Map* labelProperty = value.GetMap();
+
+  std::string textLabel;
+
+  if(labelProperty)
+  {
+    Property::Value* value = labelProperty->Find(Toolkit::TextVisual::Property::TEXT);
+    value->Get(textLabel);
+  }
+
+  return textLabel;
+}
+
 struct CallbackFunctor
 {
   CallbackFunctor(bool* callbackFlag)
-  : mCallbackFlag( callbackFlag )
+  : mCallbackFlag(callbackFlag)
   {
   }
 
@@ -76,141 +93,179 @@ struct CallbackFunctor
 Dali::Integration::Point GetPointDownInside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 240, 400 ) );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(240, 400));
   return point;
 }
 
 Dali::Integration::Point GetPointUpInside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( Vector2( 240, 400 ) );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(240, 400));
   return point;
 }
 
 Dali::Integration::Point GetPointLeave()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::LEAVE );
-  point.SetScreenPosition( Vector2( 240, 400 ) );
+  point.SetState(PointState::LEAVE);
+  point.SetScreenPosition(Vector2(240, 400));
   return point;
 }
 
 Dali::Integration::Point GetPointEnter()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::MOTION );
-  point.SetScreenPosition( Vector2( 240, 400 ) );
+  point.SetState(PointState::MOTION);
+  point.SetScreenPosition(Vector2(240, 400));
   return point;
 }
 
 Dali::Integration::Point GetPointDownOutside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::DOWN );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
   return point;
 }
 
 Dali::Integration::Point GetPointUpOutside()
 {
   Dali::Integration::Point point;
-  point.SetState( PointState::UP );
-  point.SetScreenPosition( Vector2( 10, 10 ) );
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(10, 10));
   return point;
 }
 
-static float ANIMATION_TIME( 0.5f );
-
 } // namespace
 
 int UtcDaliButtonConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   Button button;
 
-  DALI_TEST_CHECK( !button );
+  DALI_TEST_CHECK(!button);
   END_TEST;
 }
 
 int UtcDaliButtonCopyConstructorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   // Initialize an object, ref count == 1
   Button button = PushButton::New();
 
-  Button copy( button );
-  DALI_TEST_CHECK( copy );
+  Button copy(button);
+  DALI_TEST_CHECK(copy);
+  END_TEST;
+}
+
+int UtcDaliButtonMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  Button button = PushButton::New();
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+
+  Button moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
+
   END_TEST;
 }
 
 int UtcDaliButtonAssignmentOperatorP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  Button copy( button );
-  DALI_TEST_CHECK( copy );
+  Button copy(button);
+  DALI_TEST_CHECK(copy);
+
+  DALI_TEST_CHECK(button == copy);
+  END_TEST;
+}
+
+int UtcDaliButtonMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Button button = PushButton::New();
+  DALI_TEST_EQUALS(1, button.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), false, TEST_LOCATION);
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+
+  Button moved;
+  moved = std::move(button);
+  DALI_TEST_CHECK(moved);
+  DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+  DALI_TEST_EQUALS(moved.GetProperty<bool>(Button::Property::TOGGLABLE), true, TEST_LOCATION);
+  DALI_TEST_CHECK(!button);
 
-  DALI_TEST_CHECK( button == copy );
   END_TEST;
 }
 
 int UtcDaliButtonDownCastP(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
   BaseHandle object(button);
 
-  Button button2 = Button::DownCast( object );
+  Button button2 = Button::DownCast(object);
   DALI_TEST_CHECK(button2);
 
-  Button button3 = DownCast< Button >(object);
+  Button button3 = DownCast<Button>(object);
   DALI_TEST_CHECK(button3);
   END_TEST;
 }
 
 int UtcDaliButtonDownCastN(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   BaseHandle unInitializedObject;
 
-  Button button1 = Button::DownCast( unInitializedObject );
-  DALI_TEST_CHECK( !button1 );
+  Button button1 = Button::DownCast(unInitializedObject);
+  DALI_TEST_CHECK(!button1);
 
-  Button button2 = DownCast< Button >( unInitializedObject );
-  DALI_TEST_CHECK( !button2 );
+  Button button2 = DownCast<Button>(unInitializedObject);
+  DALI_TEST_CHECK(!button2);
   END_TEST;
 }
 
-int UtcDaliButtonSetDisabledP(void)
+int UtcDaliButtonDisabledPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetDisabled( true );
+  button.SetProperty(button.GetPropertyIndex("disabled"), true);
 
-  DALI_TEST_CHECK( button.IsDisabled() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("disabled")), true, TEST_LOCATION);
 
-  button.SetDisabled( false );
+  button.SetProperty(button.GetPropertyIndex("disabled"), false);
 
-  DALI_TEST_CHECK( !button.IsDisabled() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("disabled")), false, TEST_LOCATION);
 
-  button.SetDisabled( true );
+  button.SetProperty(button.GetPropertyIndex("disabled"), true);
 
-  DALI_TEST_CHECK( button.IsDisabled() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("disabled")), true, TEST_LOCATION);
 
-  button.SetDisabled( false );
+  button.SetProperty(button.GetPropertyIndex("disabled"), false);
+
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("disabled")), false, TEST_LOCATION);
 
-  DALI_TEST_CHECK( !button.IsDisabled() );
   END_TEST;
 }
 
@@ -224,17 +279,17 @@ int UtcDaliButtonSetDisabledWithDifferentStates01P(void)
 
   bool SELECTED = true;
 
-  button.SetProperty( Button::Property::TOGGLABLE, true);
-  button.SetProperty( Button::Property::SELECTED, SELECTED );
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::SELECTED, SELECTED);
 
-  button.SetProperty( Button::Property::DISABLED, true);
+  button.SetProperty(Button::Property::DISABLED, true);
 
   tet_infoline("Set button to SELECTED = false whilst disabled, should not change to false\n");
-  button.SetProperty( Button::Property::SELECTED, !SELECTED );
+  button.SetProperty(Button::Property::SELECTED, !SELECTED);
 
-  bool isSelected = button.GetProperty<bool>( Button::Property::SELECTED ) ;
+  bool isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
 
-  DALI_TEST_EQUALS( isSelected, SELECTED , TEST_LOCATION );
+  DALI_TEST_EQUALS(isSelected, SELECTED, TEST_LOCATION);
 
   END_TEST;
 }
@@ -249,19 +304,19 @@ int UtcDaliButtonSetDisabledWithDifferentStates02P(void)
 
   bool SELECTED = true;
 
-  button.SetProperty( Button::Property::TOGGLABLE, true );
-  button.SetProperty( Button::Property::SELECTED, SELECTED );
-  button.SetProperty( Button::Property::DISABLED, true );
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::SELECTED, SELECTED);
+  button.SetProperty(Button::Property::DISABLED, true);
 
-  bool isSelected =  button.GetProperty<bool>( Button::Property::SELECTED );
-  DALI_TEST_EQUALS( isSelected, SELECTED , TEST_LOCATION );
+  bool isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+  DALI_TEST_EQUALS(isSelected, SELECTED, TEST_LOCATION);
   tet_infoline("Set button to DISABLED = false whilst disabled and then set to unselected\n");
 
-  button.SetProperty( Button::Property::DISABLED, false );
-  button.SetProperty( Button::Property::SELECTED, !SELECTED );
+  button.SetProperty(Button::Property::DISABLED, false);
+  button.SetProperty(Button::Property::SELECTED, !SELECTED);
 
-  isSelected = button.GetProperty<bool>( Button::Property::SELECTED );
-  DALI_TEST_EQUALS( isSelected, !SELECTED , TEST_LOCATION );
+  isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+  DALI_TEST_EQUALS(isSelected, !SELECTED, TEST_LOCATION);
 
   END_TEST;
 }
@@ -272,8 +327,8 @@ int UtcDaliButtonPropertyGetLabelAlignment(void)
   tet_infoline(" UtcDaliPushButtonPropertyGetLabelAlignment\n");
 
   Button button = PushButton::New();
-  button.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END"  );
-  DALI_TEST_EQUALS( button.GetProperty<std::string>( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT ), "END", TEST_LOCATION );
+  button.SetProperty(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END");
+  DALI_TEST_EQUALS(button.GetProperty<std::string>(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT), "END", TEST_LOCATION);
 
   END_TEST;
 }
@@ -284,37 +339,34 @@ int UtcDaliButtonIsDisabledP(void)
 
   Button button = PushButton::New();
 
-  button.SetDisabled( true );
+  button.SetProperty(Button::Property::DISABLED, true);
 
-  DALI_TEST_CHECK( button.IsDisabled() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::DISABLED), true, TEST_LOCATION);
 
-  button.SetDisabled( false );
+  button.SetProperty(Button::Property::DISABLED, false);
 
-  DALI_TEST_CHECK( !button.IsDisabled() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::DISABLED), false, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetAutoRepeatingP(void)
+int UtcDaliButtonAutoRepeatingPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetAutoRepeating( true );
-
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), true);
 
-  button.SetAutoRepeating( false );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
 
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), false);
 
-  button.SetAutoRepeating( true );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION);
 
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), true);
 
-  button.SetAutoRepeating( false );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
 
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
   END_TEST;
 }
 
@@ -324,13 +376,14 @@ int UtcDaliButtonIsAutoRepeatingP(void)
 
   Button button = PushButton::New();
 
-  button.SetAutoRepeating( true );
+  button.SetProperty(Button::Property::AUTO_REPEATING, true);
 
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::AUTO_REPEATING), true, TEST_LOCATION);
 
-  button.SetAutoRepeating( false );
+  button.SetProperty(Button::Property::AUTO_REPEATING, false);
+
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::AUTO_REPEATING), false, TEST_LOCATION);
 
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
   END_TEST;
 }
 
@@ -342,224 +395,217 @@ int UtcDaliButtonAutoRepeatingP(void)
   const float AUTO_REPEATING_DELAY = 0.15f;
 
   Button button = PushButton::New();
-  button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  button.SetParentOrigin( ParentOrigin::TOP_LEFT );
-  button.SetPosition( 240, 400 );
-  button.SetSize( 100, 100 );
-  Stage::GetCurrent().Add( button );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::POSITION, Vector2(240, 400));
+  button.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
-  button.SetProperty( Toolkit::Button::Property::AUTO_REPEATING, true  );
-  button.SetProperty( Toolkit::Button::Property::INITIAL_AUTO_REPEATING_DELAY, AUTO_REPEATING_DELAY );
+  button.SetProperty(Toolkit::Button::Property::AUTO_REPEATING, true);
+  button.SetProperty(Toolkit::Button::Property::INITIAL_AUTO_REPEATING_DELAY, AUTO_REPEATING_DELAY);
   // connect to its touch signal
   ConnectionTracker* testTracker = new ConnectionTracker();
-  button.PressedSignal().Connect( &ButtonCallback );
-  button.ClickedSignal().Connect( &ButtonCallback );
+  button.PressedSignal().Connect(&ButtonCallback);
+  button.ClickedSignal().Connect(&ButtonCallback);
   bool clickedSignal = false;
   bool pressedSignal = false;
-  button.ConnectSignal( testTracker, "pressed", CallbackFunctor(&pressedSignal) );
-  button.ConnectSignal( testTracker, "clicked", CallbackFunctor(&clickedSignal) );
+  button.ConnectSignal(testTracker, "pressed", CallbackFunctor(&pressedSignal));
+  button.ConnectSignal(testTracker, "clicked", CallbackFunctor(&clickedSignal));
 
   Dali::Integration::TouchEvent event;
 
   // Touch point down and up inside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION );
-  DALI_TEST_EQUALS( pressedSignal, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(pressedSignal, true, TEST_LOCATION);
   tet_infoline("Consume first clicked signal then wait\n");
 
   gIsCalledButtonCallback = false;
-  Dali::Timer timer = Timer::New( AUTO_REPEATING_DELAY );
+  Dali::Timer timer       = Timer::New(AUTO_REPEATING_DELAY);
   timer.MockEmitSignal();
-  application.Wait( AUTO_REPEATING_DELAY*2 );
-  DALI_TEST_EQUALS( clickedSignal, true, TEST_LOCATION );
+  application.Wait(AUTO_REPEATING_DELAY * 2);
+  DALI_TEST_EQUALS(clickedSignal, true, TEST_LOCATION);
   tet_infoline("Check gIsCalledButtonCallback was called again after last consumption of it.\n");
 
-  DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliButtonSetInitialAutoRepeatingDelayP(void)
+int UtcDaliButtonInitialAutoRepeatingDelayPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetInitialAutoRepeatingDelay( 0.5f );
+  button.SetProperty(button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.5f);
 
-  DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.5f, TEST_LOCATION);
 
-  button.SetInitialAutoRepeatingDelay( 0.2f );
+  button.SetProperty(button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.2f);
+
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.2f, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.2f, TEST_LOCATION );
   END_TEST;
 }
 
-int UtcDaliButtonSetNextAutoRepeatingDelayP(void)
+int UtcDaliButtonNextAutoRepeatingDelayPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetNextAutoRepeatingDelay( 0.5f );
+  button.SetProperty(button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.5f);
 
-  DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.5f, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.5f, TEST_LOCATION);
 
-  button.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, 0.2f );
+  button.SetProperty(button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.2f);
 
-  DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.2f, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.2f, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetTogglableButtonP(void)
+int UtcDaliButtonTogglableButtonPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetTogglableButton( true );
+  button.SetProperty(button.GetPropertyIndex("togglable"), true);
 
-  DALI_TEST_CHECK( button.IsTogglableButton() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("togglable")), true, TEST_LOCATION);
 
-  button.SetTogglableButton( false );
+  button.SetProperty(button.GetPropertyIndex("togglable"), false);
 
-  DALI_TEST_CHECK( !button.IsTogglableButton() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("togglable")), false, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetSelectedP(void)
+int UtcDaliButtonSelectedPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
-  button.SetTogglableButton( true );
+  button.SetProperty(button.GetPropertyIndex("togglable"), true);
 
-  button.SetSelected( true );
+  button.SetProperty(button.GetPropertyIndex("selected"), true);
 
-  DALI_TEST_CHECK( button.IsSelected() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("selected")), true, TEST_LOCATION);
 
-  button.SetSelected( false );
+  button.SetProperty(button.GetPropertyIndex("selected"), false);
 
-  DALI_TEST_CHECK( !button.IsSelected() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("selected")), false, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetAnimationTimeP(void)
+int UtcDaliButtonSetLabelStringWithPropertyMapP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetAnimationTimeP");
 
   Button button = PushButton::New();
+  button.SetProperty(Toolkit::Button::Property::LABEL,
+                     Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f).Add(Toolkit::TextVisual::Property::TEXT, "Button Label"));
 
-  button.SetAnimationTime( ANIMATION_TIME );
-
-  DALI_TEST_EQUALS( button.GetAnimationTime(), ANIMATION_TIME, TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetLabelStringP(void)
+int UtcDaliButtonSetLabelStringWithPropertyMapStringsP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
-  button.SetProperty( Toolkit::Button::Property::LABEL,
-                      Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
-                                     .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
-                     );
 
-  button.SetLabelText( "Button Label" );
+  tet_infoline(" UtcDaliButtonSetLabelStringWithPropertyMapStringsP Setting Button text using String then replacing with Enum then string");
 
-  DALI_TEST_EQUALS( button.GetLabelText(), "Button Label", TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliButtonSetLabelPropertyP(void)
-{
-  ToolkitTestApplication application;
+  Property::Map textVisualMapInitial;
+  textVisualMapInitial["visualType"] = "TEXT";
+  textVisualMapInitial["pointSize"]  = 15.0f;
+  textVisualMapInitial["text"]       = "button label initial";
 
-  const std::string TEST_LABEL1 = "test label one";
-  const std::string TEST_LABEL2 = "test label two";
+  button.SetProperty(Button::Property::LABEL, textVisualMapInitial);
 
-  Button button = PushButton::New();
+  DALI_TEST_EQUALS(GetButtonText(button), "button label initial", TEST_LOCATION);
 
-  button.SetProperty( Toolkit::Button::Property::LABEL,
-                        Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
-                                       .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
-                     );
+  tet_infoline(" UtcDaliButtonSetLabelStringWithPropertyMapStringsP Intermediate part of test");
 
-  button.SetProperty( Button::Property::LABEL_TEXT, TEST_LABEL1 );
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT);
+  propertyMap.Insert(Toolkit::TextVisual::Property::TEXT, "error if this is the final text");
+  propertyMap.Insert(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
 
-  std::string labelText = button.GetProperty<std::string>( Button::Property::LABEL_TEXT );
+  button.SetProperty(Button::Property::LABEL, propertyMap);
 
-  DALI_TEST_EQUALS( labelText, TEST_LABEL1,  TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), "error if this is the final text", TEST_LOCATION);
 
-  Property::Map propertyMap;
-  propertyMap.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::DevelVisual::TEXT );
-  propertyMap.Insert( Toolkit::TextVisual::Property::TEXT,  TEST_LABEL2 );
-  propertyMap.Insert( Toolkit::TextVisual::Property::TEXT_COLOR, Color::BLUE );
-  propertyMap.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
-  button.SetProperty( Button::Property::LABEL, propertyMap );
+  tet_infoline(" UtcDaliButtonSetLabelStringWithPropertyMapStringsP Final part of test");
 
-  labelText = button.GetProperty<std::string>( Button::Property::LABEL_TEXT );
+  Property::Map textVisualMap;
+  textVisualMap["visualType"] = "TEXT";
+  textVisualMap["pointSize"]  = 15.0f;
+  textVisualMap["text"]       = "Button Label";
 
-  DALI_TEST_EQUALS( labelText, TEST_LABEL2,  TEST_LOCATION );
+  button.SetProperty(Toolkit::Button::Property::LABEL, textVisualMap);
 
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetUnselectedImageP(void)
+int UtcDaliButtonSetLabelWithStringP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetUnselectedImageP");
-
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
-
-  application.SendNotification();
-  application.Render();
 
-  pushButton.SetUnselectedImage( "Image.jpg" );
+  Button button = PushButton::New();
 
-  application.SendNotification();
-  application.Render();
+  // Set default point size for text visual as style sheet not available.
+  button.SetProperty(Toolkit::Button::Property::LABEL,
+                     Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f));
 
-  DALI_TEST_CHECK( pushButton );
+  button.SetProperty(Toolkit::Button::Property::LABEL, "Button Label");
 
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetSelectedImageP(void)
+int UtcDaliButtonSetLabelPropertyP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetButtonImage");
 
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
+  tet_infoline(" UtcDaliButtonSetLabelPropertyP Set text label and then set again with new text");
 
-  application.SendNotification();
-  application.Render();
+  const std::string TEST_LABEL1 = "test label one";
+  const std::string TEST_LABEL2 = "test label two";
 
-  pushButton.SetSelectedImage( "Image.jpg" );
+  Button button = PushButton::New();
 
-  application.SendNotification();
-  application.Render();
+  button.SetProperty(Toolkit::Button::Property::LABEL,
+                     Property::Map().Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT).Add(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f).Add(Toolkit::TextVisual::Property::TEXT, TEST_LABEL1));
 
-  DALI_TEST_CHECK( pushButton );
+  DALI_TEST_EQUALS(GetButtonText(button), TEST_LABEL1, TEST_LOCATION);
+
+  Property::Map propertyMap;
+  propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT);
+  propertyMap.Insert(Toolkit::TextVisual::Property::TEXT, TEST_LABEL2);
+  propertyMap.Insert(Toolkit::TextVisual::Property::TEXT_COLOR, Color::BLUE);
+  propertyMap.Insert(Toolkit::TextVisual::Property::POINT_SIZE, 15.0f);
+  button.SetProperty(Button::Property::LABEL, propertyMap);
+
+  DALI_TEST_EQUALS(GetButtonText(button), TEST_LABEL2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -570,104 +616,104 @@ int UtcDaliButtonPressedSignalP(void)
   tet_infoline(" UtcDaliButtonPressedSignalP");
 
   Button button = PushButton::New();
-  button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  button.SetParentOrigin( ParentOrigin::TOP_LEFT );
-  button.SetPosition( 240, 400 );
-  button.SetSize( 100, 100 );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::POSITION, Vector2(240, 400));
+  button.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
 
-  Stage::GetCurrent().Add( button );
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
   // connect to its touch signal
   ConnectionTracker* testTracker = new ConnectionTracker();
-  button.PressedSignal().Connect( &ButtonCallback );
-  button.ReleasedSignal().Connect( &ButtonCallback );
-  bool pressedSignal = false;
+  button.PressedSignal().Connect(&ButtonCallback);
+  button.ReleasedSignal().Connect(&ButtonCallback);
+  bool pressedSignal  = false;
   bool releasedSignal = false;
-  button.ConnectSignal( testTracker, "pressed",   CallbackFunctor(&pressedSignal) );
-  button.ConnectSignal( testTracker, "released",  CallbackFunctor(&releasedSignal) );
+  button.ConnectSignal(testTracker, "pressed", CallbackFunctor(&pressedSignal));
+  button.ConnectSignal(testTracker, "released", CallbackFunctor(&releasedSignal));
 
   Dali::Integration::TouchEvent event;
 
   // Test1. Touch point down and up inside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( pressedSignal );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(pressedSignal);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( releasedSignal );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(releasedSignal);
 
   // Test2. Touch point down and up outside the button.
 
-  pressedSignal = false;
-  releasedSignal = false;
+  pressedSignal           = false;
+  releasedSignal          = false;
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !pressedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!pressedSignal);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !releasedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!releasedSignal);
 
   // Test3. Touch point down inside and up outside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointLeave() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointLeave());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
 
   // Test4. Touch point down outside and up inside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointEnter() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointEnter());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
   END_TEST;
 }
 
@@ -677,90 +723,90 @@ int UtcDaliButtonClickedSignalP(void)
   tet_infoline(" UtcDaliButtonClickedSignalP");
 
   Button button = PushButton::New();
-  button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  button.SetParentOrigin( ParentOrigin::TOP_LEFT );
-  button.SetPosition( 240, 400 );
-  button.SetSize( 100, 100 );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::POSITION, Vector2(240, 400));
+  button.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
 
-  Stage::GetCurrent().Add( button );
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
   // connect to its touch signal
-  button.ClickedSignal().Connect( &ButtonCallback );
-  bool clickedSignal = false;
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  button.ConnectSignal( testTracker, "clicked",   CallbackFunctor(&clickedSignal) );
+  button.ClickedSignal().Connect(&ButtonCallback);
+  bool               clickedSignal = false;
+  ConnectionTracker* testTracker   = new ConnectionTracker();
+  button.ConnectSignal(testTracker, "clicked", CallbackFunctor(&clickedSignal));
 
   Dali::Integration::TouchEvent event;
 
   // Test1. Touch point down and up inside the button.
 
   gIsCalledButtonCallback = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( clickedSignal );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(clickedSignal);
 
   // Test2. Touch point down and up outside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  clickedSignal           = false;
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!clickedSignal);
 
   // Test3. Touch point down inside and up outside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownInside() );
-  application.ProcessEvent( event );
+  clickedSignal           = false;
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointLeave() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointLeave());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpOutside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpOutside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!clickedSignal);
 
   // Test4. Touch point down outside and up inside the button.
 
   gIsCalledButtonCallback = false;
-  clickedSignal = false;
-  event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointDownOutside() );
-  application.ProcessEvent( event );
+  clickedSignal           = false;
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownOutside());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointEnter() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointEnter());
+  application.ProcessEvent(event);
 
   event = Dali::Integration::TouchEvent();
-  event.AddPoint( GetPointUpInside() );
-  application.ProcessEvent( event );
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
 
-  DALI_TEST_CHECK( !gIsCalledButtonCallback );
-  DALI_TEST_CHECK( !clickedSignal );
+  DALI_TEST_CHECK(!gIsCalledButtonCallback);
+  DALI_TEST_CHECK(!clickedSignal);
   END_TEST;
 }
 
@@ -770,32 +816,32 @@ int UtcDaliButtonStateChangedSignalP(void)
   tet_infoline(" UtcDaliButtonStateChangedSignalP");
 
   Button button = PushButton::New();
-  button.SetTogglableButton( true );
 
-  Stage::GetCurrent().Add( button );
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+
+  application.GetScene().Add(button);
 
   application.SendNotification();
   application.Render();
 
   // connect to its signal
-  button.StateChangedSignal().Connect( &ButtonCallback );
-  bool stateChangedSignal = false;
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  button.ConnectSignal( testTracker, "stateChanged",   CallbackFunctor(&stateChangedSignal) );
+  button.StateChangedSignal().Connect(&ButtonCallback);
+  bool               stateChangedSignal = false;
+  ConnectionTracker* testTracker        = new ConnectionTracker();
+  button.ConnectSignal(testTracker, "stateChanged", CallbackFunctor(&stateChangedSignal));
 
   gIsCalledButtonCallback = false;
-  button.SetSelected( true );
+  button.SetProperty(Button::Property::SELECTED, true);
 
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( stateChangedSignal );
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(stateChangedSignal);
 
   gIsCalledButtonCallback = false;
-  stateChangedSignal = false;
+  stateChangedSignal      = false;
 
-  button.SetSelected( false );
-
-  DALI_TEST_CHECK( gIsCalledButtonCallback );
-  DALI_TEST_CHECK( stateChangedSignal );
+  button.SetProperty(Button::Property::SELECTED, false);
+  DALI_TEST_CHECK(gIsCalledButtonCallback);
+  DALI_TEST_CHECK(stateChangedSignal);
   END_TEST;
 }
 
@@ -807,434 +853,186 @@ int UtcDaliButtonSetProperty(void)
   PushButton pushButton = PushButton::New();
 
   pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), false);
-  DALI_TEST_CHECK( false == pushButton.IsDisabled() );
-
-  pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true);
-  DALI_TEST_CHECK( true == pushButton.IsDisabled() );
-
-  END_TEST;
-}
-
-int UtcDaliButtonSize(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSize");
-
-  // First an image is set, then SetSize is called.
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
-
-  pushButton.SetBackgroundImage( "Image.jpg" );
-  pushButton.SetSize( 10.f, 10.f );
-
-  application.SendNotification();
-  application.Render();
-
-  Vector3 size = pushButton.GetCurrentSize();
-
-  DALI_TEST_EQUALS( size.width, 10.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 10.f, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliButtonSetSelectedBackgroundImageP(void)
-{
-  ToolkitTestApplication application;
 
-  PushButton button = PushButton::New();
-  Stage::GetCurrent().Add( button );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("disabled")), false, TEST_LOCATION);
 
-  try
-  {
-    button.SetSelectedBackgroundImage( "TestImage.jpg");
-    DALI_TEST_CHECK( true );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( false );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetSelectedBackgroundImageN(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button;
-
-  try
-  {
-    button.SetSelectedBackgroundImage( "TestImage.jpg");
-    DALI_TEST_CHECK( false );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetDisabledImageP(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button = PushButton::New();
-  Stage::GetCurrent().Add( button );
-
-  try
-  {
-    button.SetDisabledImage( "TestImage.jpg");
-    DALI_TEST_CHECK( true );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( false );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetDisabledImageN(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button;
-
-  try
-  {
-    button.SetDisabledImage( "TestImage.jpg");
-    DALI_TEST_CHECK( false );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetDisabledSelectedImageP(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button = PushButton::New();
-  Stage::GetCurrent().Add( button );
-
-  try
-  {
-    button.SetDisabledSelectedImage( "TestImage.jpg");
-    DALI_TEST_CHECK( true );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( false );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetDisabledSelectedImageN(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button;
-
-  try
-  {
-    button.SetDisabledSelectedImage( "TestImage.jpg");
-    DALI_TEST_CHECK( false );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetLabeActorlP(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button = PushButton::New();
-  Stage::GetCurrent().Add( button );
-
-  try
-  {
-    button.SetLabel( TextLabel::New("Hello") );
-    DALI_TEST_CHECK( true );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( false );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetLabelN(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button;
-
-  try
-  {
-    button.SetLabel( TextLabel::New("Hello") );
-    DALI_TEST_CHECK( false );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetButtonImageP(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button = PushButton::New();
-  Stage::GetCurrent().Add( button );
-
-  try
-  {
-    ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
-    button.SetButtonImage( image1 );
-
-    Property::Value value = button.GetProperty(Button::Property::UNSELECTED_STATE_IMAGE );
-    DALI_TEST_CHECK( value.Get<std::string>() == TEST_IMAGE_ONE );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( false );
-  }
-
-  std::string imageUrl;
-
-  Dali::Actor actor = button.GetButtonImage();
-
-  Toolkit::ImageView imageView = Toolkit::ImageView ::DownCast( actor );
-
-  tet_infoline(" UtcDaliButtonSetButtonImageP Ensure an ImageView is returned\n");
-  DALI_TEST_CHECK ( imageView )
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetButtonImageN(void)
-{
-  ToolkitTestApplication application;
-
-  PushButton button;
-
-  try
-  {
-    ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
-    button.SetButtonImage( image1 );
-
-    DALI_TEST_CHECK( false );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( true );
-  }
+  pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true);
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("disabled")), true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliButtonSetSelectedImageWithImageP(void)
+int UtcDaliButtonEventConsumption(void)
 {
-  ToolkitTestApplication application;
-
-  PushButton button = PushButton::New();
-  Stage::GetCurrent().Add( button );
-  ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
-
-  try
-  {
-    button.SetSelectedImage( image1 );
-    Property::Value value = button.GetProperty( Button::Property::SELECTED_STATE_IMAGE );
-    DALI_TEST_CHECK( value.Get<std::string>() == TEST_IMAGE_ONE );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( false );
-  }
-
-  std::string imageUrl;
-
-  Dali::Actor actor = button.GetSelectedImage();
+  /**
+   *  [ Parent ]
+   *  [ Child  ]
+   *
+   *  Child parented and positioned under parent.
+   *  Touch up and down performed on child.
+   *  Should only trigger signal on child.
+   */
 
-  Toolkit::ImageView imageView = Toolkit::ImageView::DownCast( actor );
-
-  tet_infoline(" UtcDaliButtonSetSelectedImageWithImageP Ensure an ImageView is returned\n");
-
-  END_TEST;
-}
-
-int UtcDaliButtonSetSelectedImageWithImageN(void)
-{
   ToolkitTestApplication application;
 
-  PushButton button;
-
-  try
-  {
-    button.SetSelectedImage( CreateBufferImage( 10, 10, Color::WHITE ) );
-    DALI_TEST_CHECK( false );
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( true );
-  }
+  Button parentButton = PushButton::New();
+  parentButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  parentButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  parentButton.SetProperty(Actor::Property::SIZE, Vector2(20, 20));
+  application.GetScene().Add(parentButton);
 
-  END_TEST;
-}
+  Button childButton = PushButton::New();
+  childButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  childButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT);
+  childButton.SetProperty(Actor::Property::SIZE, Vector2(20, 20));
+  parentButton.Add(childButton);
 
-int UtcDaliButtonSetSelectedColorP(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetSelectedColorP");
+  // Reset signal flags
+  gIsCalledChildButtonCallback = false;
+  gIsCalledButtonCallback      = false;
 
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
+  parentButton.ClickedSignal().Connect(&ButtonCallback);
+  childButton.ClickedSignal().Connect(&ChildButtonCallback);
 
+  // Peform a button click at coordinates (10,30) which is the child.
+  Dali::Integration::TouchEvent event;
+  event = Dali::Integration::TouchEvent();
+  Dali::Integration::Point point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 30));
+  event.AddPoint(point);
+  // flush the queue and render once
   application.SendNotification();
   application.Render();
+  application.ProcessEvent(event);
 
-  const Vector4 SET_COLOR = Color::BLUE;
-
-  pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
-  pushButton.SetProperty( Button::Property::SELECTED_COLOR, SET_COLOR );
-
+  event = Dali::Integration::TouchEvent();
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(10, 30));
+  event.AddPoint(point);
+  // flush the queue and render once
   application.SendNotification();
   application.Render();
+  application.ProcessEvent(event);
 
-  Vector4 color = pushButton.GetProperty<Vector4>( Button::Property::SELECTED_COLOR );
-
-  DALI_TEST_EQUALS( color, SET_COLOR, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledChildButtonCallback, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(!gIsCalledButtonCallback, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliButtonSetUnSelectedColorP(void)
+int UtcDaliButtonRelease(void)
 {
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetUnSelectedColorP");
-
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
-
-  application.SendNotification();
-  application.Render();
-
-  const Vector4 SET_COLOR = Color::BLUE;
+  /**
+   * Down event followed by interrupted event should signal Release.
+   */
 
-  pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
-  pushButton.SetProperty( Button::Property::UNSELECTED_COLOR, SET_COLOR );
-
-  application.SendNotification();
-  application.Render();
-
-  Vector4 color = pushButton.GetProperty<Vector4>( Button::Property::UNSELECTED_COLOR );
-
-  DALI_TEST_EQUALS( color, SET_COLOR, TEST_LOCATION );
-
-  END_TEST;
-}
-
-int UtcDaliButtonResetSelectedColorP(void)
-{
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetSelectedColorP");
 
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
-
-  application.SendNotification();
-  application.Render();
-
-  const Vector4 FIRST_COLOR = Color::BLUE;
-  const Vector4 SECOND_COLOR = Color::BLUE;
+  Button parentButton = PushButton::New();
+  parentButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  parentButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  parentButton.SetProperty(Actor::Property::SIZE, Vector2(20, 20));
+  application.GetScene().Add(parentButton);
+  parentButton.ReleasedSignal().Connect(&ButtonCallback);
 
-  pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
-  pushButton.SetProperty( Button::Property::SELECTED_COLOR, FIRST_COLOR );
+  // Reset signal flags
+  gIsCalledButtonCallback = false;
 
+  // Peform a button down and then button interrupted at coordinates (10,10).
+  Dali::Integration::TouchEvent event;
+  event = Dali::Integration::TouchEvent();
+  Dali::Integration::Point point;
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
+  event.AddPoint(point);
+  // flush the queue and render once
   application.SendNotification();
   application.Render();
+  application.ProcessEvent(event);
 
-  Vector4 color = pushButton.GetProperty<Vector4>( Button::Property::SELECTED_COLOR );
-
-  DALI_TEST_EQUALS( color, FIRST_COLOR, TEST_LOCATION );
-
-  pushButton.SetProperty( Button::Property::SELECTED_COLOR, SECOND_COLOR );
-
+  event = Dali::Integration::TouchEvent();
+  point.SetState(PointState::INTERRUPTED);
+  event.AddPoint(point);
+  // flush the queue and render once
   application.SendNotification();
   application.Render();
+  application.ProcessEvent(event);
 
-  color = pushButton.GetProperty<Vector4>( Button::Property::SELECTED_COLOR );
-
-  DALI_TEST_EQUALS( color, SECOND_COLOR, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliButtonSetImagesWithDeprecatedProperties(void)
+int UtcDaliButtonMultiTouch(void)
 {
+  /**
+   * Down event followed by a multi touch point event should signal Release.
+   */
+
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetImagesWithDeprecatedProperties");
 
-  PushButton pushButton = PushButton::New();
+  Button button = PushButton::New();
+  button.SetProperty(Button::Property::TOGGLABLE, true);
 
-  Stage::GetCurrent().Add( pushButton );
+  button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+  button.SetProperty(Actor::Property::SIZE, Vector2(20, 20));
+  application.GetScene().Add(button);
+  button.ReleasedSignal().Connect(&ButtonCallback);
 
-  Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::COLOR);
-  propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+  // Reset signal flags
+  gIsCalledButtonCallback = false;
 
-  DALI_TEST_EQUALS( pushButton.GetRendererCount(), 0, TEST_LOCATION );
+  // Peform a button down and then button interrupted at coordinates (10,10).
+  Dali::Integration::TouchEvent downEvent;
+  downEvent = Dali::Integration::TouchEvent();
+  Dali::Integration::Point point;
 
-  pushButton.SetProperty( Toolkit::Button::Property::UNSELECTED_STATE_IMAGE, propertyMap );
+  // Add Press button
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(15, 15));
+  downEvent.AddPoint(point);
+  // flush the queue and render once
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( pushButton.GetRendererCount(), 1, TEST_LOCATION );
-
-  tet_infoline(" Set state to selected and provide SELECTED visual");
-  pushButton.SetProperty( Toolkit::Button::Property::SELECTED_STATE_IMAGE, propertyMap );
-  pushButton.SetProperty( Toolkit::Button::Property::SELECTED, true );
+  application.ProcessEvent(downEvent);
+
+  // Release button
+  Dali::Integration::TouchEvent upEvent;
+  upEvent = Dali::Integration::TouchEvent();
+  point.SetState(PointState::UP);
+  point.SetScreenPosition(Vector2(15, 15));
+  upEvent.AddPoint(point);
+  // flush the queue and render once
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( pushButton.GetRendererCount(), 1, TEST_LOCATION );
+  application.ProcessEvent(upEvent);
 
-  tet_infoline(" Set state to selected, disabled and provide DISABLED_STATE_IMAGE visual");
-  pushButton.SetProperty( Toolkit::Button::Property::SELECTED, false );
-  pushButton.SetProperty( Toolkit::Button::Property::DISABLED, true );
-  pushButton.SetProperty( Toolkit::Button::Property::DISABLED_STATE_IMAGE, propertyMap );
-  application.SendNotification();
-  application.Render();
-  DALI_TEST_EQUALS( pushButton.GetRendererCount(), 1, TEST_LOCATION );
+  tet_infoline("Button should now be selected\n");
+  bool isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+  DALI_TEST_EQUALS(isSelected, true, TEST_LOCATION);
 
-END_TEST;
-}
+  // Add first point
+  Dali::Integration::TouchEvent multiEvent;
+  multiEvent = Dali::Integration::TouchEvent();
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
+  multiEvent.AddPoint(point);
 
-int UtcDaliButtonSetGetDepreciatedPropertiesWithURL(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetGetDepreciatedPropertiesWithURL");
+  // Add second point
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(15, 15));
+  multiEvent.AddPoint(point);
 
-  PushButton button = PushButton::New();
-  Stage::GetCurrent().Add( button );
+  tet_infoline("Before a multi touch event\n");
 
-  tet_infoline(" Set state to selected, disabled and provide DISABLED_STATE_IMAGE visual");
-  button.SetProperty( Toolkit::Button::Property::DISABLED, true );
-  button.SetProperty( Toolkit::Button::Property::DISABLED_STATE_IMAGE, TEST_IMAGE_ONE );
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+  application.ProcessEvent(multiEvent);
 
-  Property::Value value = button.GetProperty(Button::Property::DISABLED_STATE_IMAGE );
-  DALI_TEST_EQUALS( value.Get<std::string>(),  TEST_IMAGE_ONE, TEST_LOCATION );
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
-END_TEST;
+  END_TEST;
 }