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=80a8f70fea1c99ade2feb1ab19134ecb077d5ccc;hb=HEAD;hpb=6545f971b9c5f3b8289fd17ce29081b17e8afa56

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index 80a8f70..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,21 +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>
+
 using namespace Dali;
 using namespace Toolkit;
 
-
 void utc_dali_toolkit_button_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -42,18 +44,42 @@ void utc_dali_toolkit_button_cleanup(void)
 
 namespace
 {
-static bool gIsCalledButtonCallback = false;
+static bool gIsCalledButtonCallback      = false;
+static bool gIsCalledChildButtonCallback = false;
 
-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)
   {
   }
 
@@ -64,373 +90,522 @@ struct CallbackFunctor
   bool* mCallbackFlag;
 };
 
-
-Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
-{
-  BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
-
-  // Create the image
-  PixelBuffer* pixbuf = imageData.GetBuffer();
-  unsigned int size = width * height;
-
-  for( size_t i = 0; i < size; i++ )
-    {
-      pixbuf[i*4+0] = 0xFF * color.r;
-      pixbuf[i*4+1] = 0xFF * color.g;
-      pixbuf[i*4+2] = 0xFF * color.b;
-      pixbuf[i*4+3] = 0xFF * color.a;
-    }
-
-  imageData.Update();
-
-  return imageData;
-}
-
 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;
 }
 
-int UtcDaliButtonIsDisabledP(void)
+int UtcDaliButtonSetDisabledWithDifferentStates01P(void)
 {
   ToolkitTestApplication application;
 
+  tet_infoline("UtcDaliButtonSetDisabledWithDifferentStates01P\n");
+
   Button button = PushButton::New();
 
-  button.SetDisabled( true );
+  bool SELECTED = true;
 
-  DALI_TEST_CHECK( button.IsDisabled() );
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::SELECTED, SELECTED);
 
-  button.SetDisabled( false );
+  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);
+
+  bool isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+
+  DALI_TEST_EQUALS(isSelected, SELECTED, TEST_LOCATION);
 
-  DALI_TEST_CHECK( !button.IsDisabled() );
   END_TEST;
 }
 
-int UtcDaliButtonSetAutoRepeatingP(void)
+int UtcDaliButtonSetDisabledWithDifferentStates02P(void)
 {
   ToolkitTestApplication application;
 
+  tet_infoline("UtcDaliButtonSetDisabledWithDifferentStates02\n");
+
   Button button = PushButton::New();
 
-  button.SetAutoRepeating( true );
+  bool SELECTED = true;
 
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+  button.SetProperty(Button::Property::SELECTED, SELECTED);
+  button.SetProperty(Button::Property::DISABLED, true);
 
-  button.SetAutoRepeating( false );
+  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");
 
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
+  button.SetProperty(Button::Property::DISABLED, false);
+  button.SetProperty(Button::Property::SELECTED, !SELECTED);
 
-  button.SetAutoRepeating( true );
+  isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+  DALI_TEST_EQUALS(isSelected, !SELECTED, TEST_LOCATION);
 
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
+  END_TEST;
+}
 
-  button.SetAutoRepeating( false );
+int UtcDaliButtonPropertyGetLabelAlignment(void)
+{
+  ToolkitTestApplication application;
+  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);
 
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
   END_TEST;
 }
 
-int UtcDaliButtonIsAutoRepeatingP(void)
+int UtcDaliButtonIsDisabledP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetAutoRepeating( true );
+  button.SetProperty(Button::Property::DISABLED, true);
 
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::DISABLED), true, TEST_LOCATION);
 
-  button.SetAutoRepeating( false );
+  button.SetProperty(Button::Property::DISABLED, false);
 
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::DISABLED), false, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetInitialAutoRepeatingDelayP(void)
+int UtcDaliButtonAutoRepeatingPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetInitialAutoRepeatingDelay( 0.5f );
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), true);
+
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.5f, TEST_LOCATION );
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), false);
 
-  button.SetInitialAutoRepeatingDelay( 0.2f );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), false, TEST_LOCATION);
+
+  button.SetProperty(button.GetPropertyIndex("autoRepeating"), true);
+
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.2f, TEST_LOCATION );
   END_TEST;
 }
 
-int UtcDaliButtonSetNextAutoRepeatingDelayP(void)
+int UtcDaliButtonIsAutoRepeatingP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetNextAutoRepeatingDelay( 0.5f );
+  button.SetProperty(Button::Property::AUTO_REPEATING, true);
+
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::AUTO_REPEATING), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.5f, TEST_LOCATION );
+  button.SetProperty(Button::Property::AUTO_REPEATING, false);
 
-  button.SetNextAutoRepeatingDelay( 0.2f );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(Button::Property::AUTO_REPEATING), false, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.2f, TEST_LOCATION );
   END_TEST;
 }
 
-int UtcDaliButtonSetTogglableButtonP(void)
+int UtcDaliButtonAutoRepeatingP(void)
 {
   ToolkitTestApplication application;
+  tet_infoline(" UtcDaliButtonPressedSignalP  Setup Autorepeating and check multiple clicked signals received\n");
+
+  const float AUTO_REPEATING_DELAY = 0.15f;
 
   Button button = PushButton::New();
+  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);
+  // connect to its touch signal
+  ConnectionTracker* testTracker = new ConnectionTracker();
+  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.SetTogglableButton( true );
+  Dali::Integration::TouchEvent event;
+
+  // Touch point down and up inside the button.
 
-  DALI_TEST_CHECK( button.IsTogglableButton() );
+  gIsCalledButtonCallback = false;
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointDownInside());
+  application.ProcessEvent(event);
 
-  button.SetTogglableButton( false );
+  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);
+  timer.MockEmitSignal();
+  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);
+
+  gIsCalledButtonCallback = false;
+  event                   = Dali::Integration::TouchEvent();
+  event.AddPoint(GetPointUpInside());
+  application.ProcessEvent(event);
+
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
-  DALI_TEST_CHECK( !button.IsTogglableButton() );
   END_TEST;
 }
 
-int UtcDaliButtonSetSelectedP(void)
+int UtcDaliButtonInitialAutoRepeatingDelayPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
-  button.SetTogglableButton( true );
 
-  button.SetSelected( true );
+  button.SetProperty(button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.5f);
+
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.5f, TEST_LOCATION);
 
-  DALI_TEST_CHECK( button.IsSelected() );
+  button.SetProperty(button.GetPropertyIndex("initialAutoRepeatingDelay"), 0.2f);
 
-  button.SetSelected( false );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("initialAutoRepeatingDelay")), 0.2f, TEST_LOCATION);
 
-  DALI_TEST_CHECK( !button.IsSelected() );
   END_TEST;
 }
 
-int UtcDaliButtonSetAnimationTimeP(void)
+int UtcDaliButtonNextAutoRepeatingDelayPropertyP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetAnimationTimeP");
 
   Button button = PushButton::New();
 
-  button.SetAnimationTime( ANIMATION_TIME );
+  button.SetProperty(button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.5f);
 
-  DALI_TEST_EQUALS( button.GetAnimationTime(), ANIMATION_TIME, TEST_LOCATION );
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.5f, TEST_LOCATION);
+
+  button.SetProperty(button.GetPropertyIndex("nextAutoRepeatingDelay"), 0.2f);
+
+  DALI_TEST_EQUALS(button.GetProperty<float>(button.GetPropertyIndex("nextAutoRepeatingDelay")), 0.2f, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetLabelStringP(void)
+int UtcDaliButtonTogglableButtonPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
 
-  button.SetLabelText( "Button Label" );
+  button.SetProperty(button.GetPropertyIndex("togglable"), true);
+
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("togglable")), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( button.GetLabelText(), "Button Label", TEST_LOCATION );
+  button.SetProperty(button.GetPropertyIndex("togglable"), false);
+
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("togglable")), false, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetLabelActorP(void)
+int UtcDaliButtonSelectedPropertyP(void)
 {
   ToolkitTestApplication application;
 
   Button button = PushButton::New();
+  button.SetProperty(button.GetPropertyIndex("togglable"), true);
+
+  button.SetProperty(button.GetPropertyIndex("selected"), true);
 
-  button.SetLabelText( "Button Label" );
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("selected")), true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( button.GetLabelText(), "Button Label", TEST_LOCATION );
+  button.SetProperty(button.GetPropertyIndex("selected"), false);
+
+  DALI_TEST_EQUALS(button.GetProperty<bool>(button.GetPropertyIndex("selected")), false, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetUnselectedImageP(void)
+int UtcDaliButtonSetLabelStringWithPropertyMapP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetUnselectedImageP");
 
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
+  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"));
 
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
+  END_TEST;
+}
 
-  pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
-  pushButton.SetUnselectedImage( "Image.jpg" );
+int UtcDaliButtonSetLabelStringWithPropertyMapStringsP(void)
+{
+  ToolkitTestApplication application;
 
-  application.SendNotification();
-  application.Render();
+  Button button = PushButton::New();
+
+  tet_infoline(" UtcDaliButtonSetLabelStringWithPropertyMapStringsP Setting Button text using String then replacing with Enum then string");
+
+  Property::Map textVisualMapInitial;
+  textVisualMapInitial["visualType"] = "TEXT";
+  textVisualMapInitial["pointSize"]  = 15.0f;
+  textVisualMapInitial["text"]       = "button label initial";
+
+  button.SetProperty(Button::Property::LABEL, textVisualMapInitial);
+
+  DALI_TEST_EQUALS(GetButtonText(button), "button label initial", TEST_LOCATION);
+
+  tet_infoline(" UtcDaliButtonSetLabelStringWithPropertyMapStringsP Intermediate part of test");
+
+  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);
 
-  Vector3 size = pushButton.GetCurrentSize();
+  button.SetProperty(Button::Property::LABEL, propertyMap);
 
-  DALI_TEST_EQUALS( size.width, 20.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), "error if this is the final text", TEST_LOCATION);
 
+  tet_infoline(" UtcDaliButtonSetLabelStringWithPropertyMapStringsP Final part of test");
+
+  Property::Map textVisualMap;
+  textVisualMap["visualType"] = "TEXT";
+  textVisualMap["pointSize"]  = 15.0f;
+  textVisualMap["text"]       = "Button Label";
+
+  button.SetProperty(Toolkit::Button::Property::LABEL, textVisualMap);
+
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliButtonSetSelectedImageP(void)
+int UtcDaliButtonSetLabelWithStringP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetButtonImage");
 
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
+  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));
 
-  pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
-  pushButton.SetSelectedImage( "Image.jpg" );
+  button.SetProperty(Toolkit::Button::Property::LABEL, "Button Label");
 
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_EQUALS(GetButtonText(button), "Button Label", TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliButtonSetLabelPropertyP(void)
+{
+  ToolkitTestApplication application;
+
+  tet_infoline(" UtcDaliButtonSetLabelPropertyP Set text label and then set again with new text");
+
+  const std::string TEST_LABEL1 = "test label one";
+  const std::string TEST_LABEL2 = "test label two";
+
+  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, TEST_LABEL1));
+
+  DALI_TEST_EQUALS(GetButtonText(button), TEST_LABEL1, TEST_LOCATION);
 
-  Vector3 size = pushButton.GetCurrentSize();
+  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( size.width, 20.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(GetButtonText(button), TEST_LABEL2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -441,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;
 }
 
@@ -548,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;
 }
 
@@ -641,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;
 }
 
@@ -678,32 +853,186 @@ int UtcDaliButtonSetProperty(void)
   PushButton pushButton = PushButton::New();
 
   pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), false);
-  DALI_TEST_CHECK( false == pushButton.IsDisabled() );
+
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("disabled")), false, TEST_LOCATION);
 
   pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true);
-  DALI_TEST_CHECK( true == pushButton.IsDisabled() );
+  DALI_TEST_EQUALS(pushButton.GetProperty<bool>(pushButton.GetPropertyIndex("disabled")), true, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliButtonSize(void)
+int UtcDaliButtonEventConsumption(void)
 {
+  /**
+   *  [ Parent ]
+   *  [ Child  ]
+   *
+   *  Child parented and positioned under parent.
+   *  Touch up and down performed on child.
+   *  Should only trigger signal on child.
+   */
+
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSize");
 
-  // First an image is set, then SetSize is called.
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
+  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);
+
+  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);
+
+  // Reset signal flags
+  gIsCalledChildButtonCallback = false;
+  gIsCalledButtonCallback      = false;
+
+  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);
+
+  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);
+
+  DALI_TEST_EQUALS(gIsCalledChildButtonCallback, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(!gIsCalledButtonCallback, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliButtonRelease(void)
+{
+  /**
+   * Down event followed by interrupted event should signal Release.
+   */
+
+  ToolkitTestApplication application;
+
+  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);
+
+  // 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);
+
+  event = Dali::Integration::TouchEvent();
+  point.SetState(PointState::INTERRUPTED);
+  event.AddPoint(point);
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+  application.ProcessEvent(event);
+
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliButtonMultiTouch(void)
+{
+  /**
+   * Down event followed by a multi touch point event should signal Release.
+   */
+
+  ToolkitTestApplication application;
+
+  Button button = PushButton::New();
+  button.SetProperty(Button::Property::TOGGLABLE, true);
+
+  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);
+
+  // Reset signal flags
+  gIsCalledButtonCallback = false;
+
+  // Peform a button down and then button interrupted at coordinates (10,10).
+  Dali::Integration::TouchEvent downEvent;
+  downEvent = Dali::Integration::TouchEvent();
+  Dali::Integration::Point point;
+
+  // 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();
+  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();
+  application.ProcessEvent(upEvent);
+
+  tet_infoline("Button should now be selected\n");
+  bool isSelected = button.GetProperty<bool>(Button::Property::SELECTED);
+  DALI_TEST_EQUALS(isSelected, true, TEST_LOCATION);
+
+  // Add first point
+  Dali::Integration::TouchEvent multiEvent;
+  multiEvent = Dali::Integration::TouchEvent();
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(10, 10));
+  multiEvent.AddPoint(point);
+
+  // Add second point
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(15, 15));
+  multiEvent.AddPoint(point);
 
-  pushButton.SetBackgroundImage( "Image.jpg" );
-  pushButton.SetSize( 10.f, 10.f );
+  tet_infoline("Before a multi touch event\n");
 
+  // flush the queue and render once
   application.SendNotification();
   application.Render();
+  application.ProcessEvent(multiEvent);
 
-  Vector3 size = pushButton.GetCurrentSize();
+  DALI_TEST_EQUALS(gIsCalledButtonCallback, true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( size.width, 10.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 10.f, TEST_LOCATION );
   END_TEST;
 }